зеркало из https://github.com/mozilla/gecko-dev.git
Bug 326787 day/week view fails if event end is on next day [exception in getStartEndMinutesForOccurrence]. patch by ssitter@googlemail.com, r=jminta
This commit is contained in:
Родитель
a60a90fede
Коммит
0c2d6d757f
|
@ -522,24 +522,31 @@
|
||||||
var stdate = aOccurrence.startDate;
|
var stdate = aOccurrence.startDate;
|
||||||
var enddate = aOccurrence.endDate;
|
var enddate = aOccurrence.endDate;
|
||||||
|
|
||||||
if (stdate.timezone != this.mTimezone)
|
if (stdate.timezone != this.mTimezone) {
|
||||||
stdate = stdate.getInTimezone (this.mTimezone);
|
stdate = stdate.getInTimezone (this.mTimezone);
|
||||||
|
}
|
||||||
|
|
||||||
if (enddate.timezone != this.mTimezone)
|
if (enddate.timezone != this.mTimezone) {
|
||||||
enddate = enddate.getInTimezone (this.mTimezone);
|
enddate = enddate.getInTimezone (this.mTimezone);
|
||||||
|
}
|
||||||
|
|
||||||
|
var startHour = stdate.hour;
|
||||||
|
var startMinute = stdate.minute;
|
||||||
|
var endHour = enddate.hour;
|
||||||
|
var endMinute = enddate.minute;
|
||||||
|
|
||||||
// Handle cases where an event begins or ends on a day other than this
|
// Handle cases where an event begins or ends on a day other than this
|
||||||
if (stdate.compare(this.mDate) == -1) {
|
if (stdate.compare(this.mDate) == -1) {
|
||||||
stdate.hour = 0;
|
startHour = 0;
|
||||||
stdate.minute = 0;
|
startMinute = 0;
|
||||||
}
|
}
|
||||||
if (enddate.compare(this.mDate) == 1) {
|
if (enddate.compare(this.mDate) == 1) {
|
||||||
enddate.hour = 24;
|
endHour = 24;
|
||||||
enddate.minute = 0;
|
endMinute = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
return { start: stdate.hour * 60 + stdate.minute,
|
return { start: startHour * 60 + startMinute,
|
||||||
end: enddate.hour * 60 + enddate.minute };
|
end: endHour * 60 + endMinute };
|
||||||
]]></body>
|
]]></body>
|
||||||
</method>
|
</method>
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче