Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-05 05:30:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use the new timezone api's in the views, to handle floating items better.

Browse Source 
bug 307344, r=jminta
This commit is contained in:
mvl%exedo.nl 2005-09-21 20:53:25 +00:00
parent cde791bfac
commit 0a433e1dd2
1 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
calendar/resources/content/calendarWindow.js
View File

@ -656,33 +656,8 @@ CalendarView.prototype.createEventBox = function(aItemOccurrence, aInteralFuncti
var startDate;
var origEndDate;
if ("displayTimezone" in this) {
startDate = aItemOccurrence.startDate.getInTimezone(this.displayTimezone).clone();
origEndDate = aItemOccurrence.endDate.getInTimezone(this.displayTimezone).clone();
} else {
// Copy the values from jsDate. jsDate is in de users timezone
// It's a hack, but it kind of works. It doesn't set the right
// timezone info for the date, but that's not a real problem.
startDate = aItemOccurrence.startDate.clone();
var jsDate = startDate.jsDate;
startDate.year = jsDate.getFullYear();
startDate.month = jsDate.getMonth();
startDate.day = jsDate.getDate();
startDate.hour = jsDate.getHours();
startDate.minute = jsDate.getMinutes();
startDate.second = jsDate.getSeconds();
startDate.normalize();
origEndDate = aItemOccurrence.endDate.clone();
jsDate = origEndDate.jsDate;
origEndDate.year = jsDate.getFullYear();
origEndDate.month = jsDate.getMonth();
origEndDate.day = jsDate.getDate();
origEndDate.hour = jsDate.getHours();
origEndDate.minute = jsDate.getMinutes();
origEndDate.second = jsDate.getSeconds();
origEndDate.normalize();
}
startDate = aItemOccurrence.startDate.getInTimezone(calendarDefaultTimezone()).clone();
origEndDate = aItemOccurrence.endDate.getInTimezone(calendarDefaultTimezone()).clone();
var displayStart = gCalendarWindow.currentView.displayStartDate;
var displayEnd = gCalendarWindow.currentView.displayEndDate;
@ -695,6 +670,7 @@ CalendarView.prototype.createEventBox = function(aItemOccurrence, aInteralFuncti
if(startDate.jsDate < displayStart) {
startDate.jsDate = displayStart;
startDate.normalize();
startDate = startDate.getInTimezone(calendarDefaultTimezone());
}
var endDate = startDate.clone();