Fix recurrence issues; patch from vlad. Not part of the build.
git-svn-id: svn://10.0.0.236/trunk@166674 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -75,8 +75,8 @@ function makeOccurrence(item, start, end)
|
||||
createInstance(calIItemOccurrence);
|
||||
// XXX poor form
|
||||
occ.wrappedJSObject.item = item;
|
||||
occ.wrappedJSObject.occurrenceStartDate = item.startDate;
|
||||
occ.wrappedJSObject.occurrenceEndDate = item.endDate;
|
||||
occ.wrappedJSObject.occurrenceStartDate = start;
|
||||
occ.wrappedJSObject.occurrenceEndDate = end;
|
||||
return occ;
|
||||
}
|
||||
|
||||
@@ -472,7 +472,7 @@ calDavCalendar.prototype = {
|
||||
} else if (itemEndTime >= startTime) {
|
||||
// no occurrences
|
||||
if (itemReturnOccurrences)
|
||||
itemtoadd = makeOccurrence(item, itemStartDate, itemEndDate);
|
||||
itemtoadd = makeOccurrence(item, item.startDate, item.endDate);
|
||||
else
|
||||
itemtoadd = item;
|
||||
itemsFound.push(itemtoadd);
|
||||
|
||||
@@ -52,8 +52,8 @@ function makeOccurrence(item, start, end)
|
||||
createInstance(calIItemOccurrence);
|
||||
// XXX poor form
|
||||
occ.wrappedJSObject.item = item;
|
||||
occ.wrappedJSObject.occurrenceStartDate = item.startDate;
|
||||
occ.wrappedJSObject.occurrenceEndDate = item.endDate;
|
||||
occ.wrappedJSObject.occurrenceStartDate = item.start;
|
||||
occ.wrappedJSObject.occurrenceEndDate = item.end;
|
||||
return occ;
|
||||
}
|
||||
|
||||
@@ -368,7 +368,7 @@ calMemoryCalendar.prototype = {
|
||||
} else if (itemEndTime >= startTime) {
|
||||
// no occurrences
|
||||
if (itemReturnOccurrences)
|
||||
itemtoadd = makeOccurrence(item, itemStartDate, itemEndDate);
|
||||
itemtoadd = makeOccurrence(item, item.startDate, item.endDate);
|
||||
else
|
||||
itemtoadd = item;
|
||||
itemsFound.push(itemtoadd);
|
||||
|
||||
Reference in New Issue
Block a user