From 8f214e7b5e6d27927016028e1485612bff99eeeb Mon Sep 17 00:00:00 2001 From: "mikep%oeone.com" Date: Fri, 6 Sep 2002 18:22:10 +0000 Subject: [PATCH] Fixing calendar alarm dates. --- calendar/resources/content/alertDialog.js | 12 ++++++------ calendar/resources/content/calendarEvent.js | 2 +- .../resources/content/calendarEventAlertDialog.js | 12 ++++++------ calendar/resources/content/calendarOverlay.js | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/calendar/resources/content/alertDialog.js b/calendar/resources/content/alertDialog.js index 734e73863ccb..8c14e6257156 100644 --- a/calendar/resources/content/alertDialog.js +++ b/calendar/resources/content/alertDialog.js @@ -146,7 +146,7 @@ function createAlarmBox( Event ) OuterBox.getElementsByAttribute( "name", "SnoozeButton" )[0].setAttribute( "onclick", "snoozeAlarm( this.event );removeAlarmBox( this.event );" ); - OuterBox.getElementsByAttribute( "name", "alarm-length-field" )[0].value = opener.getIntPref(gCalendarWindow.calendarPreferences.calendarPref, "event.defaultsnoozelength", 60 ); + OuterBox.getElementsByAttribute( "name", "alarm-length-field" )[0].value = opener.getIntPref(opener.gCalendarWindow.calendarPreferences.calendarPref, "event.defaultsnoozelength", 60 ); kungFooDeathGripOnEventBoxes.push( OuterBox.getElementsByAttribute( "name", "SnoozeButton" )[0] ); @@ -159,13 +159,13 @@ function createAlarmBox( Event ) var EventDescription = document.createTextNode( Event.description ); OuterBox.getElementsByAttribute( "name", "Description" )[0].appendChild( EventDescription ); - var startDate = new Date( Event.start.getTime() ); + var displayDate = new Date( Event.displayDate ); - var EventStartDate = document.createTextNode( getFormatedDate( startDate ) ); - OuterBox.getElementsByAttribute( "name", "StartDate" )[0].appendChild( EventStartDate ); + var EventDisplayDate = document.createTextNode( getFormatedDate( displayDate ) ); + OuterBox.getElementsByAttribute( "name", "StartDate" )[0].appendChild( EventDisplayDate ); - var EventStartTime = document.createTextNode( getFormatedTime( startDate ) ); - OuterBox.getElementsByAttribute( "name", "StartTime" )[0].appendChild( EventStartTime ); + var EventDisplayTime = document.createTextNode( getFormatedTime( displayDate ) ); + OuterBox.getElementsByAttribute( "name", "StartTime" )[0].appendChild( EventDisplayTime ); /* ** 3rd part of the row: the number of times that alarm went off (sometimes hidden) diff --git a/calendar/resources/content/calendarEvent.js b/calendar/resources/content/calendarEvent.js index 3cf271bce2ec..c5527d03e7cf 100644 --- a/calendar/resources/content/calendarEvent.js +++ b/calendar/resources/content/calendarEvent.js @@ -703,7 +703,7 @@ CalendarAlarmObserver.prototype.fireAlarm = function calAlarm_fireAlarm( calenda playSound(); } - addEventToDialog( calendarEvent ); + addEventToDialog( calendarEvent ); if ( calendarEvent.alarmEmailAddress ) { diff --git a/calendar/resources/content/calendarEventAlertDialog.js b/calendar/resources/content/calendarEventAlertDialog.js index 734e73863ccb..8c14e6257156 100644 --- a/calendar/resources/content/calendarEventAlertDialog.js +++ b/calendar/resources/content/calendarEventAlertDialog.js @@ -146,7 +146,7 @@ function createAlarmBox( Event ) OuterBox.getElementsByAttribute( "name", "SnoozeButton" )[0].setAttribute( "onclick", "snoozeAlarm( this.event );removeAlarmBox( this.event );" ); - OuterBox.getElementsByAttribute( "name", "alarm-length-field" )[0].value = opener.getIntPref(gCalendarWindow.calendarPreferences.calendarPref, "event.defaultsnoozelength", 60 ); + OuterBox.getElementsByAttribute( "name", "alarm-length-field" )[0].value = opener.getIntPref(opener.gCalendarWindow.calendarPreferences.calendarPref, "event.defaultsnoozelength", 60 ); kungFooDeathGripOnEventBoxes.push( OuterBox.getElementsByAttribute( "name", "SnoozeButton" )[0] ); @@ -159,13 +159,13 @@ function createAlarmBox( Event ) var EventDescription = document.createTextNode( Event.description ); OuterBox.getElementsByAttribute( "name", "Description" )[0].appendChild( EventDescription ); - var startDate = new Date( Event.start.getTime() ); + var displayDate = new Date( Event.displayDate ); - var EventStartDate = document.createTextNode( getFormatedDate( startDate ) ); - OuterBox.getElementsByAttribute( "name", "StartDate" )[0].appendChild( EventStartDate ); + var EventDisplayDate = document.createTextNode( getFormatedDate( displayDate ) ); + OuterBox.getElementsByAttribute( "name", "StartDate" )[0].appendChild( EventDisplayDate ); - var EventStartTime = document.createTextNode( getFormatedTime( startDate ) ); - OuterBox.getElementsByAttribute( "name", "StartTime" )[0].appendChild( EventStartTime ); + var EventDisplayTime = document.createTextNode( getFormatedTime( displayDate ) ); + OuterBox.getElementsByAttribute( "name", "StartTime" )[0].appendChild( EventDisplayTime ); /* ** 3rd part of the row: the number of times that alarm went off (sometimes hidden) diff --git a/calendar/resources/content/calendarOverlay.js b/calendar/resources/content/calendarOverlay.js index ed23663a30fd..ccabd176c6a0 100644 --- a/calendar/resources/content/calendarOverlay.js +++ b/calendar/resources/content/calendarOverlay.js @@ -100,7 +100,7 @@ function addEventToDialog( Event ) calendarAlarmWindow.pendingEvents = new Array(); } - //dump( "\n ADDING PENDING EVENT TO DIALOG _______________________" ); + dump( "\n ADDING PENDING EVENT TO DIALOG _______________________" ); calendarAlarmWindow.pendingEvents.push( Event ); }