mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Patch from ajbu@planet.nl for bug 159029.

This commit is contained in:
mikep%oeone.com 2002-07-24 13:07:19 +00:00
Родитель ac9fa347e0
Коммит b0dd42b474
4 изменённых файлов: 65 добавлений и 52 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
calendar/libxpical/oeDateTimeImpl.cpp
Просмотреть файл

@ -170,6 +170,18 @@ NS_IMETHODIMP oeDateTimeImpl::Clear()
return NS_OK;
}
NS_IMETHODIMP oeDateTimeImpl::GetUtc(PRBool *retval)
{
*retval = m_datetime.is_utc;
return NS_OK;
}
NS_IMETHODIMP oeDateTimeImpl::SetUtc(PRBool newval)
{
m_datetime.is_utc = newval;
return NS_OK;
}
void oeDateTimeImpl::AdjustToWeekday( short weekday ) {
short currentday = icaltime_day_of_week( m_datetime );
while( currentday != weekday ) {

1
calendar/libxpical/oeIICal.idl
Просмотреть файл

@ -66,6 +66,7 @@ interface oeIDateTime : nsISupports
attribute short day;
attribute short hour;
attribute short minute;
attribute boolean utc;
PRTime getTime();
void setTime( in PRTime ms );
string toString();

52
calendar/resources/content/calendarImportExport.js
Просмотреть файл

@ -149,18 +149,34 @@ const ZULU_OFFSET_MILLIS = new Date().getTimezoneOffset() * 60 * 1000;
function convertZuluToLocal( calendarEvent )
{
if( calendarEvent.start.utc == true )
{
var zuluStartTime = calendarEvent.start.getTime();
var zuluEndTime = calendarEvent.end.getTime();
calendarEvent.start.setTime( zuluStartTime - ZULU_OFFSET_MILLIS );
calendarEvent.start.utc = false;
}
if( calendarEvent.end.utc == true )
{
var zuluEndTime = calendarEvent.end.getTime();
calendarEvent.end.setTime( zuluEndTime - ZULU_OFFSET_MILLIS );
calendarEvent.end.utc = false;
}
}
function convertLocalToZulu( calendarEvent )
{
if( calendarEvent.start.utc == false )
{
var zuluStartTime = calendarEvent.start.getTime();
var zuluEndTime = calendarEvent.end.getTime();
calendarEvent.start.setTime( zuluStartTime + ZULU_OFFSET_MILLIS );
calendarEvent.start.utc = true;
}
if( calendarEvent.end.utc == false )
{
var zuluEndTime = calendarEvent.end.getTime();
calendarEvent.end.setTime( zuluEndTime + ZULU_OFFSET_MILLIS );
calendarEvent.end.utc = true;
}
}
// Can something from dateUtils be used here?
@ -361,12 +377,18 @@ function eventArrayToICalString( calendarEventArray, doPatchForExport )
var sTextiCalendar = "";
for( var eventArrayIndex = 0; eventArrayIndex < calendarEventArray.length; ++eventArrayIndex )
{
var calendarEvent = calendarEventArray[ eventArrayIndex ];
var calendarEvent = calendarEventArray[ eventArrayIndex ].clone();
// convert time to represent local to produce correct DTSTART and DTEND
if(calendarEvent.allDay != true)
convertLocalToZulu( calendarEvent );
// check if all required properties are available
if( calendarEvent.method == 0 )
calendarEvent.method = calendarEvent.ICAL_METHOD_PUBLISH;
if( calendarEvent.stamp.year == 0 )
calendarEvent.stamp.setTime( new Date() );
if ( doPatchForExport )
sTextiCalendar += patchICalStringForExport( calendarEvent.getIcalString() );
else
@ -379,33 +401,11 @@ function eventArrayToICalString( calendarEventArray, doPatchForExport )
/**** patchICalStringForExport
* Function to hack an iCalendar text block for use in other applications
* Adds METHOD and DTSTAMP fields, and patch TRIGGER field for Outlook
* Patch TRIGGER field for Outlook
*/
function patchICalStringForExport( sTextiCalendar )
{
// HACK: Remove this hack when Calendar supports METHOD properties
var i = sTextiCalendar.indexOf("METHOD")
if(i == -1)
{
var i = sTextiCalendar.indexOf("VERSION")
if(i != -1) {
sTextiCalendar =
sTextiCalendar.substring(0,i) + "METHOD:PUBLISH\n" + sTextiCalendar.substring(i, sTextiCalendar.length);
}
}
// HACK: Remove this hack when Calendar supports DTSTAMP properties
var i = sTextiCalendar.indexOf("DTSTAMP")
if(i == -1)
{
var i = sTextiCalendar.indexOf("UID")
if(i != -1) {
sTextiCalendar =
sTextiCalendar.substring(0,i) + "DTSTAMP:20020430T114937Z\n" + sTextiCalendar.substring(i, sTextiCalendar.length);
}
}
// HACK: TRIGGER patch hack for Outlook 2000
var i = sTextiCalendar.indexOf("TRIGGER\n ;VALUE=DURATION\n :-");
if(i != -1) {

52
calendar/resources/content/importExport.js
Просмотреть файл

@ -149,18 +149,34 @@ const ZULU_OFFSET_MILLIS = new Date().getTimezoneOffset() * 60 * 1000;
function convertZuluToLocal( calendarEvent )
{
if( calendarEvent.start.utc == true )
{
var zuluStartTime = calendarEvent.start.getTime();
var zuluEndTime = calendarEvent.end.getTime();
calendarEvent.start.setTime( zuluStartTime - ZULU_OFFSET_MILLIS );
calendarEvent.start.utc = false;
}
if( calendarEvent.end.utc == true )
{
var zuluEndTime = calendarEvent.end.getTime();
calendarEvent.end.setTime( zuluEndTime - ZULU_OFFSET_MILLIS );
calendarEvent.end.utc = false;
}
}
function convertLocalToZulu( calendarEvent )
{
if( calendarEvent.start.utc == false )
{
var zuluStartTime = calendarEvent.start.getTime();
var zuluEndTime = calendarEvent.end.getTime();
calendarEvent.start.setTime( zuluStartTime + ZULU_OFFSET_MILLIS );
calendarEvent.start.utc = true;
}
if( calendarEvent.end.utc == false )
{
var zuluEndTime = calendarEvent.end.getTime();
calendarEvent.end.setTime( zuluEndTime + ZULU_OFFSET_MILLIS );
calendarEvent.end.utc = true;
}
}
// Can something from dateUtils be used here?
@ -361,12 +377,18 @@ function eventArrayToICalString( calendarEventArray, doPatchForExport )
var sTextiCalendar = "";
for( var eventArrayIndex = 0; eventArrayIndex < calendarEventArray.length; ++eventArrayIndex )
{
var calendarEvent = calendarEventArray[ eventArrayIndex ];
var calendarEvent = calendarEventArray[ eventArrayIndex ].clone();
// convert time to represent local to produce correct DTSTART and DTEND
if(calendarEvent.allDay != true)
convertLocalToZulu( calendarEvent );
// check if all required properties are available
if( calendarEvent.method == 0 )
calendarEvent.method = calendarEvent.ICAL_METHOD_PUBLISH;
if( calendarEvent.stamp.year == 0 )
calendarEvent.stamp.setTime( new Date() );
if ( doPatchForExport )
sTextiCalendar += patchICalStringForExport( calendarEvent.getIcalString() );
else
@ -379,33 +401,11 @@ function eventArrayToICalString( calendarEventArray, doPatchForExport )
/**** patchICalStringForExport
* Function to hack an iCalendar text block for use in other applications
* Adds METHOD and DTSTAMP fields, and patch TRIGGER field for Outlook
* Patch TRIGGER field for Outlook
*/
function patchICalStringForExport( sTextiCalendar )
{
// HACK: Remove this hack when Calendar supports METHOD properties
var i = sTextiCalendar.indexOf("METHOD")
if(i == -1)
{
var i = sTextiCalendar.indexOf("VERSION")
if(i != -1) {
sTextiCalendar =
sTextiCalendar.substring(0,i) + "METHOD:PUBLISH\n" + sTextiCalendar.substring(i, sTextiCalendar.length);
}
}
// HACK: Remove this hack when Calendar supports DTSTAMP properties
var i = sTextiCalendar.indexOf("DTSTAMP")
if(i == -1)
{
var i = sTextiCalendar.indexOf("UID")
if(i != -1) {
sTextiCalendar =
sTextiCalendar.substring(0,i) + "DTSTAMP:20020430T114937Z\n" + sTextiCalendar.substring(i, sTextiCalendar.length);
}
}
// HACK: TRIGGER patch hack for Outlook 2000
var i = sTextiCalendar.indexOf("TRIGGER\n ;VALUE=DURATION\n :-");
if(i != -1) {