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

Bug 386502 - dtstart is always included in recurrence set, even when it's out of the query range; r=daniel

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@230652 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
daniel.boelzle%sun.com
2007-07-23 14:21:23 +00:00
parent e341332895
commit 83f5dbfe6c
1 changed files with 24 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -362,54 +362,37 @@ calRecurrenceInfo.prototype = {
var startDate = this.mBaseItem.recurrenceStartDate;
var dates = [];
function checkRange(item) {
var dtstart = item.getProperty("DTSTART");
// tasks may have a due date set or no duration at all
var end = item.getProperty("DTEND") || item.getProperty("DUE") || dtstart;
// is the item an intersection of the range?
if ((!aRangeStart || aRangeStart.compare(end) <= 0) &&
(!aRangeEnd || aRangeEnd.compare(dtstart) > 0)) {
return dtstart;
}
return null;
}
// DTSTART/DUE is always part of the (positive) expanded set:
// the base item cannot be replaced by an exception;
// an exception can only be defined on an item resulting from an RDATE/RRULE;
// DTSTART always equals RECURRENCE-ID for items expanded from RRULE
dates.push(startDate);
var baseStart = checkRange(this.mBaseItem);
if (baseStart) {
dates.push(baseStart);
}
// toss in exceptions first:
if (this.mExceptions) {
this.mExceptions.forEach(function(ex) {
var dtstart = ex.item.getProperty("DTSTART");
var dateToReturn;
if (aReturnRIDs)
dateToReturn = ex.id;
else
dateToReturn = dtstart;
// is our startdate within the range?
if ((!aRangeStart || aRangeStart.compare(dtstart) <= 0) &&
(!aRangeEnd || aRangeEnd.compare(dtstart) > 0))
{
dates.push(dateToReturn);
return;
}
// is our end date within the range?
var name = "DTEND";
if (ex.item instanceof Components.interfaces.calITodo)
name = "DUE";
var dtend = ex.item.getProperty(name);
if (!dtend)
return;
if ((!aRangeStart || aRangeStart.compare(dtend) <= 0) &&
(!aRangeEnd || aRangeEnd.compare(dtend) > 0))
{
dates.push(dateToReturn);
return;
}
// is the range in the middle of a long event?
if (aRangeStart && aRangeEnd &&
aRangeStart.compare(dtstart) >= 0 &&
aRangeEnd.compare(dtend) <= 0)
{
dates.push(dateToReturn);
return;
}
});
this.mExceptions.forEach(
function(ex) {
var dtstart = checkRange(ex.item);
if (dtstart) {
dates.push(aReturnRIDs ? ex.id : dtstart);
}
});
}
// apply positive items before negative: