mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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

This commit is contained in:
mikep%oeone.com 2002-03-22 21:31:22 +00:00
Родитель b91e7edfce
Коммит 9b4a13f681
4 изменённых файлов: 14 добавлений и 4 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
calendar/resources/content/calendarDayView.js
Просмотреть файл

@ -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
Просмотреть файл

@ -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
Просмотреть файл

@ -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
Просмотреть файл

@ -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.