From db77107abb2efbc09d5527bcbf0401cfe8266fab Mon Sep 17 00:00:00 2001 From: "mvl%exedo.nl" Date: Mon, 5 Apr 2004 17:55:52 +0000 Subject: [PATCH] fix some more javascript strict warnings when starting calendar bug 237368, r=mostafah git-svn-id: svn://10.0.0.236/trunk@154517 18797224-902f-48f8-a5cc-f745e15eee43 --- .../calendar/resources/content/calendar.js | 4 ++-- .../resources/content/calendarSelection.js | 14 ++++++++------ .../resources/content/calendarWindow.js | 15 ++++++++------- mozilla/calendar/resources/content/dayView.js | 2 +- .../calendar/resources/content/monthView.js | 8 ++++---- .../resources/content/multiweekView.js | 14 ++++++++------ .../calendar/resources/content/unifinder.js | 15 ++++++++------- .../resources/content/unifinderToDo.js | 2 +- .../calendar/resources/content/weekView.js | 19 ++++++++++--------- 9 files changed, 50 insertions(+), 43 deletions(-) diff --git a/mozilla/calendar/resources/content/calendar.js b/mozilla/calendar/resources/content/calendar.js index 0359c1590a7..a9d1e64512c 100644 --- a/mozilla/calendar/resources/content/calendar.js +++ b/mozilla/calendar/resources/content/calendar.js @@ -208,7 +208,7 @@ function calendarInit() } // CofC Calendar Coloring Change - if( window.arguments && window.arguments[0].channel ) + if( ("arguments" in window.arguments) && ("channel" in window.arguments[0]) ) { gCalendarWindow.calendarManager.checkCalendarURL( window.arguments[0].channel ); } @@ -1219,7 +1219,7 @@ function getPreviewTextForRepeatingEvent( calendarEventDisplay ) var nbmaxlines = 5 ; var nblines = lines.length ; if( nblines > nbmaxlines ) { - var nblines = nbmaxlines ; + nblines = nbmaxlines ; lines[ nblines - 1 ] = "..." ; } diff --git a/mozilla/calendar/resources/content/calendarSelection.js b/mozilla/calendar/resources/content/calendarSelection.js index f2fb73960d0..216a4c4566d 100644 --- a/mozilla/calendar/resources/content/calendarSelection.js +++ b/mozilla/calendar/resources/content/calendarSelection.js @@ -110,7 +110,7 @@ CalendarEventSelection.prototype.setArrayToSelection = function calSel_setArrayT { this.selectedEvents = new Array(); - for( i = 0; i < ArrayOfEvents.length; i++ ) + for( var i = 0; i < ArrayOfEvents.length; i++ ) { this.selectedEvents[ this.selectedEvents.length ] = ArrayOfEvents[i]; } @@ -121,7 +121,7 @@ CalendarEventSelection.prototype.setArrayToSelection = function calSel_setArrayT CalendarEventSelection.prototype.isSelectedEvent = function calSel_isSelectedEvent( Event ) { - for( i = 0; i < this.selectedEvents.length; i++ ) + for( var i = 0; i < this.selectedEvents.length; i++ ) { if( this.selectedEvents[i] == Event ) return true; @@ -137,11 +137,13 @@ CalendarEventSelection.prototype.isSelectedEvent = function calSel_isSelectedEve CalendarEventSelection.prototype.onSelectionChanged = function calSel_onSelectionChanged( ) { + var ArrayOfElements; + var i; if( this.selectedEvents.length > 0 ) { - var ArrayOfElements = document.getElementsByAttribute( "disabledwhennoeventsselected", "true" ); + ArrayOfElements = document.getElementsByAttribute( "disabledwhennoeventsselected", "true" ); - for( var i = 0; i < ArrayOfElements.length; i++ ) + for( i = 0; i < ArrayOfElements.length; i++ ) ArrayOfElements[i].removeAttribute( "disabled" ); if( this.selectedEvents.length != 1 ) @@ -154,9 +156,9 @@ CalendarEventSelection.prototype.onSelectionChanged = function calSel_onSelectio } else { - var ArrayOfElements = document.getElementsByAttribute( "disabledwhennoeventsselected", "true" ); + ArrayOfElements = document.getElementsByAttribute( "disabledwhennoeventsselected", "true" ); - for( var i = 0; i < ArrayOfElements.length; i++ ) + for( i = 0; i < ArrayOfElements.length; i++ ) ArrayOfElements[i].setAttribute( "disabled", "true" ); } diff --git a/mozilla/calendar/resources/content/calendarWindow.js b/mozilla/calendar/resources/content/calendarWindow.js index eecf8c2eb5c..40a61327045 100644 --- a/mozilla/calendar/resources/content/calendarWindow.js +++ b/mozilla/calendar/resources/content/calendarWindow.js @@ -471,15 +471,16 @@ CalendarWindow.prototype.changeMouseOverInfo = function calWin_changeMouseOverIn { Html.removeChild( Html.firstChild ); } - - if(event.currentTarget.calendarToDo) + + var HolderBox; + if("calendarToDo" in event.currentTarget) { - var HolderBox = getPreviewTextForTask( event.currentTarget.calendarToDo ); + HolderBox = getPreviewTextForTask( event.currentTarget.calendarToDo ); } else - { - var HolderBox = getPreviewTextForRepeatingEvent( event.currentTarget.calendarEventDisplay ); - } + { + HolderBox = getPreviewTextForRepeatingEvent( event.currentTarget.calendarEventDisplay ); + } Html.appendChild( HolderBox ); } @@ -626,7 +627,7 @@ CalendarView.prototype.refresh = function calView_refresh( ShowEvent ) { this.refreshDisplay( ShowEvent ) - if(this.calendarWindow.currentView.doResize) + if("doResize" in this.calendarWindow.currentView) this.calendarWindow.currentView.doResize(); this.refreshEvents() diff --git a/mozilla/calendar/resources/content/dayView.js b/mozilla/calendar/resources/content/dayView.js index c50ef946a42..5e62283802c 100644 --- a/mozilla/calendar/resources/content/dayView.js +++ b/mozilla/calendar/resources/content/dayView.js @@ -553,7 +553,7 @@ DayView.prototype.selectBoxForEvent = function dayview_selectBoxForEvent( calend { var EventBoxes = document.getElementsByAttribute( "name", "day-view-event-box-"+calendarEvent.id ); - for ( j = 0; j < EventBoxes.length; j++ ) + for ( var j = 0; j < EventBoxes.length; j++ ) { EventBoxes[j].setAttribute( "eventselected", "true" ); } diff --git a/mozilla/calendar/resources/content/monthView.js b/mozilla/calendar/resources/content/monthView.js index 8cc081b74e3..9f468cbe8c2 100644 --- a/mozilla/calendar/resources/content/monthView.js +++ b/mozilla/calendar/resources/content/monthView.js @@ -144,7 +144,7 @@ function MonthView( calendarWindow ) for( i = 0; i < EventSelectionArray.length; i++ ) { var EventBoxes = document.getElementsByAttribute( "name", "month-view-event-box-"+EventSelectionArray[i].id ); - for ( j = 0; j < EventBoxes.length; j++ ) + for ( var j = 0; j < EventBoxes.length; j++ ) { EventBoxes[j].setAttribute( "eventselected", "true" ); } @@ -503,14 +503,14 @@ MonthView.prototype.refreshDisplay = function monthView_refreshDisplay( ) var Checked = gOnlyWorkdayChecked ; - for( var i = - Offset; i <= 1 - Offset; i++ ){ + for( i = - Offset; i <= 1 - Offset; i++ ){ //ni = i - Offset ; var ni = (i >0)? i : i + 7; if( Checked === "true" ) document.getElementById( "month-view-column-"+ni ).setAttribute( "collapsed", "true" ); else document.getElementById( "month-view-column-"+ ni).removeAttribute( "collapsed"); - } + } if( Checked === "true" && Offset <= 1 && firstDayOfWeek >= 6-Offset) { document.getElementById( "month-week-1-row" ).setAttribute( "collapsed", "true" ); @@ -973,7 +973,7 @@ MonthView.prototype.setFictitiousEvents = function monthView_setFictitiousEvents { var dayBoxItem = this.dayBoxItemArray[ 24 ]; if( !dayBoxItem ) - return false; + return; // Make a box item to hold the event var eventBox = document.createElement( "box" ); eventBox.setAttribute( "id", "month-view-event-box-fictitious" ); diff --git a/mozilla/calendar/resources/content/multiweekView.js b/mozilla/calendar/resources/content/multiweekView.js index 95bf05a2b0e..3567ed77722 100644 --- a/mozilla/calendar/resources/content/multiweekView.js +++ b/mozilla/calendar/resources/content/multiweekView.js @@ -135,13 +135,14 @@ function MultiweekView( calendarWindow ) for( i = 0; i < EventSelectionArray.length; i++ ) { + var EventBoxes; if( EventSelectionArray[i].due ) { - var EventBoxes = document.getElementsByAttribute( "name", "multiweek-view-todo-box-"+EventSelectionArray[i].id ); + EventBoxes = document.getElementsByAttribute( "name", "multiweek-view-todo-box-"+EventSelectionArray[i].id ); } else { - var EventBoxes = document.getElementsByAttribute( "name", "multiweek-view-event-box-"+EventSelectionArray[i].id ); + EventBoxes = document.getElementsByAttribute( "name", "multiweek-view-event-box-"+EventSelectionArray[i].id ); } for ( j = 0; j < EventBoxes.length; j++ ) { @@ -575,11 +576,12 @@ MultiweekView.prototype.refreshDisplay = function multiweekView_refreshDisplay( document.getElementById( "multiweek-view-header-day-"+i ).value = NewArrayOfDayNames[ (i-1) ]; } - for( var weekIndex = 1 ; weekIndex <= this.WeeksInView ; ++weekIndex ) + var weekIndex; + for( weekIndex = 1 ; weekIndex <= this.WeeksInView ; ++weekIndex ) { document.getElementById( "multiweek-week-" + weekIndex + "-row" ).removeAttribute( "collapsed" ); } - for( var weekIndex = this.WeeksInView + 1 ; weekIndex <= 6 ; ++weekIndex ) + for( weekIndex = this.WeeksInView + 1 ; weekIndex <= 6 ; ++weekIndex ) { document.getElementById( "multiweek-week-" + weekIndex + "-row" ).setAttribute( "collapsed", "true" ); } @@ -634,7 +636,7 @@ MultiweekView.prototype.refreshDisplay = function multiweekView_refreshDisplay( var mondayDate ; var newoffset = (Offset >= 5) ? 8 -Offset : 1 - Offset ; - for( var weekIndex = 0; weekIndex < this.WeeksInView; ++weekIndex ) + for( weekIndex = 0; weekIndex < this.WeeksInView; ++weekIndex ) { weekNumberItem = this.weekNumberItemArray[ weekIndex+1 ] ; mondayDate = new Date( this.firstDateOfView.getFullYear(), @@ -1034,7 +1036,7 @@ MultiweekView.prototype.setFictitiousEvents = function multiweekView_setFictitio { var dayBoxItem = this.dayBoxItemArray[ 3 ]; if( !dayBoxItem ) - return false; + return; // Make a box item to hold the event var eventBox = document.createElement( "box" ); eventBox.setAttribute( "id", "multiweek-view-event-box-fictitious" ); diff --git a/mozilla/calendar/resources/content/unifinder.js b/mozilla/calendar/resources/content/unifinder.js index 9b97b5d9006..5b7b96c0ced 100644 --- a/mozilla/calendar/resources/content/unifinder.js +++ b/mozilla/calendar/resources/content/unifinder.js @@ -547,7 +547,7 @@ var treeView = var eventEndDate = getNextOrPreviousRecurrence( calendarEvent ); var eventLength = calendarEvent.end.getTime() - calendarEvent.start.getTime(); var actualEndDate = eventEndDate.getTime() + eventLength; - var eventEndDate = new Date( actualEndDate ); + eventEndDate = new Date( actualEndDate ); var endTime = formatUnifinderEventTime( eventEndDate ); var endDate = formatUnifinderEventDate( eventEndDate ); if( calendarEvent.allDay ) @@ -774,14 +774,15 @@ function getPreviewText( calendarEvent ) var diff = DateUtils.getDifferenceInDays(startDate, endDate) ; var DateHtml = document.createElement( "description" ); + var DateText; if (calendarEvent.allDay) { if ( diff > 1 ) { textString = gCalendarBundle.getFormattedString("tooltipEventStart", [gCalendarWindow.dateFormater.getFormatedDate( startDate ), ""]); - var DateText = document.createTextNode( textString ); - DateHtml.appendChild( DateText ); - HolderBox.appendChild( DateHtml ); + DateText = document.createTextNode( textString ); + DateHtml.appendChild( DateText ); + HolderBox.appendChild( DateHtml ); DateHtml = document.createElement( "description" ); textString = gCalendarBundle.getFormattedString("tooltipEventEnd", @@ -798,10 +799,10 @@ function getPreviewText( calendarEvent ) textString = gCalendarBundle.getFormattedString("tooltipEventStart", [gCalendarWindow.dateFormater.getFormatedDate( startDate ), gCalendarWindow.dateFormater.getFormatedTime( startDate )]); - var DateText = document.createTextNode( textString ); + DateText = document.createTextNode( textString ); DateHtml.appendChild( DateText ); HolderBox.appendChild( DateHtml ); - DateHtml = document.createElement( "description" ); + DateHtml = document.createElement( "description" ); textString = gCalendarBundle.getFormattedString("tooltipEventEnd", [gCalendarWindow.dateFormater.getFormatedDate( endDate ), @@ -827,7 +828,7 @@ function getPreviewText( calendarEvent ) var nbmaxlines = 5 ; var nblines = lines.length ; if( nblines > nbmaxlines ) { - var nblines = nbmaxlines ; + nblines = nbmaxlines ; lines[ nblines - 1 ] = "..." ; } diff --git a/mozilla/calendar/resources/content/unifinderToDo.js b/mozilla/calendar/resources/content/unifinderToDo.js index 11a085076c7..190d7431b75 100644 --- a/mozilla/calendar/resources/content/unifinderToDo.js +++ b/mozilla/calendar/resources/content/unifinderToDo.js @@ -325,7 +325,7 @@ var toDoTreeView = cycleCell : function(row,colId) { calendarToDo = gTaskArray[row]; - if( !calendarToDo ) return false; + if( !calendarToDo ) return; if( colId == "unifinder-todo-tree-col-completed") { diff --git a/mozilla/calendar/resources/content/weekView.js b/mozilla/calendar/resources/content/weekView.js index d6a057ed4ae..a437e5df479 100644 --- a/mozilla/calendar/resources/content/weekView.js +++ b/mozilla/calendar/resources/content/weekView.js @@ -243,8 +243,8 @@ WeekView.prototype.refreshEvents = function( ) //START FOR LOOP FOR DAYS---> for ( dayIndex = 1; dayIndex <= 7; ++dayIndex ) { - var dayToGet = new Date( gHeaderDateItemArray[dayIndex].getAttribute( "date" ) ); - var dayToGetDay = dayToGet.getDay() ; + dayToGet = new Date( gHeaderDateItemArray[dayIndex].getAttribute( "date" ) ); + dayToGetDay = dayToGet.getDay() ; if( gOnlyWorkdayChecked === "true" && ( dayToGetDay == 0 || dayToGetDay == 6 )) { /* its a weekend */ @@ -432,7 +432,7 @@ WeekView.prototype.createEventBox = function ( calendarEventDisplay, dayIndex ) top = top - ElementOfRef.parentNode.boxObject.y - 2; eventBox.setAttribute( "top", top ); - var dayIndex = new Date( gHeaderDateItemArray[1].getAttribute( "date" ) ); + dayIndex = new Date( gHeaderDateItemArray[1].getAttribute( "date" ) ); var index = displayDateObject.getDay( ) - dayIndex.getDay( ); if( index < 0 ) @@ -476,7 +476,7 @@ WeekView.prototype.createEventBox = function ( calendarEventDisplay, dayIndex ) eventDescriptionElement.setAttribute( "flex", "1" ); var DescriptionText = document.createTextNode( " " ); eventDescriptionElement.appendChild( DescriptionText ); - eventDescriptionElement.setAttribute( "style", "height: "+Height+";" ); + eventDescriptionElement.setAttribute( "height", Height ); eventDescriptionElement.setAttribute( "crop", "end" ); eventDescriptionElement.setAttribute( "ondraggesture", "nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ); eventDescriptionElement.setAttribute( "ondragover", "nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ); @@ -561,11 +561,12 @@ WeekView.prototype.refreshDisplay = function( ) var viewMonth = selectedDate.getMonth(); var viewYear = selectedDate.getFullYear(); - NewArrayOfDayNames = new Array(); + var NewArrayOfDayNames = new Array(); /* Set the header information for the week view */ + var i; for( i = 0; i < ArrayOfDayNames.length; i++ ) { NewArrayOfDayNames[i] = ArrayOfDayNames[i]; @@ -701,7 +702,7 @@ WeekView.prototype.selectBoxForEvent = function( calendarEvent ) { var EventBoxes = document.getElementsByAttribute( "name", "week-view-event-box-"+calendarEvent.id ); - for ( j = 0; j < EventBoxes.length; j++ ) + for ( var j = 0; j < EventBoxes.length; j++ ) { EventBoxes[j].setAttribute( "eventselected", "true" ); } @@ -709,7 +710,7 @@ WeekView.prototype.selectBoxForEvent = function( calendarEvent ) WeekView.prototype.getVisibleEvent = function( calendarEvent ) { - eventBox = document.getElementById( "week-view-event-box-"+calendarEvent.id ); + var eventBox = document.getElementById( "week-view-event-box-"+calendarEvent.id ); if ( eventBox ) { return eventBox; @@ -773,7 +774,7 @@ WeekView.prototype.hiliteTodaysDate = function( ) { //clear out the old today boxes. var OldTodayArray = document.getElementsByAttribute( "today", "true" ); - for ( i = 0; i < OldTodayArray.length; i++ ) + for ( var i = 0; i < OldTodayArray.length; i++ ) { OldTodayArray[i].removeAttribute( "today" ); } @@ -820,7 +821,7 @@ WeekView.prototype.clearSelectedEvent = function( ) //Event = gCalendarWindow.getSelectedEvent(); var ArrayOfBoxes = document.getElementsByAttribute( "eventselected", "true" ); - for( i = 0; i < ArrayOfBoxes.length; i++ ) + for( var i = 0; i < ArrayOfBoxes.length; i++ ) { ArrayOfBoxes[i].removeAttribute( "eventselected" ); }