Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-11 16:32:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing bug with events not going the length of the screen if there was an all day event on the same day.

Browse Source
This commit is contained in:
mikep%oeone.com 2002-03-22 21:31:22 +00:00
parent b91e7edfce
commit 9b4a13f681
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
calendar/resources/content/calendarDayView.js
View File

@ -164,7 +164,8 @@ DayView.prototype.refreshEvents = function( )
thisCalendarEventDisplay.displayDate.getTime() < calendarEventDisplay.event.end.getTime() ) ||
( calendarEventDisplay.displayDate >= thisCalendarEventDisplay.displayDate &&
calendarEventDisplay.displayDate.getTime() < thisCalendarEventDisplay.event.end.getTime() ) ) &&
calendarEventDisplay.event.id != thisCalendarEventDisplay.event.id )
calendarEventDisplay.event.id != thisCalendarEventDisplay.event.id &&
thisCalendarEventDisplay.event.allDay != true )
{
//get the spot that this event will go in.
var ThisSpot = thisCalendarEventDisplay.CurrentSpot;

6
calendar/resources/content/calendarWeekView.js
View File

@ -149,6 +149,8 @@ WeekView.prototype.refreshEvents = function( )
for ( i = 0; i < dayEventList.length; i++ )
{
var ThisSpot = 0;
var calendarEventDisplay = dayEventList[i];
//check to make sure that the event is not an all day event...
@ -166,7 +168,8 @@ WeekView.prototype.refreshEvents = function( )
thisCalendarEventDisplay.displayDate.getTime() < calendarEventDisplay.event.end.getTime() ) ||
( calendarEventDisplay.displayDate >= thisCalendarEventDisplay.displayDate &&
calendarEventDisplay.displayDate.getTime() < thisCalendarEventDisplay.event.end.getTime() ) ) &&
calendarEventDisplay.event.id != thisCalendarEventDisplay.event.id )
calendarEventDisplay.event.id != thisCalendarEventDisplay.event.id &&
thisCalendarEventDisplay.event.allDay != true )
{
//get the spot that this event will go in.
var ThisSpot = thisCalendarEventDisplay.CurrentSpot;
@ -182,6 +185,7 @@ WeekView.prototype.refreshEvents = function( )
}
SortedOtherSpotArray = new Array();
SortedOtherSpotArray = calendarEventDisplay.OtherSpotArray.sort( gCalendarWindow.compareNumbers);
alert( SortedOtherSpotArray.length );
LowestNumber = this.calendarWindow.getLowestElementNotInArray( SortedOtherSpotArray );
//this is the actual spot (0 -> n) that the event will go in on the day view.

3
calendar/resources/content/dayView.js
View File

@ -164,7 +164,8 @@ DayView.prototype.refreshEvents = function( )
thisCalendarEventDisplay.displayDate.getTime() < calendarEventDisplay.event.end.getTime() ) ||
( calendarEventDisplay.displayDate >= thisCalendarEventDisplay.displayDate &&
calendarEventDisplay.displayDate.getTime() < thisCalendarEventDisplay.event.end.getTime() ) ) &&
calendarEventDisplay.event.id != thisCalendarEventDisplay.event.id )
calendarEventDisplay.event.id != thisCalendarEventDisplay.event.id &&
thisCalendarEventDisplay.event.allDay != true )
{
//get the spot that this event will go in.
var ThisSpot = thisCalendarEventDisplay.CurrentSpot;

6
calendar/resources/content/weekView.js
View File

@ -149,6 +149,8 @@ WeekView.prototype.refreshEvents = function( )
for ( i = 0; i < dayEventList.length; i++ )
{
var ThisSpot = 0;
var calendarEventDisplay = dayEventList[i];
//check to make sure that the event is not an all day event...
@ -166,7 +168,8 @@ WeekView.prototype.refreshEvents = function( )
thisCalendarEventDisplay.displayDate.getTime() < calendarEventDisplay.event.end.getTime() ) ||
( calendarEventDisplay.displayDate >= thisCalendarEventDisplay.displayDate &&
calendarEventDisplay.displayDate.getTime() < thisCalendarEventDisplay.event.end.getTime() ) ) &&
calendarEventDisplay.event.id != thisCalendarEventDisplay.event.id )
calendarEventDisplay.event.id != thisCalendarEventDisplay.event.id &&
thisCalendarEventDisplay.event.allDay != true )
{
//get the spot that this event will go in.
var ThisSpot = thisCalendarEventDisplay.CurrentSpot;
@ -182,6 +185,7 @@ WeekView.prototype.refreshEvents = function( )
}
SortedOtherSpotArray = new Array();
SortedOtherSpotArray = calendarEventDisplay.OtherSpotArray.sort( gCalendarWindow.compareNumbers);
alert( SortedOtherSpotArray.length );
LowestNumber = this.calendarWindow.getLowestElementNotInArray( SortedOtherSpotArray );
//this is the actual spot (0 -> n) that the event will go in on the day view.