Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug 454983 - Error when editing repeating event with exceptions (NS_ERROR_INVALID_POINTER in calRecurrenceInfo.js). r=philipp,p=dbo

Browse Source 
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@254184 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mozilla%kewis.ch
2008-09-12 16:10:14 +00:00
parent 96f6a71dbd
commit a72e5419d9
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mozilla/calendar/base/src/calRecurrenceInfo.js
View File

@@ -852,6 +852,9 @@ calRecurrenceInfo.prototype = {
return;
}
// convert both dates to UTC since subtractDate is not timezone aware.
var timeDiff = aNewStartTime.getInTimezone(UTC()).subtractDate(aOldStartTime.getInTimezone(UTC()));
var rdates = {};
// take RDATE's and EXDATE's into account.
@@ -877,15 +880,19 @@ calRecurrenceInfo.prototype = {
}
}
ritem.setDates(rdates.length,rdates);
} else if (calInstanceOf(ritem, Components.interfaces.calIRecurrenceRule)) {
ritem = ritem.QueryInterface(Components.interfaces.calIRecurrenceRule);
if (!ritem.isByCount) {
var endDate = ritem.endDate;
if (endDate) {
endDate.addDuration(timeDiff);
ritem.endDate = endDate;
}
}
}
}
var startTimezone = aNewStartTime.timezone;
// convert both dates to UTC since subtractDate is not timezone aware.
aOldStartTime = aOldStartTime.getInTimezone(UTC());
aNewStartTime = aNewStartTime.getInTimezone(UTC());
var timeDiff = aNewStartTime.subtractDate(aOldStartTime);
var exceptions = this.getExceptionIds({});
var modifiedExceptions = [];
for each (var exid in exceptions) {
@@ -896,7 +903,7 @@ calRecurrenceInfo.prototype = {
// otherwise those won't match any longer w.r.t DST:
var rid = ex.recurrenceId;
rid = rid.getInTimezone(rdates[getRidKey(rid)]
? origRdates[getRidKey(rid)].timezone
? rdates[getRidKey(rid)].timezone
: startTimezone);
rid.addDuration(timeDiff);
ex.recurrenceId = rid;