diff --git a/calendar/resources/content/about.html b/calendar/resources/content/about.html
index 32cfd5e4b59..6e1d9e5533b 100644
--- a/calendar/resources/content/about.html
+++ b/calendar/resources/content/about.html
@@ -78,7 +78,7 @@ h1 {
 
 <td id="mozver">
 <h1>
-<a id="mozlink" href="http://www.mozilla.org/projects/calendar/" target="_new">Mozilla Calendar 2002112114-cal</a>
+<a id="mozlink" href="http://www.mozilla.org/projects/calendar/" target="_new">Mozilla Calendar 2002112213-cal</a>
 </h1>
 <script type="application/x-javascript">
   // using try..catch to handle empty useragents and other cases where the regex fails to apply
diff --git a/calendar/resources/content/calendar.js b/calendar/resources/content/calendar.js
index 0e69f9e0b77..19c8250ac83 100644
--- a/calendar/resources/content/calendar.js
+++ b/calendar/resources/content/calendar.js
@@ -457,12 +457,14 @@ var gNewDateVariable = null;
 
 function newEventCommand( event )
 {
+   var startDate;
+
    if( gNewDateVariable != null )
    {
-      var startDate = gNewDateVariable;
+      startDate = gNewDateVariable;
    }
    else
-      var startDate = gCalendarWindow.currentView.getNewEventDate();
+      startDate = gCalendarWindow.currentView.getNewEventDate();
 
    var Minutes = Math.ceil( startDate.getMinutes() / 5 ) * 5 ;
    
@@ -768,6 +770,8 @@ function deleteEventCommand( DoNotConfirm )
 
       gICalLib.batchMode = true;
       
+      var ThisItem;
+
       if( !DoNotConfirm )
       {
          if( confirm( "Are you sure you want to delete all selected events?" ) )
@@ -776,7 +780,7 @@ function deleteEventCommand( DoNotConfirm )
             
             while( SelectedItems.length )
             {
-               var ThisItem = SelectedItems.pop();
+               ThisItem = SelectedItems.pop();
                
                gICalLib.deleteEvent( ThisItem.id );
             }
@@ -788,7 +792,7 @@ function deleteEventCommand( DoNotConfirm )
             
          while( SelectedItems.length )
          {
-            var ThisItem = SelectedItems.pop();
+            ThisItem = SelectedItems.pop();
             
             gICalLib.deleteEvent( ThisItem.id );
          }
@@ -897,16 +901,16 @@ function getPreviewTextForRepeatingEvent( calendarEventDisplay )
 
    if( calendarEventDisplay.recur == true )
    {
-      var DateHtml = document.createElement( "description" );
-      var DateText = document.createTextNode( "This is a repeating event." );
+      DateHtml = document.createElement( "description" );
+      DateText = document.createTextNode( "This is a repeating event." );
       DateHtml.appendChild( DateText );
       HolderBox.appendChild( DateHtml );
    }
    else
    {
-      var DateHtml = document.createElement( "description" );
-      var startDate = new Date( calendarEventDisplay.event.end.getTime() );
-      var DateText = document.createTextNode( "End: "+gCalendarWindow.dateFormater.getFormatedDate( startDate )+" "+gCalendarWindow.dateFormater.getFormatedTime( startDate ) );
+      DateHtml = document.createElement( "description" );
+      startDate = new Date( calendarEventDisplay.event.end.getTime() );
+      DateText = document.createTextNode( "End: "+gCalendarWindow.dateFormater.getFormatedDate( startDate )+" "+gCalendarWindow.dateFormater.getFormatedTime( startDate ) );
       DateHtml.appendChild( DateText );
       HolderBox.appendChild( DateHtml );
    }
diff --git a/calendar/resources/content/calendarClipboard.js b/calendar/resources/content/calendarClipboard.js
index 4af92b392b1..e69de29bb2d 100644
--- a/calendar/resources/content/calendarClipboard.js
+++ b/calendar/resources/content/calendarClipboard.js
@@ -1,289 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Calendar code.
- *
- * The Initial Developer of the Original Code is
- * ArentJan Banck <ajbanck@planet.nl>.
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): ArentJan Banck <ajbanck@planet.nl>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***** calendarClipboard
-*
-* NOTES 
-*   TODO items
-*     - Add a clipboard listener, to enable/disable menu-items depending if 
-*       valid clipboard data is available.
-*
-******/
-
-
-function getClipboard()
-{
-   const kClipboardContractID = "@mozilla.org/widget/clipboard;1";
-   const kClipboardIID = Components.interfaces.nsIClipboard;
-   return Components.classes[kClipboardContractID].getService(kClipboardIID);
-}
-
-
-function createTransferable()
-{
-   const kTransferableContractID = "@mozilla.org/widget/transferable;1";
-   const kTransferableIID = Components.interfaces.nsITransferable
-   return Components.classes[kTransferableContractID].createInstance(kTransferableIID);
-}
-
-
-function createSupportsArray()
-{
-   const kSuppArrayContractID = "@mozilla.org/supports-array;1";
-   const kSuppArrayIID = Components.interfaces.nsISupportsArray;
-   return Components.classes[kSuppArrayContractID].createInstance(kSuppArrayIID);
-}
-
-
-// Should we use (wide)String only, or no (wide)Strings for compatibility?
-function createSupportsCString()
-{
-   const kSuppStringContractID = "@mozilla.org/supports-cstring;1";
-   const kSuppStringIID = Components.interfaces.nsISupportsCString;
-   return Components.classes[kSuppStringContractID].createInstance(kSuppStringIID);
-}
-
-
-function createSupportsString()
-{
-   const kSuppStringContractID = "@mozilla.org/supports-string;1";
-   const kSuppStringIID = Components.interfaces.nsISupportsString;
-   return Components.classes[kSuppStringContractID].createInstance(kSuppStringIID);
-}
-
-
-function createSupportsWString()
-{
-   const kSuppStringContractID = "@mozilla.org/supports-wstring;1";
-   const kSuppStringIID = Components.interfaces.nsISupportsWString;
-   return Components.classes[kSuppStringContractID].createInstance(kSuppStringIID);
-}
-
-
-/** 
-* Test if the clipboard has items that can be pasted into Calendar.
-* This must be of type "text/calendar" or "text/unicode"
-*/
-
-function canPaste()
-{
-   const kClipboardIID = Components.interfaces.nsIClipboard;
-
-   var clipboard = getClipboard();
-   var flavourArray = createSupportsArray();   
-   var flavours = ["text/calendar", "text/unicode"];
-   
-   for (var i = 0; i < flavours.length; ++i)
-   {
-      const kSuppString = createSupportsCString();
-      kSuppString.data = flavours[i];
-      flavourArray.AppendElement(kSuppString);
-   }
-   
-   return clipboard.hasDataMatchingFlavors(flavourArray, kClipboardIID.kGlobalClipboard);
-}
-
-
-/** 
-* Copy iCalendar data to the Clipboard, and delete the selected events.
-* Does not use eventarray parameter, because DeletCcommand delete selected events.
-*/
-
-function cutToClipboard( /* calendarEventArray */)
-{
-  // if( !calendarEventArray)
-  var calendarEventArray = gCalendarWindow.EventSelection.selectedEvents;
-
-   if( copyToClipboard( calendarEventArray ) )
-   {
-      deleteEventCommand( true ); // deletes all selected events without prompting.
-   }
-}
-
-
-/** 
-* Copy iCalendar data to the Clipboard. The data is copied to three types:
-* 1) text/calendar. Found that name somewhere in mail code. not used outside
-*    Calendar as far as I know, so this can be customized for internal use.
-* 2) text/unicode. Plaintext iCalendar data, tested on Windows for Outlook 2000 
-*    and Lotus Organizer.
-* 3) text/html. Not for parsing, only pretty looking calendar data.
-*
-**/
-
-function copyToClipboard( calendarEventArray )
-{  
-   if( !calendarEventArray)
-   {
-      var calendarEventArray = new Array();
-      calendarEventArray = gCalendarWindow.EventSelection.selectedEvents;
-   }
-
-   if(calendarEventArray.length == 0)
-      alert("No events selected");
-
-   var calendarEvent;  
-   var sTextiCalendar = eventArrayToICalString( calendarEventArray );
-   var sTextiCalendarExport =  eventArrayToICalString( calendarEventArray, true );
-   var sTextHTML = eventArrayToHTML( calendarEventArray ); 
-
-   // 1. get the clipboard service
-   var clipboard = getClipboard();
-
-   // 2. create the transferable
-   var trans = createTransferable(); 
-
-   if ( trans && clipboard) {
-
-      // 3. register the data flavors
-      trans.addDataFlavor("text/calendar");
-      trans.addDataFlavor("text/unicode");
-      trans.addDataFlavor("text/html");
-
-      // 4. create the data objects
-      var icalWrapper = createSupportsString();
-      var textWrapper = createSupportsString();
-      var htmlWrapper = createSupportsString();
-
-      if ( icalWrapper && textWrapper && htmlWrapper ) {
-         // get the data
-         icalWrapper.data = sTextiCalendar;        // plainTextRepresentation;
-         textWrapper.data = sTextiCalendarExport;  // plainTextRepresentation;
-         htmlWrapper.data = sTextHTML;             // htmlRepresentation;
-
-         // 5. add data objects to transferable
-         // Both Outlook 2000 client and Lotus Organizer use text/unicode when pasting iCalendar data
-         trans.setTransferData ( "text/calendar", icalWrapper, icalWrapper.data.length*2 ); // double byte data
-         trans.setTransferData ( "text/unicode", textWrapper, textWrapper.data.length*2 );
-         trans.setTransferData ( "text/html", htmlWrapper, htmlWrapper.data.length*2 );
-
-         clipboard.setData( trans, null, Components.interfaces.nsIClipboard.kGlobalClipboard );
-
-         return true;         
-      }
-   }
-}
-
-
-/** 
-* Paste iCalendar events from the clipboard, 
-* or paste clipboard text into description of new event
-*/
-
-function pasteFromClipboard()
-{
-   const kClipboardIID = Components.interfaces.nsIClipboard;
-
-   if( canPaste() ) {   
-      // 1. get the clipboard service
-      var clipboard = getClipboard();
-
-      // 2. create the transferable
-      var trans = createTransferable();
-  
-      if ( trans && clipboard) {
-                     
-         // 3. register the data flavors you want, highest fidelity first!
-         trans.addDataFlavor("text/calendar");
-         trans.addDataFlavor("text/unicode");
-
-         // 4. get transferable from clipboard
-	 clipboard.getData ( trans, kClipboardIID.kGlobalClipboard);
-
-	 // 5. ask transferable for the best flavor. Need to create new JS
-         //    objects for the out params.
-	 var flavour = { };
-	 var data = { };
-	 var length = { };
-	 trans.getAnyTransferData(flavour, data, length);
-	 data = data.value.QueryInterface(Components.interfaces.nsISupportsString).data;
-	 //DEBUG alert("clipboard type: " + flavour.value);
-    var calendarEventArray;
-    var startDate;
-
-	 switch (flavour.value) {
-	 case "text/calendar":
-            
-            calendarEventArray = parseIcalData( data );
-            
-            //change the date of all the events to now
-            startDate = gCalendarWindow.currentView.getNewEventDate();
-            var MinutesToAddOn = getIntPref(gCalendarWindow.calendarPreferences.calendarPref, "event.defaultlength", 60 );
-   
-            var endDateTime = startDate.getTime() + ( 1000 * 60 * MinutesToAddOn );
-   
-            for( var i = 0; i < calendarEventArray.length; i++ )
-            {
-               calendarEventArray[i].start.setTime( startDate );
-               calendarEventArray[i].end.setTime( endDateTime );
-            }
-            addEventsToCalendar( calendarEventArray );
-            break;
-	 case "text/unicode":
-            if ( data.indexOf("BEGIN:VEVENT") == -1 )
-            {
-               // no iCalendar data, paste clipboard text into description of new event 
-               calendarEvent = createEvent();
-               initCalendarEvent( calendarEvent );
-               calendarEvent.description = data;
-               editNewEvent( calendarEvent );
-            }
-            else
-            {
-               calendarEventArray = parseIcalData( data );
-               //change the date of all the events to now
-               startDate = gCalendarWindow.currentView.getNewEventDate();
-               var MinutesToAddOn = getIntPref(gCalendarWindow.calendarPreferences.calendarPref, "event.defaultlength", 60 );
-      
-               var endDateTime = startDate.getTime() + ( 1000 * 60 * MinutesToAddOn );
-      
-               for( var i = 0; i < calendarEventArray.length; i++ )
-               {
-                  calendarEventArray[i].start.setTime( startDate );
-                  calendarEventArray[i].end.setTime( endDateTime );
-               }
-               
-               addEventsToCalendar( calendarEventArray );
-            }
-            break;            
-	 default: 
-            alert("Unknown clipboard type: " + flavour.value);
-	 }
-      }
-   }
-   else
-     alert( "No iCalendar or text on the clipboard." );
-}
diff --git a/calendar/resources/content/calendarDayView.js b/calendar/resources/content/calendarDayView.js
index 32645058738..e69de29bb2d 100644
--- a/calendar/resources/content/calendarDayView.js
+++ b/calendar/resources/content/calendarDayView.js
@@ -1,596 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is OEone Calendar Code, released October 31st, 2001.
- *
- * The Initial Developer of the Original Code is
- * OEone Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Garth Smedley <garths@oeone.com>
- *                 Mike Potter <mikep@oeone.com>
- *                 Colin Phillips <colinp@oeone.com> 
- *                 Karl Guertin <grayrest@grayrest.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*-----------------------------------------------------------------
-*   DayView Class  subclass of CalendarView
-*
-*  Calendar day view class
-*
-* PROPERTIES
-*
-*    NOTES
-*
-* 
-*/
-
-// Make DayView inherit from CalendarView
-
-DayView.prototype = new CalendarView();
-DayView.prototype.constructor = DayView;
-
-/**
-*   DayView Constructor.
-* 
-* PARAMETERS
-*      calendarWindow     - the owning instance of CalendarWindow.
-*
-*/
-
-
-function DayView( calendarWindow )
-{
-   // call super
-   
-   this.superConstructor( calendarWindow );
-   
-   //set the time on the left hand side labels
-   //need to do this in JavaScript to preserve formatting
-   for( var i = 0; i < 24; i++ )
-   {
-      /*
-      ** FOR SOME REASON, THIS IS NOT WORKING FOR MIDNIGHT
-      */ 
-      var TimeToFormat = new Date();
-
-      TimeToFormat.setHours( i );
-
-      TimeToFormat.setMinutes( "0" );
-
-      var FormattedTime = calendarWindow.dateFormater.getFormatedTime( TimeToFormat );
-
-      var Label = document.getElementById( "day-view-hour-"+i );
-      
-      Label.setAttribute( "value", FormattedTime );
-   }
-   
-   var dayViewEventSelectionObserver =
-   {
-      onSelectionChanged : function dv_EventSelectionObserver_OnSelectionChanged( EventSelectionArray )
-      {
-         for( i = 0; i < EventSelectionArray.length; i++ )
-         {
-            gCalendarWindow.dayView.selectBoxForEvent( EventSelectionArray[i] );
-         }
-      }
-   }
-      
-   calendarWindow.EventSelection.addObserver( dayViewEventSelectionObserver );
-}
-
-
-/** PUBLIC
-*
-*   Redraw the events for the current month
-* 
-*/
-
-DayView.prototype.refreshEvents = function dayview_refreshEvents( )
-{
-   this.kungFooDeathGripOnEventBoxes = new Array();
-
-   // remove old event boxes
-   
-   var eventBoxList = document.getElementsByAttribute( "eventbox", "dayview" );
-
-   for( var eventBoxIndex = 0;  eventBoxIndex < eventBoxList.length; ++eventBoxIndex )
-   {
-      var eventBox = eventBoxList[ eventBoxIndex ];
-      
-      eventBox.parentNode.removeChild( eventBox );
-   }
-   
-   //get the all day box.
-   
-   var AllDayBox = document.getElementById( "all-day-content-box" );
-   AllDayBox.setAttribute( "collapsed", "true" );      
-   
-   //remove all the text from the all day content box.
-   
-   while( AllDayBox.hasChildNodes() )
-   {
-      AllDayBox.removeChild( AllDayBox.firstChild );
-   }
-
-   //shrink the day's content box.
-   
-   document.getElementById( "day-view-content-box" ).removeAttribute( "allday" );
-
-   //make the text node that will contain the text for the all day box.
-   var calendarStringBundle = srGetStrBundle("chrome://calendar/locale/calendar.properties");
-   
-   HtmlNode = document.createElement( "description" );
-   HtmlNode.setAttribute( "class", "all-day-content-box-text-title" );
-   TextNode = document.createTextNode( calendarStringBundle.GetStringFromName( "AllDayEvents" ) );
-   HtmlNode.appendChild( TextNode );
-   document.getElementById( "all-day-content-box" ).appendChild( HtmlNode );
-      
-   // get the events for the day and loop through them
-   
-   var dayEventList = this.calendarWindow.eventSource.getEventsForDay( this.calendarWindow.getSelectedDate() );
-   
-   //refresh the array and the current spot.
-   var LowestStartHour = getIntPref( this.calendarWindow.calendarPreferences.calendarPref, "event.defaultstarthour", 8 );
-   var HighestEndHour = getIntPref( this.calendarWindow.calendarPreferences.calendarPref, "event.defaultendhour", 17 );;
-   for ( var i = 0; i < dayEventList.length; i++ ) 
-   {
-      dayEventList[i].OtherSpotArray = new Array('0');
-      dayEventList[i].CurrentSpot = 0;
-      dayEventList[i].NumberOfSameTimeEvents = 0;
-      if( dayEventList[i].event.allDay != true )
-      {
-         var ThisLowestStartHour = new Date( dayEventList[0].displayDate.getTime() );
-         if( ThisLowestStartHour.getHours() < LowestStartHour ) 
-            LowestStartHour = ThisLowestStartHour.getHours();
-         
-         var EndDate = new Date( dayEventList[i].event.end.getTime() );
-         if( EndDate.getHours() > HighestEndHour )
-            HighestEndHour = EndDate;
-      }
-   }
-
-   for( i = 0; i < 24; i++ )
-   {
-      document.getElementById( "day-tree-item-"+i ).removeAttribute( "collapsed" );
-   }
-
-   //alert( "LowestStartHour is "+LowestStartHour );
-   for( i = 0; i < LowestStartHour; i++ )
-   {
-      document.getElementById( "day-tree-item-"+i ).setAttribute( "collapsed", "true" );
-   }
-   
-   for( i = ( HighestEndHour + 1 ); i < 24; i++ )
-   {
-      document.getElementById( "day-tree-item-"+i ).setAttribute( "collapsed", "true" );
-   }
-   
-   for ( i = 0; i < dayEventList.length; i++ ) 
-   {
-      var calendarEventDisplay = dayEventList[i];
-            
-      //check to make sure that the event is not an all day event...
-      if ( calendarEventDisplay.event.allDay != true ) 
-      {
-         //see if there's another event at the same start time.
-         
-         for ( j = 0; j < dayEventList.length; j++ ) 
-         {
-            thisCalendarEventDisplay = dayEventList[j];
-   
-            //if this event overlaps with another event...
-            if ( ( ( thisCalendarEventDisplay.displayDate >= calendarEventDisplay.displayDate &&
-                 thisCalendarEventDisplay.displayDate.getTime() < calendarEventDisplay.event.end.getTime() ) ||
-                  ( calendarEventDisplay.displayDate >= thisCalendarEventDisplay.displayDate &&
-                 calendarEventDisplay.displayDate.getTime() < thisCalendarEventDisplay.event.end.getTime() ) ) &&
-                 calendarEventDisplay.event.id != thisCalendarEventDisplay.event.id &&
-                 thisCalendarEventDisplay.event.allDay != true )
-            {
-                  //get the spot that this event will go in.
-               var ThisSpot = thisCalendarEventDisplay.CurrentSpot;
-               
-               calendarEventDisplay.OtherSpotArray.push( ThisSpot );
-               ThisSpot++;
-               
-               if ( ThisSpot > calendarEventDisplay.CurrentSpot ) 
-               {
-                  calendarEventDisplay.CurrentSpot = ThisSpot;
-               } 
-            }
-         }
-         SortedOtherSpotArray = new Array();
-         SortedOtherSpotArray = calendarEventDisplay.OtherSpotArray.sort( this.calendarWindow.compareNumbers );
-         LowestNumber = this.calendarWindow.getLowestElementNotInArray( SortedOtherSpotArray );
-         
-         //this is the actual spot (0 -> n) that the event will go in on the day view.
-         calendarEventDisplay.CurrentSpot = LowestNumber;
-         calendarEventDisplay.NumberOfSameTimeEvents = SortedOtherSpotArray.length;
-      }
-   }
-   
-   for ( var eventIndex = 0; eventIndex < dayEventList.length; ++eventIndex )
-   {
-      calendarEventDisplay = dayEventList[ eventIndex ];
-
-      //if its an all day event, don't show it in the hours stack.
-      if ( calendarEventDisplay.event.allDay == true ) 
-      {
-         // build up the text to show for this event
-         
-         var eventText = calendarEventDisplay.event.title;
-         
-         if( calendarEventDisplay.event.location )
-         {
-            eventText += " " + calendarEventDisplay.event.location;
-         }
-            
-         if( calendarEventDisplay.event.description )
-         {
-            eventText += " " + calendarEventDisplay.event.description;
-         }
-         
-         //show the all day box 
-         AllDayBox.removeAttribute( "collapsed" );
-         
-         //shrink the day's content box.
-         document.getElementById( "day-view-content-box" ).setAttribute( "allday", "true" );
-         
-         //note the use of the AllDayText Attribute.  
-         //This is used to remove the text when the day is changed.
-         
-         newTextNode = document.createElement( "label" );
-         newTextNode.setAttribute( "value", eventText );
-         newTextNode.calendarEventDisplay = calendarEventDisplay;
-         newTextNode.setAttribute( "onmouseover", "gCalendarWindow.changeMouseOverInfo( calendarEventDisplay, event )" );
-         newTextNode.setAttribute( "onclick", "dayEventItemClick( this, event )" );
-         newTextNode.setAttribute( "ondblclick", "dayEventItemDoubleClick( this, event )" );
-         newTextNode.setAttribute( "tooltip", "eventTooltip" );
-         newTextNode.setAttribute( "AllDayText", "true" );
-         
-         newImage = document.createElement("image");
-         newImage.setAttribute( "class", "all-day-event-class" );
-         newImage.calendarEventDisplay = calendarEventDisplay;
-         newImage.setAttribute( "onmouseover", "gCalendarWindow.changeMouseOverInfo( calendarEventDisplay, event )" );
-         newImage.setAttribute( "onclick", "dayEventItemClick( this, event )" );
-         newImage.setAttribute( "ondblclick", "dayEventItemDoubleClick( this, event )" );
-         newImage.setAttribute( "tooltip", "eventTooltip" );
-         //newImage.setAttribute( "AllDayText", "true" );
-         
-         AllDayBox.appendChild( newImage );
-         AllDayBox.appendChild( newTextNode );
-      }
-      else
-      {
-         eventBox = this.createEventBox( calendarEventDisplay );    
-         
-         //add the box to the stack.
-         document.getElementById( "day-view-content-board" ).appendChild( eventBox );
-      }
-
-      // select the hour of the selected item, if there is an item whose date matches
-      
-      // mark the box as selected, if the event is
-            
-      if( this.calendarWindow.EventSelection.isSelectedEvent( calendarEventDisplay.event ) )
-      {
-         this.selectBoxForEvent( calendarEventDisplay.event );
-      }
-   }
-}
-
-/** PRIVATE
-*
-*   This creates an event box for the day view
-*/
-DayView.prototype.createEventBox = function dayview_createEventBox( calendarEventDisplay )
-{
-   var eventStartDate = calendarEventDisplay.displayDate;
-   var eventEndDate = calendarEventDisplay.displayEndDate;
-   var startHour = eventStartDate.getHours();
-   var startMinutes = eventStartDate.getMinutes();
-
-   var eventEndDateTime = new Date( 2000, 1, 1, eventEndDate.getHours(), eventEndDate.getMinutes(), 0 );
-   var eventStartDateTime = new Date( 2000, 1, 1, eventStartDate.getHours(), eventStartDate.getMinutes(), 0 );
-
-   var eventDuration = new Date( eventEndDateTime - eventStartDateTime );
-   
-   var hourDuration = eventDuration / (3600000);
-   
-   var eventBox = document.createElement( "vbox" );
-   
-   var boxHeight = document.getElementById( "day-tree-item-"+startHour ).boxObject.height;
-   var topHeight = document.getElementById( "day-tree-item-"+startHour ).boxObject.y - document.getElementById( "day-tree-item-"+startHour ).parentNode.boxObject.y;
-   var boxWidth = document.getElementById( "day-tree-item-"+startHour ).boxObject.width;
-   
-   var topHeight = eval( topHeight + ( ( startMinutes/60 ) * boxHeight ) );
-   topHeight = Math.round( topHeight ) - 2;
-   eventBox.setAttribute( "top", topHeight );
-   
-   eventBox.setAttribute( "height", Math.round( ( hourDuration*boxHeight ) + 1 ) );
-   
-   var width = Math.round( ( boxWidth-kDayViewHourLeftStart ) / calendarEventDisplay.NumberOfSameTimeEvents );
-   eventBox.setAttribute( "width", width );
-   
-   var left = eval( ( ( calendarEventDisplay.CurrentSpot - 1 ) * width )  + kDayViewHourLeftStart );
-   left = left - ( calendarEventDisplay.CurrentSpot - 1 );
-   eventBox.setAttribute( "left", Math.round( left ) );
-   
-   //if you change this class, you have to change calendarViewDNDObserver in calendarDragDrop.js
-   eventBox.setAttribute( "class", "day-view-event-class" );
-   eventBox.setAttribute( "flex", "1" );
-   eventBox.setAttribute( "eventbox", "dayview" );
-   eventBox.setAttribute( "onclick", "dayEventItemClick( this, event )" );
-   eventBox.setAttribute( "ondblclick", "dayEventItemDoubleClick( this, event )" );
-   // dragdrop events
-   eventBox.setAttribute( "ondraggesture", "nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" );
-   eventBox.setAttribute( "ondragover", "nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" );
-   eventBox.setAttribute( "ondragdrop", "nsDragAndDrop.drop(event,calendarViewDNDObserver)" );
-
-   eventBox.setAttribute( "onmouseover", "gCalendarWindow.changeMouseOverInfo( calendarEventDisplay, event )" );
-   eventBox.setAttribute( "tooltip", "eventTooltip" );
-   eventBox.setAttribute( "name", "day-view-event-box-"+calendarEventDisplay.event.id );
-   if( calendarEventDisplay.event.categories && calendarEventDisplay.event.categories != "" )
-   {
-      eventBox.setAttribute( calendarEventDisplay.event.categories, "true" );
-   }
-
-   var eventHTMLElement = document.createElement( "label" );
-   eventHTMLElement.setAttribute( "value", calendarEventDisplay.event.title );
-   eventHTMLElement.setAttribute( "flex", "1" );
-   eventHTMLElement.setAttribute( "crop", "end" );
-   eventBox.appendChild( eventHTMLElement );
-   
-   /*
-   if( calendarEventDisplay.event.description != "" )
-   {
-      var eventHTMLElement2 = document.createElement( "description" );
-      eventHTMLElement2.setAttribute( "value", calendarEventDisplay.event.description );
-      eventHTMLElement2.setAttribute( "flex", "1" );
-      eventHTMLElement2.setAttribute( "crop", "end" );
-      eventBox.appendChild( eventHTMLElement2 );
-   }
-   */
-   // add a property to the event box that holds the calendarEvent that the
-   // box represents
-   
-   eventBox.calendarEventDisplay = calendarEventDisplay;
-   
-   this.kungFooDeathGripOnEventBoxes.push( eventBox );
-         
-   return( eventBox );
-
-}
-
-
-/** PUBLIC
-*
-*   Called when the user switches from a different view
-*/
-
-DayView.prototype.switchFrom = function dayview_switchFrom( )
-{
-}
-
-
-/** PUBLIC
-*
-*   Called when the user switches to the day view
-*/
-
-DayView.prototype.switchTo = function dayview_switchTo( )
-{
-   // disable/enable view switching buttons   
-
-   var weekViewButton = document.getElementById( "week_view_command" );
-   var monthViewButton = document.getElementById( "month_view_command" );
-   var dayViewButton = document.getElementById( "day_view_command" );
-   
-   monthViewButton.removeAttribute( "disabled" );
-   weekViewButton.removeAttribute( "disabled" );
-   dayViewButton.setAttribute( "disabled", "true" );
-   
-   // switch views in the deck
-   
-   var calendarDeckItem = document.getElementById( "calendar-deck" );
-   calendarDeckItem.selectedIndex = 2;
-}
-
-
-/** PUBLIC
-*
-*   Redraw the display, but not the events
-*/
-
-DayView.prototype.refreshDisplay = function dayview_refreshDisplay( )
-{
-   // update the title
-   var dayName = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() );
-	if (this.calendarWindow.getSelectedDate().getDay() < 2)
-	{
-		if (this.calendarWindow.getSelectedDate().getDay() == 0)
-		{
-			var dayNamePrev1 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() + 6 );
-			var dayNamePrev2 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() + 5 );
-		}
-		else
-		{
-			var dayNamePrev1 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() - 1 );
-			var dayNamePrev2 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() + 5 );
-		}
-	}
-	else
-	{
-		var dayNamePrev1 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() - 1 );
-		var dayNamePrev2 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() - 2 );
-	}
-	if (this.calendarWindow.getSelectedDate().getDay() > 4)
-	{
-		if (this.calendarWindow.getSelectedDate().getDay() == 6)
-		{
-			var dayNameNext1 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() - 6);
-			var dayNameNext2 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() - 5);
-		}
-		else
-		{
-			var dayNameNext1 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() + 1);
-			var dayNameNext2 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() - 5);
-		}
-	}
-	else
-	{
-		var dayNameNext1 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() + 1);
-		var dayNameNext2 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() + 2);
-	}
-   var monthName = this.calendarWindow.dateFormater.getMonthName( this.calendarWindow.getSelectedDate().getMonth() );
-   
-   var dateString = monthName + " " + this.calendarWindow.getSelectedDate().getDate() + " " + this.calendarWindow.getSelectedDate().getFullYear();
-   
-   var dayTextItemPrev2 = document.getElementById( "-2-day-title" );
-   var dayTextItemPrev1 = document.getElementById( "-1-day-title" );
-   var dayTextItem = document.getElementById( "0-day-title" );
-   var dayTextItemNext1 = document.getElementById( "1-day-title" );
-   var dayTextItemNext2 = document.getElementById( "2-day-title" );
-	var daySpecificTextItem = document.getElementById( "0-day-specific-title" );
-   dayTextItemPrev2.setAttribute( "value" , dayNamePrev2 );
-   dayTextItemPrev1.setAttribute( "value" , dayNamePrev1 );
-   dayTextItem.setAttribute( "value" , dayName );
-   dayTextItemNext1.setAttribute( "value" , dayNameNext1 );
-   dayTextItemNext2.setAttribute( "value" , dayNameNext2 );
-	daySpecificTextItem.setAttribute( "value" , dateString );
-}
-
-
-/** PUBLIC
-*
-*   This is called when we are about the make a new event
-*   and we want to know what the default start date should be for the event.
-*/
-
-DayView.prototype.getNewEventDate = function dayview_getNewEventDate( )
-{
-   var start = new Date( this.calendarWindow.getSelectedDate() );
-   
-   start.setHours( start.getHours() );
-   start.setMinutes( Math.ceil( start.getMinutes() / 5 ) * 5 );
-   start.setSeconds( 0 );
-   
-   return start; 
-}
-
-
-/** PUBLIC
-*
-*   Go to the next day.
-*/
-
-DayView.prototype.goToNext = function dayview_goToNext(goDays)
-{
-   if (goDays)
-	{
-		var nextDay = new Date(  this.calendarWindow.selectedDate.getFullYear(),  this.calendarWindow.selectedDate.getMonth(), this.calendarWindow.selectedDate.getDate() + goDays );
-      this.goToDay( nextDay );
-   }
-	else
-	{
-      var nextDay = new Date(  this.calendarWindow.selectedDate.getFullYear(),  this.calendarWindow.selectedDate.getMonth(), this.calendarWindow.selectedDate.getDate() + 1 );
-      this.goToDay( nextDay );
-   }
-}
-
-
-/** PUBLIC
-*
-*   Go to the previous day.
-*/
-
-DayView.prototype.goToPrevious = function dayview_goToPrevious( goDays )
-{
-   if (goDays)
-	{
-      var prevDay = new Date(  this.calendarWindow.selectedDate.getFullYear(),  this.calendarWindow.selectedDate.getMonth(), this.calendarWindow.selectedDate.getDate() - goDays );
-      this.goToDay( prevDay );
-   }
-	else
-	{
-      var prevDay = new Date(  this.calendarWindow.selectedDate.getFullYear(),  this.calendarWindow.selectedDate.getMonth(), this.calendarWindow.selectedDate.getDate() - 1 );
-      this.goToDay( prevDay );
-   }
-}
-
-
-DayView.prototype.selectBoxForEvent = function dayview_selectBoxForEvent( calendarEvent )
-{
-   var EventBoxes = document.getElementsByAttribute( "name", "day-view-event-box-"+calendarEvent.id );
-   
-   for ( j = 0; j < EventBoxes.length; j++ ) 
-   {
-      EventBoxes[j].setAttribute( "eventselected", "true" );
-   }
-}
-
-/** PUBLIC
-*
-*   clear the selected event by taking off the selected attribute.
-*/
-DayView.prototype.clearSelectedEvent = function dayview_clearSelectedEvent( )
-{
-   var ArrayOfBoxes = document.getElementsByAttribute( "eventselected", "true" );
-
-   for( i = 0; i < ArrayOfBoxes.length; i++ )
-   {
-      ArrayOfBoxes[i].removeAttribute( "eventselected" );   
-   }
-}
-
-
-DayView.prototype.clearSelectedDate = function dayview_clearSelectedDate( )
-{
-   return;
-}
-
-
-DayView.prototype.getVisibleEvent = function dayview_getVisibleEvent( calendarEvent )
-{
-   eventBox = document.getElementById( "day-view-event-box-"+calendarEvent.id );
-   if ( eventBox ) 
-   {
-      return eventBox;
-   }
-   else
-      return false;
-
-}
-
-/*
-** This function is needed because it may be called after the end of each day.
-*/
-
-DayView.prototype.hiliteTodaysDate = function dayview_hiliteTodaysDate( )
-{
-   return;
-}
diff --git a/calendar/resources/content/calendarDragDrop.js b/calendar/resources/content/calendarDragDrop.js
index be0b2c3f83e..e69de29bb2d 100644
--- a/calendar/resources/content/calendarDragDrop.js
+++ b/calendar/resources/content/calendarDragDrop.js
@@ -1,327 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Calendar code.
- *
- * The Initial Developer of the Original Code is
- * ArentJan Banck <ajbanck@planet.nl>.
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): ArentJan Banck <ajbanck@planet.nl>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// TODO move nsIDragService definition
-//const nsIDragService = Components.interfaces.nsIDragService;
-
-// function to select whatever what is clicked to start dragging, Mozilla doesn't do this
-function calendarViewClick ( aEvent ) {
-   if(aEvent.target.className == "day-view-hour-box-class")
-      dayViewHourClick( aEvent );
-
-   if(aEvent.target.className == "day-view-event-class")
-      dayEventItemClick( aEvent.target, aEvent );
-
-   if (gCalendarWindow.currentView == gCalendarWindow.weekView)
-      ;//weekViewHourClick( aEvent );
-}
-
-//var startDateIndex;
-
-var calendarViewDNDObserver = {
-
-   getSupportedFlavours : function () {
-      var flavourSet = new FlavourSet();
-      flavourSet.appendFlavour("text/unicode");
-      flavourSet.appendFlavour("text/calendar");
-      flavourSet.appendFlavour("text/calendar-interval");
-      flavourSet.appendFlavour("text/x-moz-message-or-folder");
-      flavourSet.appendFlavour("application/x-moz-file", "nsIFile");
-      return flavourSet;
-   },
-
-
-   onDragStart: function (aEvent, aXferData, aDragAction){
-      // select clicked object, Mozilla doens't do this.
-      calendarViewClick( aEvent );
-
-      // aEvent.currentTarget;
-      if( aEvent.target.localName == "splitter" || aEvent.target.localName == "menu")
-         throw Components.results.NS_OK; // not a draggable item
-
-      if(aEvent.target.className == "day-view-event-class" ||
-         aEvent.target.className == "week-view-event-label-class")
-      {
-         // We are going to drag an event
-         var dragEvents = gCalendarWindow.EventSelection.selectedEvents;
-         aXferData.data= new TransferData();
-         aXferData.data.addDataForFlavour("text/calendar", eventArrayToICalString( dragEvents ) );
-         aXferData.data.addDataForFlavour("text/unicode", eventArrayToICalString( dragEvents, true ) );
-         //if (aEvent.ctrlKey) {
- 	 //  action.action = nsIDragService.DRAGDROP_ACTION_COPY ;
- 	 //}
-         aEvent.preventBubble();
-      }
-      else
-      {
-         // Dragging on the calendar canvas to select an event period
-         // var newDate = gHeaderDateItemArray[dayIndex].getAttribute( "date" );
-
-         var gStartDate = new Date( gCalendarWindow.getSelectedDate() );
-         this.startDateIndex = aEvent.target.getAttribute( "day" );
-
-         gStartDate.setHours( aEvent.target.getAttribute( "hour" ) );
-         gStartDate.setMinutes( 0 );
-         gStartDate.setSeconds( 0 );
-
-         aXferData.data=new TransferData();
-         aXferData.data.addDataForFlavour("text/calendar-interval", gStartDate.getTime() );
-
-         // aDragAction.action = nsIDragService.DRAGDROP_ACTION_MOVE;
-         aEvent.preventBubble();
-      }
-   },
-
-
-   onDragOver: function (aEvent, aFlavour, aDragSession)
-   {
-      if (aDragSession.isDataFlavorSupported("text/calendar-interval")) 
-      {
-         // multiday events not supported. In week view, do not allow more than one day in selection
-         if (gCalendarWindow.currentView == gCalendarWindow.weekView )
-         {
-            if (aEvent.target.getAttribute( "day" ) != this.startDateIndex)
-            {
-               aDragSession.canDrop = false;
-               return false;
-            }
-         }
-
-         // if (aDragSession.isDataFlavorSupported("text/calendar-interval"))
-         aEvent.target.setAttribute( "draggedover", "true" );
-      }
-   },
-
-
-   onDrop: function (aEvent, aXferData, aDragSession)
-   {
-      var trans = Components.classes["@mozilla.org/widget/transferable;1"].createInstance(Components.interfaces.nsITransferable);
-      trans.addDataFlavor("text/calendar");
-      trans.addDataFlavor("text/calendar-interval");
-      trans.addDataFlavor("text/x-moz-message-or-folder");
-      trans.addDataFlavor("text/x-moz-url");
-      trans.addDataFlavor("application/x-moz-file");
-      trans.addDataFlavor("text/unicode");
-
-      aDragSession.getData (trans, i);
-
-      var dataObj = new Object();
-      var bestFlavor = new Object();
-      var len = new Object();
-      trans.getAnyTransferData(bestFlavor, dataObj, len);
-
-      switch (bestFlavor.value)
-      {
-      case "text/calendar": // A calendar object is dropped. ical text data.
-         if (dataObj)
-            // XXX For MOZILLA10 1.0 this is nsISupportWString
-            dataObj = dataObj.value.QueryInterface(Components.interfaces.nsISupportsString);
-
-         var dropEvent = createEvent();
-         var newEventId = dropEvent.id; // can be used when copying to new event
-
-         // XXX TODO: Check if there is a function in calendarImportExport to do this
-         icalStr = dataObj.data.substring(0, len.value);
-         i = icalStr.indexOf("BEGIN:VEVENT");
-         j = icalStr.indexOf("END:VEVENT") + 10;
-         eventData = icalStr.substring(i, j);
-         dropEvent.parseIcalString( eventData );
-
-         // calculate new start/end time for droplocation
-         // use the minutes from the event, and change the hour to the hour dropped in
-         var gDropzoneStartTime = new Date( dropEvent.start.getTime() );
-         gDropzoneStartTime.setHours( aEvent.target.getAttribute( "hour" ) );
-         var draggedTime = gDropzoneStartTime - dropEvent.start ;
-         var eventDuration = dropEvent.end.getTime() - dropEvent.start.getTime();
-
-         if(aDragSession.dragAction == nsIDragService.DRAGDROP_ACTION_MOVE)
-         {
-            var calendarEvent = gICalLib.fetchEvent( dropEvent.id );
-	       
-	         if( calendarEvent != null )
-	         {
-               calendarEvent.start.setTime(gDropzoneStartTime.getTime() );
-               calendarEvent.end.setTime ( calendarEvent.start.getTime() + eventDuration );
-
-               gICalLib.modifyEvent( calendarEvent );
-            } 
-            else
-               alert(" Event with id: " + dropEvent.id + " not found");
-         }
-         else
-         {
-            // create a copy of the dragged event on the droplocation
-            dropEvent.id = newEventId;
-            // XXX TODO Check if stamp/DTSTAMP is correclty set to current time
-            dropEvent.start.setTime(gDropzoneStartTime.getTime() );
-            dropEvent.end.setTime ( dropEvent.start.getTime() + eventDuration );
-
-            editNewEvent( dropEvent );
-         }
-	 break;
-
-      case "text/calendar-interval": // A start time is dragged as start of an event duration
-         // no copy for interval drag
-         // if (dragSession.dragAction == nsIDragService.DRAGDROP_ACTION_COPY)
-         //    return false;
-         if (dataObj)
-            dataObj = dataObj.value.QueryInterface(Components.interfaces.nsISupportsString);
-         var dragTime = dataObj.data.substring(0, len.value);
-
-         gStartDate = new Date(  );
-         gStartDate.setTime( dragTime );
-         gEndDate = new Date( gStartDate.getTime() );
-         gEndDate.setHours( aEvent.target.getAttribute( "hour" ) );
-         if( gEndDate.getTime() < gStartDate.getTime() )
-         {
-            var Temp = gEndDate;
-            gEndDate = gStartDate;
-            gStartDate = Temp;
-         }
-         newEvent( gStartDate, gEndDate );
-	 break;
-
-      case "text/x-moz-url":
-         var url = transferUtils.retrieveURLFromData(aXferData.data, aXferData.flavour.contentType);
-         if (!url)
-             return;
-          alert(url);
-      
-         break;
-
-      case "text/unicode": // text, create new event with text as description
-         if (dataObj)
-            dataObj = dataObj.value.QueryInterface(Components.interfaces.nsISupportsWString);
-
-         // calculate star and and time's for new event, default event lenght is 1 hour
-         var gStartDate = new Date( gCalendarWindow.getSelectedDate() );
-         gStartDate.setHours( aEvent.target.getAttribute( "hour" ) );
-         gStartDate.setMinutes( 0 );
-         gStartDate.setSeconds( 0 );
-         gEndDate = new Date( gStartDate.getTime() );
-         gEndDate.setHours(gStartDate.getHours() + 1);
-
-         newEvent = createEvent();
-         newEvent.start.setTime( gStartDate );
-         newEvent.end.setTime( gEndDate );
-         newEvent.description = dataObj.data.substring(0, len.value);
-         editNewEvent( newEvent );
-         break;
-
-      case "text/x-moz-message-or-folder": // Mozilla mail, work in progress
-         try {
-            if (dataObj)
-               dataObj = dataObj.value.QueryInterface(Components.interfaces.nsISupportsString);
-            // pull the URL out of the data object
-
-            // sourceDocument nul if from other app
-
-            var sourceUri = dataObj.data.substring(0, len.value);
-
-            if (! sourceUri)
-               break;
-
-            alert("import not implemented " + sourceUri);
-
-            /*
-            try
-            {
-                sourceResource = RDF.GetResource(sourceUri, true);
-                var folder = sourceResource.QueryInterface(Components.interfaces.nsIFolder);
-                if (folder)
-                    dragFolder = true;
-            }
-            catch(ex)
-            {
-                sourceResource = null;
-                var isServer = GetFolderAttribute(folderTree, targetResource, "IsServer");
-                if (isServer == "true")
-                {
-                    debugDump("***isServer == true\n");
-                    return false;
-                }
-                // canFileMessages checks no select, and acl, for imap.
-                var canFileMessages = GetFolderAttribute(folderTree, targetResource, "CanFileMessages");
-                if (canFileMessages != "true")
-                {
-                    debugDump("***canFileMessages == false\n");
-                    return false;
-                }
-
-                var hdr = messenger.messageServiceFromURI(sourceUri).messageURIToMsgHdr(sourceUri);
-                alert(hdr);
-                if (hdr.folder == targetFolder)
-                    return false;
-                break;
-            }
-         */
-                  } 
-         catch(ex) {
-            alert(ex.message);
-         }
-	 break;
-
-      case "application/x-moz-file": // file from OS, we expect it to be iCalendar data
-         try {
-            var fileObj = dataObj.value.QueryInterface(Components.interfaces.nsIFile);
-            var aDataStream = readDataFromFile( fileObj.path );
-            var calendarEventArray = parseIcalData( aDataStream );
-            // TODO Move to calendarImportExport to have the option to turn off dialogs
-            addEventsToCalendar( calendarEventArray );
-         }
-         catch(ex) {
-            alert(ex.message);
-         }
-	 break;
-      }
-      
-      // cleanup
-      var allDraggedElements = document.getElementsByAttribute( "draggedover", "true" );
-      for( var i = 0; i < allDraggedElements.length; i++ )
-      {
-         allDraggedElements[i].removeAttribute( "draggedover" );
-      }
-  },
-
-
-  onDragExit: function (aEvent, aDragSession)
-  {
-     // nothing, doesn't fire for cancel? needed for interval-drag cleanup
-  }
-
-
-};
-
diff --git a/calendar/resources/content/calendarEvent.js b/calendar/resources/content/calendarEvent.js
index 9a76117e4ca..5d875d8be12 100644
--- a/calendar/resources/content/calendarEvent.js
+++ b/calendar/resources/content/calendarEvent.js
@@ -555,6 +555,8 @@ function getNextOrPreviousRecurrence( calendarEvent )
 {
    var isValid = false;
 
+   var eventStartDate;
+
    if( calendarEvent.recur )
    {
       var now = new Date();
@@ -565,19 +567,19 @@ function getNextOrPreviousRecurrence( calendarEvent )
 
       if( isValid )
       {
-         var eventStartDate = new Date( result.value );
+         eventStartDate = new Date( result.value );
       }
       else
       {
          isValid = calendarEvent.getPreviousOccurrence( now.getTime(), result );
          
-         var eventStartDate = new Date( result.value );
+         eventStartDate = new Date( result.value );
       }
    }
    
    if( !isValid )
    {
-      var eventStartDate = new Date( calendarEvent.start.getTime() );
+      eventStartDate = new Date( calendarEvent.start.getTime() );
    }
       
    return eventStartDate;
diff --git a/calendar/resources/content/calendarEventDialog.js b/calendar/resources/content/calendarEventDialog.js
index bff0d8e8ddf..e69de29bb2d 100644
--- a/calendar/resources/content/calendarEventDialog.js
+++ b/calendar/resources/content/calendarEventDialog.js
@@ -1,1573 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is OEone Calendar Code, released October 31st, 2001.
- *
- * The Initial Developer of the Original Code is
- * OEone Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Garth Smedley <garths@oeone.com>
- *                 Mike Potter <mikep@oeone.com>
- *                 Colin Phillips <colinp@oeone.com> 
- *                 Chris Charabaruk <ccharabaruk@meldstar.com>
- *                 ArentJan Banck <ajbanck@planet.nl>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-
-/***** calendar/calendarEventDialog.js
-* AUTHOR
-*   Garth Smedley
-* REQUIRED INCLUDES 
-*   <script type="application/x-javascript" src="chrome://calendar/content/dateUtils.js"/>
-*   
-* NOTES
-*   Code for the calendar's new/edit event dialog.
-*
-*  Invoke this dialog to create a new event as follows:
-
-   var args = new Object();
-   args.mode = "new";               // "new" or "edit"
-   args.onOk = <function>;          // funtion to call when OK is clicked
-   args.calendarEvent = calendarEvent;    // newly creatd calendar event to be editted
-    
-   calendar.openDialog("caNewEvent", "chrome://calendar/content/calendarEventDialog.xul", true, args );
-*
-*  Invoke this dialog to edit an existing event as follows:
-*
-   var args = new Object();
-   args.mode = "edit";                    // "new" or "edit"
-   args.onOk = <function>;                // funtion to call when OK is clicked
-   args.calendarEvent = calendarEvent;    // javascript object containin the event to be editted
-
-* When the user clicks OK the onOk function will be called with a calendar event object.
-*
-*  
-* IMPLEMENTATION NOTES 
-**********
-*/
-
-
-/*-----------------------------------------------------------------
-*   W I N D O W      V A R I A B L E S
-*/
-
-
-var gEvent;          // event being edited
-var gOnOkFunction;   // function to be called when user clicks OK
-
-var gTimeDifference = 3600000;  //when editing an event, we change the end time if the start time is changing. This is the difference for the event time.
-var gDateDifference = 3600000;  //this is the difference for the dates, not the times.
-
-var gDefaultAlarmLength = 15; //number of minutes to default the alarm to
-var gCategoryManager;
-
-var gMode = ''; //what mode are we in? new or edit...
-
-const kRepeatDay_0 = 1; //Sunday
-const kRepeatDay_1 = 2; //Monday
-const kRepeatDay_2 = 4; //Tuesday
-const kRepeatDay_3 = 8; //Wednesday
-const kRepeatDay_4 = 16;//Thursday
-const kRepeatDay_5 = 32;//Friday
-const kRepeatDay_6 = 64;//Saturday
-
-
-/*-----------------------------------------------------------------
-*   W I N D O W      F U N C T I O N S
-*/
-
-/**
-*   Called when the dialog is loaded.
-*/
-
-function loadCalendarEventDialog()
-{
-   // Get arguments, see description at top of file
-   
-   var args = window.arguments[0];
-   
-   gMode = args.mode;
-   
-   gOnOkFunction = args.onOk;
-   gEvent = args.calendarEvent;
-   
-   // mode is "new or "edit" - show proper header
-   var titleDataItem = null;
-
-   if( "new" == args.mode )
-   {
-      titleDataItem = document.getElementById( "data-event-title-new" );
-   }
-   else
-   {
-      titleDataItem = document.getElementById( "data-event-title-edit" );
-   }
-   
-   var titleString = titleDataItem.getAttribute( "value" );
-   document.getElementById("calendar-new-eventwindow").setAttribute("title", titleString);
-   
-   // fill in fields from the event
-   var startDate = new Date( gEvent.start.getTime() );
-   document.getElementById( "start-date-picker" ).value = startDate;
-   
-   var endDate = new Date( gEvent.end.getTime() );
-   document.getElementById( "end-date-picker" ).value = endDate;
-   
-   setTimeFieldValue( "start-time-text", startDate );
-   setTimeFieldValue( "end-time-text", endDate );
-   
-   gTimeDifference = gEvent.end.getTime() - gEvent.start.getTime(); //the time difference in ms
-   gDateDifference = gTimeDifference; //the time difference in ms
-   
-   var today = new Date();
-
-   if ( gEvent.recurForever ) 
-   {
-      gEvent.recurEnd.setTime( endDate );
-   }
-
-   var recurEndDate = new Date( gEvent.recurEnd.getTime() );
-   
-   //do the stuff for exceptions
-   var ArrayOfExceptions = gEvent.getExceptions();
-
-   while( ArrayOfExceptions.hasMoreElements() )
-   {
-      ExceptionTime = ArrayOfExceptions.getNext().QueryInterface(Components.interfaces.nsISupportsPRTime).data;
-      
-      var ExceptionDate = new Date( ExceptionTime );
-
-      addException( ExceptionDate );
-   }
-
-   //file attachments;
-   for( var i = 0; i < gEvent.attachmentsArray.Count(); i++ )
-   {
-      var thisAttachment = gEvent.attachmentsArray.QueryElementAt( i, Components.interfaces.nsIMsgAttachment );
-      
-      addAttachment( thisAttachment );
-   }
-
-   document.getElementById( "exceptions-date-picker" ).value = startDate;
-      
-   setFieldValue( "title-field", gEvent.title  );
-   setFieldValue( "description-field", gEvent.description );
-   setFieldValue( "location-field", gEvent.location );
-   setFieldValue( "uri-field", gEvent.url );
-   
-   switch( gEvent.status )
-   {
-      case gEvent.ICAL_STATUS_TENTATIVE:
-         setFieldValue( "status-field", "ICAL_STATUS_TENTATIVE" );
-      break;
-      case gEvent.ICAL_STATUS_CONFIRMED:
-         setFieldValue( "status-field", "ICAL_STATUS_CONFIRMED" );
-      break;
-      case gEvent.ICAL_STATUS_CANCELLED:
-         setFieldValue( "status-field", "ICAL_STATUS_CANCELLED" );
-      break;
-   }
-   
-   setFieldValue( "all-day-event-checkbox", gEvent.allDay, "checked" );
-   setFieldValue( "private-checkbox", gEvent.privateEvent, "checked" );
-   
-   if( gEvent.alarm === false && gEvent.alarmLength == 0 )
-   {
-      gEvent.alarmLength = gDefaultAlarmLength;
-   }
-   
-   setFieldValue( "alarm-checkbox", gEvent.alarm, "checked" );
-   setFieldValue( "alarm-length-field", gEvent.alarmLength );
-   setFieldValue( "alarm-length-units", gEvent.alarmUnits );
-
-   if( gEvent.alarmEmailAddress == "" )
-      gEvent.alarmEmailAddress = opener.getCharPref( opener.gCalendarWindow.calendarPreferences.calendarPref, "alarms.emailaddress", "" );
-
-   if ( gEvent.alarmEmailAddress && gEvent.alarmEmailAddress != "" ) 
-   {
-      setFieldValue( "alarm-email-checkbox", true, "checked" );
-      setFieldValue( "alarm-email-field", gEvent.alarmEmailAddress );
-   }
-   else
-   {
-      setFieldValue( "invite-checkbox", false, "checked" );
-   }
-   
-   if ( gEvent.inviteEmailAddress != undefined && gEvent.inviteEmailAddress != "" ) 
-   {
-      setFieldValue( "invite-checkbox", true, "checked" );
-      setFieldValue( "invite-email-field", gEvent.inviteEmailAddress );
-   }
-   else
-   {
-      setFieldValue( "invite-checkbox", false, "checked" );
-   }
-   
-   setFieldValue( "repeat-checkbox", gEvent.recur, "checked");
-   if( gEvent.recurInterval < 1 )
-      gEvent.recurInterval = 1;
-
-   setFieldValue( "repeat-length-field", gEvent.recurInterval );
-   if( gEvent.recurUnits )
-       setFieldValue( "repeat-length-units", gEvent.recurUnits );  //don't put the extra "value" element here, or it won't work.
-   else
-       setFieldValue( "repeat-length-units", "weeks" );
-
-   setFieldValue( "repeat-forever-radio", (gEvent.recurForever != undefined && gEvent.recurForever != false), "selected" );
-   
-   setFieldValue( "repeat-until-radio", (gEvent.recurForever == undefined || gEvent.recurForever == false), "selected" );
-   
-   
-   /* Categories stuff */
-   // Load categories
-   var categoriesString = opener.GetUnicharPref(opener.gCalendarWindow.calendarPreferences.calendarPref, "categories.names", getDefaultCategories() );
-   
-   var categoriesList = categoriesString.split( "," );
-   
-   // insert the category already in the task so it doesn't get lost
-   if( gEvent.categories )
-   {
-      if( categoriesString.indexOf( gEvent.categories ) == -1 )
-         categoriesList[categoriesList.length] =  gEvent.categories;
-   }
-
-   // categoriesList.sort();
-
-   var oldMenulist = document.getElementById( "categories-menulist-menupopup" );
-   while( oldMenulist.hasChildNodes() )
-      oldMenulist.removeChild( oldMenulist.lastChild );
-
-   for (var i = 0; i < categoriesList.length ; i++)
-   {
-      document.getElementById( "categories-field" ).appendItem(categoriesList[i], categoriesList[i]);
-   }
-
-   document.getElementById( "categories-field" ).selectedIndex = -1;
-   setFieldValue( "categories-field", gEvent.categories );
-   
-   /* Server stuff */
-   var serverList = opener.gCalendarWindow.calendarManager.calendars;
-   document.getElementById( "server-menulist-menupopup" ).database.AddDataSource( opener.gCalendarWindow.calendarManager.rdf.getDatasource() );
-   document.getElementById( "server-menulist-menupopup" ).builder.rebuild();
-   
-   if( args.mode == "new" )
-   {
-      if( args.server )
-      {
-         setFieldValue( "server-field", args.server );
-      }
-      else
-      {
-         document.getElementById( "server-field" ).selectedIndex = 1;
-      }
-   }
-   else
-   {
-      if( gEvent.parent )
-         setFieldValue( "server-field", gEvent.parent.server );
-      else
-      {
-         document.getElementById( "server-field" ).selectedIndex = 1;
-      }
-         
-      //for now you can't edit which file the event is in.
-      setFieldValue( "server-field", "true", "disabled" );
-
-      setFieldValue( "server-field-label", "true", "disabled" );
-   }
-   
-   // update enabling and disabling
-   updateRepeatItemEnabled();
-   updateStartEndItemEnabled();
-   updateAlarmItemEnabled();
-   updateInviteItemEnabled();
-      
-   updateAddExceptionButton();
-
-   //updateAlarmEmailItemEnabled();
-
-   /*
-   ** set the advanced weekly repeating stuff
-   */
-   setAdvancedWeekRepeat();
-   
-   setFieldValue( "advanced-repeat-dayofmonth", ( gEvent.recurWeekNumber == 0 || gEvent.recurWeekNumber == undefined ), "selected" );
-   setFieldValue( "advanced-repeat-dayofweek", ( gEvent.recurWeekNumber > 0 && gEvent.recurWeekNumber != 5 ), "selected" );
-   setFieldValue( "advanced-repeat-dayofweek-last", ( gEvent.recurWeekNumber == 5 ), "selected" );
-   
-   // start focus on title
-   var firstFocus = document.getElementById( "title-field" );
-   firstFocus.focus();
-
-   opener.setCursor( "default" );
-}
-
-
-
-/**
-*   Called when the OK button is clicked.
-*/
-
-function onOKCommand()
-{
-   // get values from the form and put them into the event
-   
-   gEvent.title       = getFieldValue( "title-field" );
-   gEvent.description = getFieldValue( "description-field" );
-   gEvent.location    = getFieldValue( "location-field" );
-   if( getFieldValue( "status-field" ) != "" )
-      gEvent.status      = eval( "gEvent."+getFieldValue( "status-field" ) );
-   
-   gEvent.allDay      = getFieldValue( "all-day-event-checkbox", "checked" );
-   var startDate = document.getElementById( "start-date-picker" ).value;
-   gEvent.start.year = startDate.getYear()+1900;
-   gEvent.start.month = startDate.getMonth();
-   gEvent.start.day = startDate.getDate();
-   
-   var startTime = getDateTimeFieldValue( "start-time-text" );
-   gEvent.start.hour = startTime.getHours();
-   gEvent.start.minute = startTime.getMinutes();
-   
-   var endDate = document.getElementById( "end-date-picker" ).value;
-   //do this because the end date is always the same as the start date.
-   gEvent.end.year = endDate.getYear()+1900;
-   gEvent.end.month = endDate.getMonth();
-   gEvent.end.day = endDate.getDate();
-
-   var endTime = getDateTimeFieldValue( "end-time-text" );
-   gEvent.end.hour = endTime.getHours();
-   gEvent.end.minute = endTime.getMinutes();
-   
-   gEvent.url = getFieldValue( "uri-field" );
-
-   gEvent.privateEvent = getFieldValue( "private-checkbox", "checked" );
-   
-   if( getFieldValue( "invite-checkbox", "checked" ) )
-   {
-      gEvent.inviteEmailAddress = getFieldValue( "invite-email-field", "value" );
-   }
-   else
-   {
-      gEvent.inviteEmailAddress = "";
-   }
-   gEvent.alarm       = getFieldValue( "alarm-checkbox", "checked" );
-   gEvent.alarmLength = getFieldValue( "alarm-length-field" );
-   gEvent.alarmUnits  = getFieldValue( "alarm-length-units", "value" );  
-
-   dump( "!!!-->in calendarEventDialog.js, alarmUnits is "+gEvent.alarmUnits );
-   if ( getFieldValue( "alarm-email-checkbox", "checked" ) ) 
-   {
-      gEvent.alarmEmailAddress = getFieldValue( "alarm-email-field", "value" );
-      dump( "!!!-->in calendarEventDialog.js, alarmEmailAddress is "+gEvent.alarmEmailAddress );
-   }
-   else
-   {
-      gEvent.alarmEmailAddress = "";
-   }
-
-   gEvent.categories    = getFieldValue( "categories-field", "value" );
-
-   gEvent.recur         = getFieldValue( "repeat-checkbox", "checked" );
-   gEvent.recurUnits    = getFieldValue( "repeat-length-units", "value" );  
-   gEvent.recurForever  = getFieldValue( "repeat-forever-radio", "selected" );
-   gEvent.recurInterval  = getFieldValue( "repeat-length-field" );
-   
-   if( gEvent.recurInterval == 0 )
-      gEvent.recur = false;
-
-   var recurEndDate = document.getElementById( "repeat-end-date-picker" ).value;
-   
-   gEvent.recurEnd.setTime( recurEndDate );
-   gEvent.recurEnd.hour = gEvent.start.hour;
-   gEvent.recurEnd.minute = gEvent.start.minute;
-
-   if( gEvent.recur == true )
-   {
-      //check that the repeat end time is later than the end time
-      if( gEvent.recurUnits == "weeks" )
-      {
-         /*
-         ** advanced weekly repeating, choosing the days to repeat
-         */
-         gEvent.recurWeekdays = getAdvancedWeekRepeat();
-      }
-      else if( gEvent.recurUnits == "months" )
-      {
-         /*
-         ** advanced month repeating, either every day or every date
-         */
-         if( getFieldValue( "advanced-repeat-dayofweek", "selected" ) == true )
-         {
-            gEvent.recurWeekNumber = getWeekNumberOfMonth();
-         } 
-         else if( getFieldValue( "advanced-repeat-dayofweek-last", "selected" ) == true )
-         {
-            gEvent.recurWeekNumber = 5;
-         }
-         else
-            gEvent.recurWeekNumber = 0;
-      
-      }
-   }
-
-   /* EXCEPTIONS */
-   
-   gEvent.removeAllExceptions();
-
-   var listbox = document.getElementById( "exception-dates-listbox" );
-
-   for( i = 0; i < listbox.childNodes.length; i++ )
-   {
-      dump( "\n exception added for "+listbox.childNodes[i].value );
-
-      var dateObj = new Date( );
-
-      dateObj.setTime( listbox.childNodes[i].value );
-
-      gEvent.addException( dateObj );
-   }
-
-   /* File attachments */
-   //loop over the items in the listbox
-   gEvent.removeAttachments();
-
-   var attachmentListbox = document.getElementById( "attachmentBucket" );
-
-   for( i = 0; i < attachmentListbox.childNodes.length; i++ )
-   {
-      dump( "\n adding attachment to event added for "+attachmentListbox.childNodes[i].getAttribute( "label" ) );
-      Attachment = Components.classes["@mozilla.org/messengercompose/attachment;1"].createInstance( Components.interfaces.nsIMsgAttachment );
-	   
-      Attachment.url = attachmentListbox.childNodes[i].getAttribute( "label" );
-	
-      gEvent.addAttachment( Attachment );
-   }
-
-    // Attach any specified contacts to the event
-    if( gEventCardArray )
-    {
-        // Remove any existing contacts
-        gEvent.removeContacts();
-    
-        // Add specified contacts
-        for( var cardId in gEventCardArray )
-        {
-            if( gEventCardArray[ cardId ] )
-            {
-                gEvent.addContact( gEventCardArray[ cardId ] );
-            }
-        }
-    }
-
-   var Server = getFieldValue( "server-field" );
-   
-   //if the end time is later than the start time... alert the user using text from the dtd.
-   // call caller's on OK function
-   gOnOkFunction( gEvent, Server );
-      
-   // tell standard dialog stuff to close the dialog
-   return true;
-}
-
-function checkEndTime()
-{
-   var endDate = getDateTimeFieldValue( "end-time-text" );
-
-   var startDate = getDateTimeFieldValue( "start-time-text" );
-
-   var AllDayEvent = getFieldValue( "all-day-event-checkbox", "checked" );
-   
-   if( endDate.getTime() < startDate.getTime() && !AllDayEvent )
-   {
-      document.getElementById( "end-time-warning" ).removeAttribute( "collapsed" );
-      
-      return( false );
-   }
-   else
-   {
-      document.getElementById( "end-time-warning" ).setAttribute( "collapsed", "true" );
-
-      return( true );
-   }
-}
-
-
-function checkRecurTime()
-{
-   var recurEndDate = document.getElementById( "repeat-end-date-picker" ).value;
-
-   var endDate = document.getElementById( "end-date-picker" ).value;
-
-   var recurForever = getFieldValue( "repeat-forever-radio", "selected" );
-   
-   if( recurEndDate.getTime() < endDate.getTime() && recurForever == false )
-   {
-      document.getElementById( "repeat-time-warning" ).removeAttribute( "collapsed" );
-      
-      return( false );
-   }
-   else
-   {
-      document.getElementById( "repeat-time-warning" ).setAttribute( "collapsed", "true" );
-
-      return( true );
-   }
-}
-
-function updateOKButton()
-{
-   var CheckEndTime = checkEndTime();
-
-   var CheckRecurTime = checkRecurTime();
-   
-   if( ( CheckEndTime && CheckRecurTime ) === false )
-      document.getElementById( "calendar-new-eventwindow" ).getButton( "accept" ).setAttribute( "disabled", true );
-   else
-      document.getElementById( "calendar-new-eventwindow" ).getButton( "accept" ).removeAttribute( "disabled" );
-}
-
-/**
-*   Called when a datepicker is finished, and a date was picked.
-*/
-
-function onDatePick( datepicker )
-{
-   var Now = new Date();
-
-   //change the end date of recurring events to today, if the new date is after today and repeat is not checked.
-
-   if ( datepicker.value > Now && !getFieldValue( "repeat-checkbox", "checked" ) ) 
-   {
-      document.getElementById( "repeat-end-date-picker" ).value = datepicker.value;
-   }
-   updateAdvancedWeekRepeat();
-      
-   updateAdvancedRepeatDayOfMonth();
-
-   updateAddExceptionButton();
-
-   updateOKButton();
-}
-
-
-/**
-*   Called when an item with a time picker is clicked, BEFORE the picker is shown.
-*/
-
-function prepareTimePicker( timeFieldName )
-{
-   // get the popup and the field we are editing
-   
-   var timePickerPopup = document.getElementById( "oe-time-picker-popup" );
-   var timeField = document.getElementById( timeFieldName );
-   
-   // tell the time picker the time to edit.
-   setFieldValue( "oe-time-picker-popup", timeField.editDate, "value" );
-   
-   // remember the time field that is to be updated by adding a 
-   // property "timeField" to the popup.
-   
-   timePickerPopup.timeField = timeField;
-}
-
-
-/**
-*   Called when a timepicker is finished, and a time was picked.
-*/
-
-function onTimePick( timepopup )
-{
-   
-   //get the new end time by adding on the time difference to the start time.
-   newEndDate = timepopup.value.getTime() + gTimeDifference;
-      
-   newEndDate = new Date( newEndDate );
-
-   if ( newEndDate.getDate() != timepopup.value.getDate() ) //if this moves us to tomorrow...
-   {
-      //put us back at today, with a time of 11:55 PM.
-      document.getElementById( "end-date-picker" ).value = newEndDate;
-   }
-   
-   if( timepopup.timeField.id != "end-time-text" )
-   {
-      setTimeFieldValue( "end-time-text", newEndDate );
-   }
-   
-   
-   if ( ( timepopup.timeField.id == "end-time-text" ) ) 
-   {
-      //if we are changing the end time, change the global duration.
-      var EndTime = new Date( timepopup.value.getTime() );
-      var StartTimeElement = document.getElementById( "start-time-text" );
-      var StartTime = StartTimeElement.editDate;
-      
-      gTimeDifference = EndTime - StartTime; //the time difference in ms
-      
-      if ( gTimeDifference < 0 ) 
-      {
-         gTimeDifference = 0;
-      }
-
-   }
-   
-   // display the new time in the textbox
-
-   timepopup.timeField.value = formatTime( timepopup.value );
-   
-   // remember the new date in a property, "editDate".  we created on the time textbox
-   
-   timepopup.timeField.editDate = timepopup.value;
-
-   updateOKButton();
-}
-
-
-function updateEndDate( datepicker )
-{
-   //get the new end time by adding on the time difference to the start time.
-   newEndDate = datepicker.value.getTime() + gDateDifference;
-      
-   newEndDate = new Date( newEndDate );
-
-   document.getElementById( "end-date-picker" ).value = newEndDate;
-}
-
-function updateDateDifference( datepicker )
-{
-   gDateDifference = ( datepicker.value.getTime() - document.getElementById( "start-date-picker" ).value.getTime() );
-}
-
-/**
-*   Called when the repeat checkbox is clicked.
-*/
-
-function commandRepeat()
-{
-   updateRepeatItemEnabled();
-}
-
-
-/**
-*   Called when the until radio is clicked.
-*/
-
-function commandUntil()
-{
-   updateUntilItemEnabled();
-
-   updateOKButton();
-}
-
-/**
-*   Called when the all day checkbox is clicked.
-*/
-
-function commandAllDay()
-{
-   updateStartEndItemEnabled();
-
-   updateOKButton();
-}
-
-/**
-*   Called when the alarm checkbox is clicked.
-*/
-
-function commandAlarm()
-{
-   document.getElementById( "alarm-email-checkbox" ).removeAttribute( "checked" );
-   updateAlarmItemEnabled();
-}
-
-
-/**
-*   Enable/Disable Alarm items
-*/
-
-function updateAlarmItemEnabled()
-{
-   var alarmCheckBox = "alarm-checkbox";
-   
-   var alarmField = "alarm-length-field";
-   var alarmMenu = "alarm-length-units";
-   var alarmLabel = "alarm-length-text";
-      
-   var alarmEmailCheckbox = "alarm-email-checkbox";
-   var alarmEmailField = "alarm-email-field";
-
-   if( getFieldValue(alarmCheckBox, "checked" ) || getFieldValue( alarmEmailCheckbox, "checked" ) )
-   {
-      // call remove attribute beacuse some widget code checks for the presense of a 
-      // disabled attribute, not the value.
-      setFieldValue( alarmCheckBox, true, "checked" );
-      setFieldValue( alarmField, false, "disabled" );
-      setFieldValue( alarmMenu, false, "disabled" );
-      setFieldValue( alarmLabel, false, "disabled" );
-      setFieldValue( alarmEmailCheckbox, false, "disabled" );
-   }
-   else
-   {
-      setFieldValue( alarmField, true, "disabled" );
-      setFieldValue( alarmMenu, true, "disabled" );
-      setFieldValue( alarmLabel, true, "disabled" );
-      setFieldValue( alarmEmailField, true, "disabled" );
-      setFieldValue( alarmEmailCheckbox, true, "disabled" );
-      setFieldValue( alarmEmailCheckbox, false, "checked" );
-   }
-}
-
-
-/**
-*   Called when the alarm checkbox is clicked.
-*/
-
-function commandAlarmEmail()
-{
-   updateAlarmEmailItemEnabled();
-}
-
-
-/**
-*   Enable/Disable Alarm items
-*/
-
-function updateAlarmEmailItemEnabled()
-{
-   var alarmCheckBox = "alarm-email-checkbox";
-   
-   var alarmEmailField = "alarm-email-field";
-      
-   if( getFieldValue( alarmCheckBox, "checked" ) )
-   {
-      // call remove attribute beacuse some widget code checks for the presense of a 
-      // disabled attribute, not the value.
-      
-      setFieldValue( alarmEmailField, false, "disabled" );
-   }
-   else
-   {
-      setFieldValue( alarmEmailField, true, "disabled" );
-   }
-}
-
-
-/**
-*   Called when the alarm checkbox is clicked.
-*/
-
-function commandInvite()
-{
-   updateInviteItemEnabled();
-}
-
-
-/**
-*   Enable/Disable Alarm items
-*/
-
-function updateInviteItemEnabled()
-{
-   var inviteCheckBox = document.getElementById( "invite-checkbox" );
-   
-   var inviteField = document.getElementById( "invite-email-field" );
-   
-   if( inviteCheckBox.checked )
-   {
-      // call remove attribute beacuse some widget code checks for the presense of a 
-      // disabled attribute, not the value.
-      
-      inviteField.removeAttribute( "disabled" );
-   }
-   else
-   {
-      inviteField.setAttribute( "disabled", "true" );
-   }
-}
-
-
-/**
-*   Enable/Disable Repeat items
-*/
-
-function updateRepeatItemEnabled()
-{
-   var repeatCheckBox = document.getElementById( "repeat-checkbox" );
-   
-   var repeatDisableList = document.getElementsByAttribute( "disable-controller", "repeat" );
-   
-   if( repeatCheckBox.checked )
-   {
-      for( var i = 0; i < repeatDisableList.length; ++i )
-      {
-         if( repeatDisableList[i].getAttribute( "today" ) != "true" )
-            repeatDisableList[i].removeAttribute( "disabled" );
-      }
-   }
-   else
-   {
-      for( var j = 0; j < repeatDisableList.length; ++j )
-         repeatDisableList[j].setAttribute( "disabled", "true" );
-   }
-   
-   // udpate plural/singular
-   updateRepeatPlural();
-   
-   updateAlarmPlural();
-   
-   // update until items whenever repeat changes
-   updateUntilItemEnabled();
-   
-   // extra interface depending on units
-   updateRepeatUnitExtensions();
-}
-
-/**
-*   Update plural singular menu items
-*/
-
-function updateRepeatPlural()
-{
-    updateMenuPlural( "repeat-length-field", "repeat-length-units" );
-}
-
-/**
-*   Update plural singular menu items
-*/
-
-function updateAlarmPlural()
-{
-    updateMenuPlural( "alarm-length-field", "alarm-length-units" );
-}
-
-
-/**
-*   Update plural singular menu items
-*/
-
-function updateMenuPlural( lengthFieldId, menuId )
-{
-    var field = document.getElementById( lengthFieldId );
-    var menu = document.getElementById( menuId );
-   
-    // figure out whether we should use singular or plural 
-    
-    var length = field.value;
-    
-    var newLabelNumber; 
-    
-    if( Number( length ) > 1  )
-    {
-        newLabelNumber = "labelplural"
-    }
-    else
-    {
-        newLabelNumber = "labelsingular"
-    }
-    
-    // see what we currently show and change it if required
-    
-    var oldLabelNumber = menu.getAttribute( "labelnumber" );
-    
-    if( newLabelNumber != oldLabelNumber )
-    {
-        // remember what we are showing now
-        
-        menu.setAttribute( "labelnumber", newLabelNumber );
-        
-        // update the menu items
-        
-        var items = menu.getElementsByTagName( "menuitem" );
-        
-        for( var i = 0; i < items.length; ++i )
-        {
-            var menuItem = items[i];
-            var newLabel = menuItem.getAttribute( newLabelNumber );
-            menuItem.label = newLabel;
-            menuItem.setAttribute( "label", newLabel );
-            
-        }
-        
-        // force the menu selection to redraw
-        
-        var saveSelectedIndex = menu.selectedIndex;
-        menu.selectedIndex = -1;
-        menu.selectedIndex = saveSelectedIndex;
-    }
-}
-
-/**
-*   Enable/Disable Until items
-*/
-
-function updateUntilItemEnabled()
-{
-   var repeatUntilRadio = document.getElementById( "repeat-until-radio" );
-   var repeatCheckBox = document.getElementById( "repeat-checkbox" );
-   
-   var repeatEndText = document.getElementById( "repeat-end-date-picker" );
-   
-   if( repeatCheckBox.checked && repeatUntilRadio.selected  )
-   {
-      repeatEndText.removeAttribute( "disabled"  );
-   }
-   else
-   {
-      repeatEndText.setAttribute( "disabled", "true" );
-   }
-}
-
-
-function updateRepeatUnitExtensions( )
-{
-   var repeatMenu = document.getElementById( "repeat-length-units" );
-   var weekExtensions = document.getElementById( "repeat-extenstions-week" );
-   var monthExtensions = document.getElementById( "repeat-extenstions-month" );
-
-   //FIX ME! WHEN THE WINDOW LOADS, THIS DOESN'T EXIST
-   if( repeatMenu.selectedItem )
-   {
-      switch( repeatMenu.selectedItem.value )
-      {
-           case "days":
-               weekExtensions.setAttribute( "collapsed", "true" );
-               monthExtensions.setAttribute( "collapsed", "true" );
-           break;
-           
-           case "weeks":
-               weekExtensions.removeAttribute( "collapsed" );
-               monthExtensions.setAttribute( "collapsed", "true" );
-               updateAdvancedWeekRepeat();
-           break;
-           
-           case "months":
-               weekExtensions.setAttribute( "collapsed", "true" );
-               monthExtensions.removeAttribute( "collapsed" );
-               //the following line causes resize problems after turning on repeating events
-               updateAdvancedRepeatDayOfMonth();
-           break;
-           
-           case "years":
-               weekExtensions.setAttribute( "collapsed", "true" );
-               monthExtensions.setAttribute( "collapsed", "true" );
-           break;
-       
-      }
-      sizeToContent();  
-   }
-   
-}
-
-
-
-/**
-*   Enable/Disable Start/End items
-*/
-
-function updateStartEndItemEnabled()
-{
-   var allDayCheckBox = document.getElementById( "all-day-event-checkbox" );
-   
-   var startTimePicker = document.getElementById( "start-time-button" );
-   var startTimeText = document.getElementById( "start-time-text" );
-   
-   var endTimePicker = document.getElementById( "end-time-button" );
-   var endTimeText = document.getElementById( "end-time-text" );
-   
-   if( allDayCheckBox.checked )
-   {
-      // disable popups by removing the popup attribute
-      
-      startTimeText.setAttribute( "disabled", "true" );
-      startTimeText.removeAttribute( "popup" );
-      startTimePicker.setAttribute( "disabled", "true" );
-      startTimePicker.removeAttribute( "popup" );
-      
-      endTimeText.setAttribute( "disabled", "true" );
-      endTimeText.removeAttribute( "popup" );
-      endTimePicker.setAttribute( "disabled", "true" );
-      endTimePicker.removeAttribute( "popup" );
-   }
-   else
-   {
-      // enable popups by setting the popup attribute
-      
-      startTimeText.removeAttribute( "disabled" );
-      startTimeText.setAttribute( "popup", "oe-time-picker-popup" );
-      startTimePicker.removeAttribute( "disabled" );
-      startTimePicker.setAttribute( "popup", "oe-time-picker-popup" );
-      
-      endTimeText.removeAttribute( "disabled" );
-      endTimeText.setAttribute( "popup", "oe-time-picker-popup" );
-      endTimePicker.removeAttribute( "disabled" );
-      endTimePicker.setAttribute( "popup", "oe-time-picker-popup" );
-   }
-}
-
-
-
-
-/**
-*   Handle key down in repeat field
-*/
-
-function repeatLengthKeyDown( repeatField )
-{
-    updateRepeatPlural();
-}
-
-/**
-*   Handle key down in alarm field
-*/
-
-function alarmLengthKeyDown( repeatField )
-{
-    updateAlarmPlural();
-}
-
-
-function repeatUnitCommand( repeatMenu )
-{
-    updateRepeatUnitExtensions();
-}
-
-
-/*
-** Functions for advanced repeating elements
-*/
-
-function setAdvancedWeekRepeat()
-{
-   var checked = false;
-
-   if( gEvent.recurWeekdays > 0 )
-   {
-      for( var i = 0; i < 7; i++ )
-      {
-         checked = ( ( gEvent.recurWeekdays | eval( "kRepeatDay_"+i ) ) == eval( gEvent.recurWeekdays ) );
-         
-         setFieldValue( "advanced-repeat-week-"+i, checked, "checked" );
-
-         setFieldValue( "advanced-repeat-week-"+i, false, "today" );
-      }
-   }
-  
-   //get the day number for today.
-   var dayNumber = document.getElementById( "start-date-picker" ).value.getDay();
-   
-   setFieldValue( "advanced-repeat-week-"+dayNumber, "true", "checked" );
-
-   setFieldValue( "advanced-repeat-week-"+dayNumber, "true", "disabled" );
-
-   setFieldValue( "advanced-repeat-week-"+dayNumber, "true", "today" );
-   
-}
-
-/*
-** Functions for advanced repeating elements
-*/
-
-function getAdvancedWeekRepeat()
-{
-   var Total = 0;
-
-   for( var i = 0; i < 7; i++ )
-   {
-      if( getFieldValue( "advanced-repeat-week-"+i, "checked" ) == true )
-      {
-         Total += eval( "kRepeatDay_"+i );
-      }
-   }
-   return( Total );
-}
-
-/*
-** function to set the menu items text
-*/
-function updateAdvancedWeekRepeat()
-{
-   //get the day number for today.
-   var dayNumber = document.getElementById( "start-date-picker" ).value.getDay();
-   
-   //uncheck them all if the repeat checkbox is checked
-   var repeatCheckBox = document.getElementById( "repeat-checkbox" );
-   
-   if( repeatCheckBox.checked )
-   {
-      //uncheck them all
-      for( var i = 0; i < 7; i++ )
-      {
-         setFieldValue( "advanced-repeat-week-"+i, false, "disabled" );
-      
-         setFieldValue( "advanced-repeat-week-"+i, false, "today" );
-      }
-   }
-
-   if( !repeatCheckBox.checked )
-   {
-      for( i = 0; i < 7; i++ )
-      {
-         setFieldValue( "advanced-repeat-week-"+i, false, "checked" );
-      }
-   }
-
-   setFieldValue( "advanced-repeat-week-"+dayNumber, "true", "checked" );
-
-   setFieldValue( "advanced-repeat-week-"+dayNumber, "true", "disabled" );
-
-   setFieldValue( "advanced-repeat-week-"+dayNumber, "true", "today" );
-}
-
-/*
-** function to set the menu items text
-*/
-function updateAdvancedRepeatDayOfMonth()
-{
-   //get the day number for today.
-   var dayNumber = document.getElementById( "start-date-picker" ).value.getDate();
-   
-   var dayExtension = getDayExtension( dayNumber );
-
-   var weekNumber = getWeekNumberOfMonth();
-   
-   document.getElementById( "advanced-repeat-dayofmonth" ).setAttribute( "label", document.getElementById( "onthe-text" ).getAttribute( "value" )+dayNumber+dayExtension+document.getElementById( "ofthemonth-text" ).getAttribute( "value" ) );
-   
-   if( weekNumber == 4 && isLastDayOfWeekOfMonth() )
-   {
-      document.getElementById( "advanced-repeat-dayofweek" ).setAttribute( "label", getWeekNumberText( weekNumber )+" "+getDayOfWeek( dayNumber )+document.getElementById( "ofthemonth-text" ).getAttribute( "value" ) );
-
-      document.getElementById( "advanced-repeat-dayofweek-last" ).removeAttribute( "collapsed" );
-
-      document.getElementById( "advanced-repeat-dayofweek-last" ).setAttribute( "label", document.getElementById( "last-text" ).getAttribute( "value" )+getDayOfWeek( dayNumber )+document.getElementById( "ofthemonth-text" ).getAttribute( "value" ) );
-   }
-   else if( weekNumber == 4 && !isLastDayOfWeekOfMonth() )
-   {
-      document.getElementById( "advanced-repeat-dayofweek" ).setAttribute( "label", getWeekNumberText( weekNumber )+" "+getDayOfWeek( dayNumber )+document.getElementById( "ofthemonth-text" ).getAttribute( "value" ) );
-
-      document.getElementById( "advanced-repeat-dayofweek-last" ).setAttribute( "collapsed", "true" );
-   }
-   else
-   {
-      document.getElementById( "advanced-repeat-dayofweek" ).setAttribute( "label", getWeekNumberText( weekNumber )+" "+getDayOfWeek( dayNumber )+document.getElementById( "ofthemonth-text" ).getAttribute( "value" ) );
-
-      document.getElementById( "advanced-repeat-dayofweek-last" ).setAttribute( "collapsed", "true" );
-   }
-}
-
-/*
-** function to enable or disable the add exception button
-*/
-function updateAddExceptionButton()
-{
-   //get the date from the picker
-   var datePickerValue = document.getElementById( "exceptions-date-picker" ).value;
-   
-   if( isAlreadyException( datePickerValue ) || document.getElementById( "repeat-checkbox" ).getAttribute( "checked" ) != "true" )
-   {
-      document.getElementById( "exception-add-button" ).setAttribute( "disabled", "true" );
-   }
-   else
-   {
-      document.getElementById( "exception-add-button" ).removeAttribute( "disabled" );
-   }
-}
-
-function removeSelectedExceptionDate()
-{
-   var Listbox = document.getElementById( "exception-dates-listbox" );
-
-   var SelectedItem = Listbox.selectedItem;
-
-   if( SelectedItem )
-      Listbox.removeChild( SelectedItem );
-}
-
-function addException( dateToAdd )
-{
-   if( !dateToAdd )
-   {
-      //get the date from the date and time box.
-      //returns a date object
-      var dateToAdd = document.getElementById( "exceptions-date-picker" ).value;
-   }
-   
-   if( isAlreadyException( dateToAdd ) )
-      return;
-
-   var DateLabel = formatDate( dateToAdd );
-
-   //add a row to the listbox
-   document.getElementById( "exception-dates-listbox" ).appendItem( DateLabel, dateToAdd.getTime() );
-
-   sizeToContent();
-}
-
-function isAlreadyException( dateObj )
-{
-   //check to make sure that the date is not already added.
-   var listbox = document.getElementById( "exception-dates-listbox" );
-
-   for( var i = 0; i < listbox.childNodes.length; i++ )
-   {
-      var dateToMatch = new Date( );
-      
-      dateToMatch.setTime( listbox.childNodes[i].value );
-      if( dateToMatch.getMonth() == dateObj.getMonth() && dateToMatch.getFullYear() == dateObj.getFullYear() && dateToMatch.getDate() == dateObj.getDate() )
-         return true;
-   }
-   return false;
-}
-
-function getDayExtension( dayNumber )
-{
-   switch( dayNumber )
-   {
-      case 1:
-      case 21:
-      case 31:
-         return( "st" );
-      case 2:
-      case 22:
-         return( "nd" );
-      case 3:
-      case 23:
-         return( "rd" );
-      default:
-         return( "th" );
-   }
-}
-
-function getDayOfWeek( )
-{
-   //get the day number for today.
-   var dayNumber = document.getElementById( "start-date-picker" ).value.getDay();
-   
-   var dateStringBundle = srGetStrBundle("chrome://calendar/locale/dateFormat.properties");
-
-   //add one to the dayNumber because in the above prop. file, it starts at day1, but JS starts at 0
-   var oneBasedDayNumber = parseInt( dayNumber ) + 1;
-   
-   return( dateStringBundle.GetStringFromName( "day."+oneBasedDayNumber+".name" ) );
-   
-}
-
-function getWeekNumberOfMonth()
-{
-   //get the day number for today.
-   var startTime = document.getElementById( "start-date-picker" ).value;
-   
-   var oldStartTime = startTime;
-
-   var thisMonth = startTime.getMonth();
-   
-   var monthToCompare = thisMonth;
-
-   var weekNumber = 0;
-
-   while( monthToCompare == thisMonth )
-   {
-      startTime = new Date( startTime.getTime() - ( 1000 * 60 * 60 * 24 * 7 ) );
-
-      monthToCompare = startTime.getMonth();
-      
-      weekNumber++;
-   }
-   
-   return( weekNumber );
-}
-
-function isLastDayOfWeekOfMonth()
-{
-   //get the day number for today.
-   var startTime = document.getElementById( "start-date-picker" ).value;
-   
-   var oldStartTime = startTime;
-
-   var thisMonth = startTime.getMonth();
-   
-   var monthToCompare = thisMonth;
-
-   var weekNumber = 0;
-
-   while( monthToCompare == thisMonth )
-   {
-      startTime = new Date( startTime.getTime() - ( 1000 * 60 * 60 * 24 * 7 ) );
-
-      monthToCompare = startTime.getMonth();
-      
-      weekNumber++;
-   }
-   
-   if( weekNumber > 3 )
-   {
-      var nextWeek = new Date( oldStartTime.getTime() + ( 1000 * 60 * 60 * 24 * 7 ) );
-
-      if( nextWeek.getMonth() != thisMonth )
-      {
-         //its the last week of the month
-         return( true );
-      }
-   }
-
-   return( false );
-}
-
-/* FILE ATTACHMENTS */
-
-function removeSelectedAttachment()
-{
-   var Listbox = document.getElementById( "attachmentBucket" );
-
-   var SelectedItem = Listbox.selectedItem;
-
-   if( SelectedItem )
-      Listbox.removeChild( SelectedItem );
-}
-
-function addAttachment( attachmentToAdd )
-{
-   if( !attachmentToAdd )
-   {
-      return;
-   }
-   
-   //add a row to the listbox
-   document.getElementById( "attachmentBucket" ).appendItem( attachmentToAdd.url, attachmentToAdd.url );
-
-   sizeToContent();
-}
-
-
-function getWeekNumberText( weekNumber )
-{
-   switch( weekNumber )
-   {
-   case 1:
-      return( "First" );
-   case 2:
-      return( "Second" );
-   case 3:
-      return( "Third" );
-   case 4:
-      return( "Fourth" );
-   case 5:
-      return( "Last" );
-   default:
-      return( false );
-   }
-
-}
-
-
-var launch = true;
-
-/* URL */
-function launchBrowser()
-{
-   if( launch == false ) //stops them from clicking on it twice
-      return;
-
-   launch = false;
-   //get the URL from the text box
-   var UrlToGoTo = document.getElementById( "uri-field" ).value;
-   
-   if( UrlToGoTo.length < 4 ) //it has to be > 4, since it needs at least 1 letter, a . and a two letter domain name.
-      return;
-
-   //check if it has a : in it
-   if( UrlToGoTo.indexOf( ":" ) == -1 )
-      UrlToGoTo = "http://"+UrlToGoTo;
-
-   //launch the browser to that URL
-   window.open( UrlToGoTo, "calendar-opened-window" );
-   launch = true;
-}
-
-
-
-/**
-*   Helper function for filling the form, set the value of a property of a XUL element
-*
-* PARAMETERS
-*      elementId     - ID of XUL element to set 
-*      newValue      - value to set property to ( if undefined no change is made )
-*      propertyName  - OPTIONAL name of property to set, default is "value", use "checked" for 
-*                               radios & checkboxes, "data" for drop-downs
-*/
-
-function setFieldValue( elementId, newValue, propertyName  )
-{
-   var undefined;
-   
-   if( newValue !== undefined )
-   {
-      var field = document.getElementById( elementId );
-      
-      if( newValue === false )
-      {
-         field.removeAttribute( propertyName );
-      }
-      else
-      {
-         if( propertyName )
-         {
-            field.setAttribute( propertyName, newValue );
-         }
-         else
-         {
-            field.value = newValue;
-         }
-      }
-   }
-}
-
-
-/**
-*   Helper function for getting data from the form, 
-*   Get the value of a property of a XUL element
-*
-* PARAMETERS
-*      elementId     - ID of XUL element to get from 
-*      propertyName  - OPTIONAL name of property to set, default is "value", use "checked" for 
-*                               radios & checkboxes, "data" for drop-downs
-*   RETURN
-*      newValue      - value of property
-*/
-
-function getFieldValue( elementId, propertyName )
-{
-   var field = document.getElementById( elementId );
-   
-   if( propertyName )
-   {
-      return field[ propertyName ];
-   }
-   else
-   {
-      return field.value;
-   }
-}
-
-/**
-*   Helper function for getting a date/time from the form.
-*   The element must have been set up with  setDateFieldValue or setTimeFieldValue.
-*
-* PARAMETERS
-*      elementId     - ID of XUL element to get from 
-* RETURN
-*      newValue      - Date value of element
-*/
-
-
-function getDateTimeFieldValue( elementId )
-{
-   var field = document.getElementById( elementId );
-   return field.editDate;
-}
-
-
-
-/**
-*   Helper function for filling the form, set the value of a date field
-*
-* PARAMETERS
-*      elementId     - ID of time textbox to set 
-*      newDate       - Date Object to use
-*/
-
-function setDateFieldValue( elementId, newDate  )
-{
-   // set the value to a formatted date string 
-   
-   var field = document.getElementById( elementId );
-   field.value = formatDate( newDate );
-   
-   // add an editDate property to the item to hold the Date object 
-   // used in onDatePick to update the date from the date picker.
-   // used in getDateTimeFieldValue to get the Date back out.
-   
-   // we clone the date object so changes made in place do not propagte 
-   
-   field.editDate = new Date( newDate );
-}
-
-
-/**
-*   Helper function for filling the form, set the value of a time field
-*
-* PARAMETERS
-*      elementId     - ID of time textbox to set 
-*      newDate       - Date Object to use
-*/
-
-function setTimeFieldValue( elementId, newDate  )
-{
-   // set the value to a formatted time string 
-
-   var field = document.getElementById( elementId );
-   field.value = formatTime( newDate );
-   
-   // add an editDate property to the item to hold the Date object 
-   // used in onTimePick to update the date from the time picker.
-   // used in getDateTimeFieldValue to get the Date back out.
-   
-   // we clone the date object so changes made in place do not propagte 
-   
-   field.editDate = new Date( newDate );
-}
-
-
-/**
-*   Take a Date object and return a displayable date string i.e.: May 5, 1959
-*  :TODO: This should be moved into DateFormater and made to use some kind of
-*         locale or user date format preference.
-*/
-
-function formatDate( date )
-{
-   return( opener.gCalendarWindow.dateFormater.getFormatedDate( date ) );
-}
-
-
-/**
-*   Take a Date object and return a displayable time string i.e.: 12:30 PM
-*/
-
-function formatTime( time )
-{
-   var timeString = opener.gCalendarWindow.dateFormater.getFormatedTime( time );
-   return timeString;
-}
-
-
-function debug( Text )
-{
-   dump( "\n"+ Text + "\n");
-
-}
diff --git a/calendar/resources/content/calendarImportExport.js b/calendar/resources/content/calendarImportExport.js
index ad1b949e840..e69de29bb2d 100644
--- a/calendar/resources/content/calendarImportExport.js
+++ b/calendar/resources/content/calendarImportExport.js
@@ -1,1254 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Calendar code.
- *
- * The Initial Developer of the Original Code is
- * ArentJan Banck <ajbanck@planet.nl>.
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): ArentJan Banck <ajbanck@planet.nl>
- *                 Steve Hampton <mvgrad78@yahoo.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
- 
-/**** calendarImportExport
- * Unit with functions to convert calendar events to and from different formats.
- *
- ****/
-
-// XSL stylesheet directory
-var convertersDirectory = "chrome://calendar/content/converters/";
-
-// File constants copied from file-utils.js
-const MODE_RDONLY   = 0x01;
-const MODE_WRONLY   = 0x02;
-const MODE_RDWR     = 0x04;
-const MODE_CREATE   = 0x08;
-const MODE_APPEND   = 0x10;
-const MODE_TRUNCATE = 0x20;
-const MODE_SYNC     = 0x40;
-const MODE_EXCL     = 0x80;
-
-const filterCalendar    = "Calendar Files";
-const extensionCalendar = ".ics";
-const filterXcs         = "iCalendar XML Document";
-const extensionXcs      = ".xcs";
-const filterXml         = "XML Document";
-const extensionXml      = ".xml";
-const filterRtf         = "Rich Text Format (RTF)";
-const extensionRtf      = ".rtf";
-const filterHtml        = "HTML Files";
-const extensionHtml     = ".html";
-const filterCsv         = "Comma Separated";
-const filterOutlookCsv  = "Outlook Comma Separated";
-const extensionCsv      = ".csv";
-const filterRdf         = "iCalendar RDF";
-const extensionRdf      = ".rdf";
-
-if( opener && opener.gICalLib )
-   gICalLib = opener.gICalLib;
-
-// convert to and from Unicode for file i/o
-function convertFromUnicode( aCharset, aSrc )
-{
-   // http://lxr.mozilla.org/mozilla/source/intl/uconv/idl/nsIScriptableUConv.idl
-   var unicodeConverter = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"].createInstance(Components.interfaces.nsIScriptableUnicodeConverter);
-   unicodeConverter.charset = aCharset;
-   return unicodeConverter.ConvertFromUnicode( aSrc );
-}
-
-function convertToUnicode(aCharset, aSrc )
-{
-   // http://lxr.mozilla.org/mozilla/source/intl/uconv/idl/nsIScriptableUConv.idl
-   var unicodeConverter = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"].createInstance(Components.interfaces.nsIScriptableUnicodeConverter);
-   unicodeConverter.charset = aCharset;
-   return unicodeConverter.ConvertToUnicode( aSrc );
-}
-
-/**** loadEventsFromFile
- * shows a file dialog, read the selected file(s) and tries to parse events from it.
- */
-
-function loadEventsFromFile()
-{
-
-  var dupResult = { cancelled: false, discard: true, prompt: false };
-
-  openDialog("chrome://calendar/content/importDuplicatesDialog.xul", "caDuplicates", "chrome,modal,centerscreen", dupResult );
-  if (dupResult.cancelled == true)
-    return false;
-
-//   dump("*******************\n");
-//   dump("cancelled: " + dupResult.cancelled + "\n");
-//   dump("discard:   " + dupResult.discard + "\n");
-//   dump("prompt:    " + dupResult.prompt + "\n");
-//   dump("*******************\n");
-
-  const nsIFilePicker = Components.interfaces.nsIFilePicker;
-  
-  var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
-     
-  fp.init(window, "Open", nsIFilePicker.modeOpenMultiple);
-  fp.defaultExtension = "ics";
-   
-  fp.appendFilter( filterCalendar, "*" + extensionCalendar );
-  fp.appendFilter( filterXcs, "*" + extensionXcs );
-  fp.appendFilter( filterOutlookCsv, "*" + extensionCsv );
-  fp.show();
-  var filesToAppend = fp.files;
-
-  if (filesToAppend && filesToAppend.hasMoreElements()) 
-    {
-      var calendarEventArray = new Array();
-      var duplicateEventArray = new Array();
-      var currentFile;
-      var aDataStream;
-      var i;
-
-      while (filesToAppend.hasMoreElements())
-        {
-          currentFile = filesToAppend.getNext().QueryInterface(Components.interfaces.nsILocalFile);
-          aDataStream = readDataFromFile( currentFile.path, "UTF-8" );
-
-          switch (fp.filterIndex) {
-          case 0 : // ics
-            var tempEventArray = parseIcalData( aDataStream );
-            for (i=0; i < tempEventArray.length; i++)
-              calendarEventArray[calendarEventArray.length]  = tempEventArray[i];    
-            break;
-          case 1 : // xcs
-            var tempEventArray = parseXCSData( aDataStream );
-            for (i=0; i < tempEventArray.length; i++)
-              calendarEventArray[calendarEventArray.length]  = tempEventArray[i];    
-            break;
-          case 2: // csv
-            var ret = parseOutlookCSVData( aDataStream, dupResult.discard, dupResult.prompt );
-            for (i=0; i < ret.calendarEventArray.length; i++)
-              calendarEventArray[calendarEventArray.length]  = ret.calendarEventArray[i];
-            for (i=0; i < ret.calendarDuplicateArray.length; i++)
-	      duplicateEventArray[duplicateEventArray.length] = ret.calendarDuplicateArray[i];
-            break;
-          }
-      
-        }
-
-
-      // If there are no events to import, let the user know
-      //
-      if (calendarEventArray.length == 0 && (duplicateEventArray.length == 0 || dupResult.discard == true) ) {
-        alert("No events to import...");
-        return false;
-      }
-      
-      // Show a dialog with option to import events with or without dialogs
-      var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService(); 
-      promptService = promptService.QueryInterface(Components.interfaces.nsIPromptService); 
-      var result = {value:0}; 
-
-      if (calendarEventArray.length > 0) {
-
-        var buttonPressed =      
-          promptService.confirmEx(window, 
-                                  "Import", "About to import " + calendarEventArray.length + " event(s).\nDo you want to open all new events to import before importing?", 
-                                  (promptService.BUTTON_TITLE_YES * promptService.BUTTON_POS_0) + 
-                                  (promptService.BUTTON_TITLE_NO * promptService.BUTTON_POS_1) + 
-                                  (promptService.BUTTON_TITLE_CANCEL * promptService.BUTTON_POS_2), 
-                                  null,null,null,null, result); 
-
-        if(buttonPressed == 0) // YES
-          { 
-            addEventsToCalendar( calendarEventArray );
-            return true;
-          }
-        else if(buttonPressed == 1) // NO
-          { 
-            addEventsToCalendar( calendarEventArray, true );
-            return true;
-          } 
-        else if(buttonPressed == 2) // CANCEL
-          { 
-            return false; 
-          } 
-      }
-
-
-      // Depending on how the user chose to deal with duplicates,
-      // either add them blindly, or prompt then for each.
-      //
-      if (duplicateEventArray.length > 0) {
-
-        if (dupResult.discard == false) {
-
-          if (dupResult.prompt)
-            alert("Some duplicate entries were imported. Each one will display in the New Event dialog,\n where you can skip it using Cancel, or edit and accept it using OK.");
-
-          addEventsToCalendar( duplicateEventArray, !dupResult.prompt );
-        }
-
-      }
-    }
-  
-  
-  return false;
-}
-
-
-/**** createUniqueID
- *
- * Creates a new unique ID. Format copied from the oeICalImpl.cpp AddEvent function
- */
-
-function createUniqueID()
-{
-   var newID = "";
-   while( (newID == "") || (gICalLib.fetchEvent( newID ) != null) )
-     newID = Math.round(900000000 + (Math.random() * 100000000));
-   return newID;
-}
-
-
-/**** insertEvents
- *
- * Takes an array of events and adds the evens one by one to the calendar
- */
- 
-function addEventsToCalendar( calendarEventArray, silent, ServerName )
-{
-   gICalLib.batchMode = true;
-
-   for(var i = 0; i < calendarEventArray.length; i++)
-   {
-      calendarEvent = calendarEventArray[i];
-	       
-      // Check if event with same ID already in Calendar. If so, import event with new ID.
-      if( gICalLib.fetchEvent( calendarEvent.id ) != null ) {
-         calendarEvent.id = createUniqueID( );
-      }
-
-      // the start time is in zulu time, need to convert to current time
-      if(calendarEvent.allDay != true)
-      convertZuluToLocal( calendarEvent );
-
-      // open the event dialog with the event to add
-      if( silent )
-      {
-         if( ServerName == null || ServerName == "" || ServerName == false )
-            var ServerName = gCalendarWindow.calendarManager.getDefaultServer();
-         
-         gICalLib.addEvent( calendarEvent, ServerName );
-      }
-      else
-         editNewEvent( calendarEvent );
-   }
-
-   gICalLib.batchMode = false;   
-}
-
-const ZULU_OFFSET_MILLIS = new Date().getTimezoneOffset() * 60 * 1000;
-
-function convertZuluToLocal( calendarEvent )
-{
-   if( calendarEvent.start.utc == true )
-   {
-   var zuluStartTime = calendarEvent.start.getTime();
-   calendarEvent.start.setTime( zuluStartTime  - ZULU_OFFSET_MILLIS );
-      calendarEvent.start.utc = false;
-   }
-   if( calendarEvent.end.utc == true )
-   {
-      var zuluEndTime = calendarEvent.end.getTime();
-   calendarEvent.end.setTime( zuluEndTime  - ZULU_OFFSET_MILLIS );
-      calendarEvent.end.utc = false;
-   }
-}
-
-function convertLocalToZulu( calendarEvent )
-{
-   if( calendarEvent.start.utc == false )
-   {
-   var zuluStartTime = calendarEvent.start.getTime();
-   calendarEvent.start.setTime( zuluStartTime  + ZULU_OFFSET_MILLIS );
-      calendarEvent.start.utc = true;
-   }
-   if( calendarEvent.end.utc == false )
-   {
-      var zuluEndTime = calendarEvent.end.getTime();
-   calendarEvent.end.setTime( zuluEndTime  + ZULU_OFFSET_MILLIS );
-      calendarEvent.end.utc = true;
-   }
-}
-
-// Can something from dateUtils be used here?
-function formatDateTime( oeDateTime )
-{
-   var date = new Date(oeDateTime.getTime());
-   return dateService.FormatDateTime("", dateService.dateFormatLong, 
-          dateService.timeFormatSeconds, date.getFullYear(), date.getMonth()+1, 
-          date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds());  
-//   return( gCalendarWindow.dateFormater.getFormatedDate( date ) + " " +
-//           gCalendarWindow.dateFormater.getFormatedTime( date ) );
-}
-
-
-function formatDateTimeInterval( oeDateStart, oeDateEnd )
-{
-   // TODO: Extend this function to create pretty looking strings
-   // When: Thursday, November 09, 2000 11:00 PM-11:30 PM (GMT-08:00) Pacific Time (US & Canada); Tijuana.
-   // When: 7/1/1997 10:00AM PDT - 7/1/97 10:30AM PDT
-   return formatDateTime(oeDateStart) + " - " + formatDateTime(oeDateEnd);
-}
-
-
-/** 
-* Initialize an event with a start and end date.
-*/
-
-function initCalendarEvent( calendarEvent )
-{
-   var startDate = gCalendarWindow.currentView.getNewEventDate();
-
-   var Minutes = Math.ceil( startDate.getMinutes() / 5 ) * 5 ;
-
-   startDate = new Date( startDate.getFullYear(),
-                         startDate.getMonth(),
-                         startDate.getDate(),
-                         startDate.getHours(),
-                         Minutes,
-                         0);
-
-   calendarEvent.start.setTime( startDate );
-   
-   var MinutesToAddOn = getIntPref(gCalendarWindow.calendarPreferences.calendarPref, "event.defaultlength", 60 );
-
-   var endDateTime = startDate.getTime() + ( 1000 * 60 * MinutesToAddOn );
-
-   calendarEvent.end.setTime( endDateTime );
-}
-
-
-function datesAreEqual(icalDate, date) {
-
-  if (
-      icalDate.month  == date.getMonth() &&
-      icalDate.day    == date.getDate()  &&
-      icalDate.year   == date.getFullYear() &&
-      icalDate.hour   == date.getHours() &&
-      icalDate.minute == date.getMinutes())
-    return true;
-  else
-    return false;
-}
-
-function entryExists( date, subject) {
-
-  var events = gCalendarWindow.eventSource.getEventsForDay( date );
-
-  var ret = false;
-
-  if (events.length == 0)
-    return false;
-
-  for (var i = 0; i < events.length; i++) {
-
-    var event = events[i].event;
-
-    if ( event.title == subject && datesAreEqual(event.start, date)) {
-      ret = true;
-      break;
-    }
-  }
-
-  return ret;
-}
-
-function promptToKeepEntry(title, startTime, endTime) 
-{
-  return confirm(
-                 "Add duplicate entry:\n\n" + 
-                 "Title:      " + title + "\n" +
-                 "Start Time: " + startTime.toString() + "\n" +
-                 "End Time:   " + endTime.toString() + "\n" 
-                 );
-
-}
-
-
-/**** parseOutlookCSVData
- *
- * Takes a text block of iCalendar events and tries to split that into individual events.
- * Parses those events and returns an array of calendarEvents.
- */
-function parseOutlookCSVData( icalStr, discardDuplicates, promptEach )
-{
-  var lines = icalStr.split("\n");
-  var calendarEvent;
-  var eventArray = new Array();
-  var dupArray = new Array();
-  var lineIndex = 1;
-  var totalLines = lines.length-1;
-  var exists = false;
-
-  while (lineIndex < totalLines) {
-
-    var fields = lines[lineIndex].split('","');
-    fields[0] = fields[0].substring(1); // strip off the leading quote...
-
-    var title = fields[0];
-    var stime = new Date(fields[1] + " " + fields[2]);
-    var etime = new Date(fields[3] + " " + fields[4]);
-
-    exists = entryExists(stime, title);
-      
-    calendarEvent = createEvent();
-    calendarEvent.id = createUniqueID( );
-    calendarEvent.title = title;
-    calendarEvent.start.setTime(stime);
-    calendarEvent.end.setTime(etime);
-
-    if ( !exists )
-      eventArray[ eventArray.length ] = calendarEvent;
-    else
-      dupArray[ dupArray.length ] = calendarEvent;
-
-
-    ++lineIndex;
-  }
-
-//   dump("*** calendar entries : " + eventArray.length + "\n");
-//   dump("*** duplicate entries: " + dupArray.length + "\n");
-
-  return { calendarEventArray: eventArray, calendarDuplicateArray: dupArray };
-}
-
-/**** parseIcalData
- *
- * Takes a text block of iCalendar events and tries to split that into individual events.
- * Parses those events and returns an array of calendarEvents.
- */
- 
-function parseIcalData( icalStr )
-{
-   var calendarEventArray =  new Array();
-
-   var i,j;
-   while( icalStr.indexOf("BEGIN:VEVENT") != -1 )
-   { 
-      // try to find the begin and end of an event. ParseIcalString does not support VCALENDAR
-      i = icalStr.indexOf("BEGIN:VEVENT");
-      j = icalStr.indexOf("END:VEVENT") + 10;
-      eventData = icalStr.substring(i, j);
-
-      calendarEvent = createEvent();
-
-      // if parsing import iCalendar failed, add date as description
-      if ( !calendarEvent.parseIcalString(eventData) )
-      {
-         // initialize start and end dates.
-         initCalendarEvent( calendarEvent );
-
-         // Save the parsed text as description.
-         calendarEvent.description = icalStr;      
-      }
-
-      calendarEventArray[ calendarEventArray.length ] = calendarEvent;
-      // remove the parsed VEVENT from the calendar data to parse
-      icalStr = icalStr.substring(j+1);
-   }
-   
-   return calendarEventArray;
-}
-
-/**** parseXCSData
- *
- */
- 
-function parseXCSData( xcsString )
-{
-   var gParser = new DOMParser;
-   var xmlDocument = gParser.parseFromString(xcsString, 'text/xml');   
-
-   var result = serializeDocument(xmlDocument, "xcs2ics.xsl");
-
-   return parseIcalData( result );
-}
-
-
-/**** readDataFromFile
- *
- * read data from a file. Returns the data read.
- */
-
-function readDataFromFile( aFilePath, charset )
-{
-   const LOCALFILE_CTRID = "@mozilla.org/file/local;1";
-   const FILEIN_CTRID = "@mozilla.org/network/file-input-stream;1";
-   const SCRIPTSTREAM_CTRID = "@mozilla.org/scriptableinputstream;1";   
-   const nsILocalFile = Components.interfaces.nsILocalFile;
-   const nsIFileInputStream = Components.interfaces.nsIFileInputStream;
-   const nsIScriptableInputStream = Components.interfaces.nsIScriptableInputStream;
-
-   var localFileInstance;
-   var inputStream;
-   var scriptableInputStream;
-   var tmp; // not sure what the use is for this
-   
-   LocalFileInstance = Components.classes[LOCALFILE_CTRID].createInstance( nsILocalFile );
-   LocalFileInstance.initWithPath( aFilePath );
-
-   inputStream = Components.classes[FILEIN_CTRID].createInstance( nsIFileInputStream );
-   try
-   {
-      inputStream.init( LocalFileInstance, MODE_RDONLY, 0444, tmp );
-      
-      scriptableInputStream = Components.classes[SCRIPTSTREAM_CTRID].createInstance( nsIScriptableInputStream);
-      scriptableInputStream.init( inputStream );
-
-      aDataStream = scriptableInputStream.read( -1 );
-      scriptableInputStream.close();
-      inputStream.close();
-      
-      if( charset)
-         aDataStream = convertToUnicode( charset, aDataStream );
-   }
-   catch(ex)
-   {
-      alert("Unable to read from file: " + aFilePath );
-   }
-
-   return aDataStream;
-}
-
-
-/**** saveEventsToFile
- *
- * Save data to a file. Create the file or overwrite an existing file.
- * Input an array of calendar events, or no parameter for selected events.
- */
-
-function saveEventsToFile( calendarEventArray )
-{
-   if( !calendarEventArray)
-      calendarEventArray = gCalendarWindow.EventSelection.selectedEvents;
-
-   if (calendarEventArray.length == 0)
-   {
-      alert("No events selected to save");
-      return;
-   }
-
-   // No show the 'Save As' dialog and ask for a filename to save to
-   const nsIFilePicker = Components.interfaces.nsIFilePicker;
-
-   var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
-
-   // caller can force disable of sand box, even if ON globally
-
-   fp.init(window, "Save As", nsIFilePicker.modeSave);
-
-   if(calendarEventArray.length == 1 && calendarEventArray[0].title)
-      fp.defaultString = calendarEventArray[0].title;
-   else
-      fp.defaultString = "Mozilla Calendar events";
-
-   fp.defaultExtension = "ics";
-
-   fp.appendFilter( filterCalendar, "*" + extensionCalendar );
-   fp.appendFilter( filterRtf, "*" + extensionRtf );
-   fp.appendFilters(nsIFilePicker.filterHTML);
-   fp.appendFilter( filterCsv, "*" + extensionCsv );
-   fp.appendFilter( filterXcs, "*" + extensionXcs );
-   fp.appendFilter( filterRdf, "*" + extensionRdf );
-
-   fp.show();
-
-   // Now find out as what to save, convert the events and save to file.
-   if (fp.file && fp.file.path.length > 0) 
-   {
-      const UTF8 = "UTF-8";
-      var aDataStream;
-      var extension;
-      var charset;
-      switch (fp.filterIndex) {
-      case 0 : // ics
-         aDataStream = eventArrayToICalString( calendarEventArray, true );
-         extension   = extensionCalendar;
-         charset = "UTF-8";
-         break;
-      case 1 : // rtf
-         aDataStream = eventArrayToRTF( calendarEventArray );
-         extension   = extensionRtf;
-         break;
-      case 2 : // html
-         aDataStream = eventArrayToHTML( calendarEventArray );
-         extension   = ".htm";
-         charset = "UTF-8";
-         break;
-      case 3 : // csv
-         aDataStream = eventArrayToCsv( calendarEventArray );
-         extension   = extensionCsv;
-         charset = "UTF-8";
-         break;
-      case 4 : // xCal
-         aDataStream = eventArrayToXCS( calendarEventArray );
-         extension   = extensionXcs;
-         charset = "UTF-8";
-         break;
-      case 5 : // rdf
-         aDataStream = eventArrayToRdf( calendarEventArray );
-         extension   = extensionRdf;
-         charset = "UTF-8";
-         break;
-      }
-      var filePath = fp.file.path;
-      if(filePath.indexOf(".") == -1 )
-          filePath += extension;
-
-      saveDataToFile( filePath, aDataStream, charset );
-   }
-}
-
-
-/**** eventArrayToICalString
- * Converts a array of events to iCalendar text
- * Option to add events needed in other applications
- */
-
-function eventArrayToICalString( calendarEventArray, doPatchForExport )
-{   
-   if( !calendarEventArray)
-      calendarEventArray = gCalendarWindow.EventSelection.selectedEvents;
-
-   var sTextiCalendar = "";
-   for( var eventArrayIndex = 0;  eventArrayIndex < calendarEventArray.length; ++eventArrayIndex )
-   {
-      var calendarEvent = calendarEventArray[ eventArrayIndex ].clone();
-
-      // convert time to represent local to produce correct DTSTART and DTEND
-      if(calendarEvent.allDay != true)
-      convertLocalToZulu( calendarEvent );
-     
-      // check if all required properties are available
-      if( calendarEvent.method == 0 )
-         calendarEvent.method = calendarEvent.ICAL_METHOD_PUBLISH;
-      if( calendarEvent.stamp.year ==  0 )
-         calendarEvent.stamp.setTime( new Date() );
-
-      if ( doPatchForExport )
-        sTextiCalendar += patchICalStringForExport( calendarEvent.getIcalString() );
-      else
-        sTextiCalendar += calendarEvent.getIcalString() ;
-   }
-
-   return sTextiCalendar;
-}
-
-
-/**** patchICalStringForExport
- * Function to hack an iCalendar text block for use in other applications
- *  Patch TRIGGER field for Outlook
- */
- 
-function patchICalStringForExport( sTextiCalendar )
-{
-   // HACK: TRIGGER patch hack for Outlook 2000
-   var i = sTextiCalendar.indexOf("TRIGGER\n ;VALUE=DURATION\n :-");
-   if(i != -1) {
-      sTextiCalendar =
-         sTextiCalendar.substring(0,i+27) + sTextiCalendar.substring(i+28, sTextiCalendar.length);
-   }
-
-  return sTextiCalendar;
-}
-
-
-/** 
-* Converts a array of events to a block of HTML code
-* Sample:
-*    Summary: Phone Conference
-*    Description: annual report
-*    When: Thursday, November 09, 2000 11:00 PM-11:30 PM (GMT-08:00) Pacific Time (US & Canada); Tijuana.
-*    Where: San Francisco
-*    Organizer: foo1@example.com
-*/
-
-function eventArrayToHTML( calendarEventArray )
-{
-   sHTMLHeader = 
-      "<html>\n" + "<head>\n" + "<title>Mozilla Calendar</title>\n" +
-      "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n" +
-      "</head>\n"+ "<body bgcolor=\"#FFFFFF\" text=\"#000000\">\n";
-   sHTMLFooter =
-      "\n</body>\n</html>\n";
-
-   var sHTMLText = sHTMLHeader;
-
-   for( var eventArrayIndex = 0;  eventArrayIndex < calendarEventArray.length; ++eventArrayIndex )
-   {
-      var calendarEvent = calendarEventArray[ eventArrayIndex ];
-      sHTMLText += "<p>";
-      sHTMLText += "<B>Summary: </B>\t" + calendarEvent.title + "<BR>\n";
-      sHTMLText += "<B>Description: </B>\t" + calendarEvent.description + "<BR>\n";
-      sHTMLText += "<B>When: </B>" + formatDateTimeInterval(calendarEvent.start, calendarEvent.end) + "<BR>\n";
-      sHTMLText += "<B>Where: </B>" + calendarEvent.location + "<BR>\n";
-      // sHTMLText += "<B>Organiser: </B>\t" + Event.???
-      sHTMLText += "</p>";
-   }
-   sHTMLText += sHTMLFooter;
-   return sHTMLText;
-}
-
-
-/**** eventArrayToRTF
-* Converts a array of events to a block of text in Rich Text Format
-*/
-
-function eventArrayToRTF( calendarEventArray )
-{
-   sRTFHeader = 
-      "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang1033{\\fonttbl{\\f0\\fswiss\\fcharset0 Arial;}{\\f1\\fmodern\\fcharset0 Courier New;}}" +
-      "{\\colortbl ;\\red0\\green0\\blue0;}" +
-      "\\viewkind4\\uc1\\pard\\fi-1800\\li1800\\tx1800\\cf1";
-   sRTFFooter =
-      "\\pard\\fi-1800\\li1800\\tx1800\\cf1\\f0\\par}";
-
-   var sRTFText = sRTFHeader;
-
-   for( var eventArrayIndex = 0;  eventArrayIndex < calendarEventArray.length; ++eventArrayIndex )
-   {
-      var calendarEvent = calendarEventArray[ eventArrayIndex ];
-      sRTFText += "\\b\\f0\\fs20 " + "Summary:" + "\\b0\\tab " + calendarEvent.title + "\\par\n";
-      sRTFText += "\\b\\f0\\fs20 " + "Description:" + "\\b0\\tab " + calendarEvent.description + "\\par\n";
-
-      sRTFText += "\\b When:\\b0\\tab " + formatDateTimeInterval(calendarEvent.start, calendarEvent.end) + "\\par\n";
-
-      sRTFText += "\\b Where:\\b0\\tab " + calendarEvent.location + "\\par\n";
-      sRTFText += "\\par\n";
-   }
-   sRTFText += sRTFFooter;
-   return sRTFText;
-}
-
-
-/**** eventArrayToXML
-* Converts a array of events to a XML string
-*/
-/*
-function eventArrayToXML( calendarEventArray )
-{
-   var xmlDocument = getXmlDocument( calendarEventArray );
-   var serializer = new XMLSerializer;
-   
-   return serializer.serializeToString (xmlDocument )
-}
-*/
-
-/**** eventArrayToCsv
-* Converts a array of events to comma delimited  text.
-*/
-
-function eventArrayToCsv( calendarEventArray )
-{
-   var xcsDocument = getXcsDocument( calendarEventArray );
-
-   return serializeDocument( xcsDocument, "xcs2csv.xsl" );
-}
-
-
-/**** eventArrayToRdf
-* Converts a array of events to RDF
-*/
-
-function eventArrayToRdf( calendarEventArray )
-{
-   var xcsDocument = getXcsDocument( calendarEventArray );
-
-   return serializeDocument( xcsDocument, "xcs2rdf.xsl" );
-}
-
-
-/**** eventArrayToXCS
-* Converts a array of events to a xCal string
-*/
-
-function eventArrayToXCS( calendarEventArray )
-{
-   var xmlDoc = getXmlDocument( calendarEventArray );
-   var xcsDoc = transformXML( xmlDoc, "xml2xcs.xsl" );
-   // add the doctype
-/* Doctype uri blocks excel import
-   var newdoctype = xcsDoc.implementation.createDocumentType(
-       "iCalendar", 
-       "-//IETF//DTD XCAL//iCalendar XML//EN",
-       "http://www.ietf.org/internet-drafts/draft-ietf-calsch-many-xcal-02.txt");
-   if (newdoctype)
-      xcsDoc.insertBefore(newdoctype, xcsDoc.firstChild);
-*/
-   var serializer = new XMLSerializer;
-
-   // XXX MAJOR UGLY HACK!! Serializer doesn't insert XML Declaration
-   // http://bugzilla.mozilla.org/show_bug.cgi?id=63558
-   var serialDocument = serializer.serializeToString ( xcsDoc );
-
-   if( serialDocument.indexOf( "<?xml" ) == -1 )
-      serialDocument = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + serialDocument;
-
-   return serialDocument;
-   // return serializer.serializeToString ( xcsDoc )
-}
-
-
-/**** saveDataToFile
- *
- * Save data to a file. Creates a new file or overwrites an existing file.
- */
-
-function saveDataToFile(aFilePath, aDataStream, charset)
-{
-   const LOCALFILE_CTRID = "@mozilla.org/file/local;1";
-   const FILEOUT_CTRID = "@mozilla.org/network/file-output-stream;1";
-   const nsILocalFile = Components.interfaces.nsILocalFile;
-   const nsIFileOutputStream = Components.interfaces.nsIFileOutputStream;
-
-   var localFileInstance;
-   var outputStream;
-   
-   var LocalFileInstance = Components.classes[LOCALFILE_CTRID].createInstance(nsILocalFile);
-   LocalFileInstance.initWithPath(aFilePath);
-
-   outputStream = Components.classes[FILEOUT_CTRID].createInstance(nsIFileOutputStream);
-   try
-   {
-      if(charset)
-         aDataStream = convertFromUnicode( charset, aDataStream );
-
-      outputStream.init(LocalFileInstance, MODE_WRONLY | MODE_CREATE | MODE_TRUNCATE, 0664, 0);
-      outputStream.write(aDataStream, aDataStream.length);
-      // outputStream.flush();
-      outputStream.close();
-   }
-   catch(ex)
-   {
-      alert("Unable to write to file: " + aFilePath );
-   }
-}
-
-
-////////////////////////////////////
-// XML/XSL functions              //
-////////////////////////////////////
-
-/**
-*   Get the local path to the chrome directory
-*/
-/*
-function getChromeDir()
-{
-    const JS_DIR_UTILS_FILE_DIR_CID = "@mozilla.org/file/directory_service;1";
-    const JS_DIR_UTILS_I_PROPS      = "nsIProperties";
-    const JS_DIR_UTILS_DIR          = new Components.Constructor(JS_DIR_UTILS_FILE_DIR_CID, JS_DIR_UTILS_I_PROPS);
-    const JS_DIR_UTILS_CHROME_DIR                          = "AChrom";
-
-    var rv;
-
-    try
-    {
-      rv=(new JS_DIR_UTILS_DIR()).get(JS_DIR_UTILS_CHROME_DIR, Components.interfaces.nsIFile);
-    }
-
-    catch (e)
-    {
-       //jslibError(e, "(unexpected error)", "NS_ERROR_FAILURE", JS_DIR_UTILS_FILE+":getChromeDir");
-       rv=null;
-    }
-
-    return rv;
-}
-
-function getTemplatesPath( templateName )
-{
-   var templatesDir = getChromeDir();
-   templatesDir.append( "calendar" );
-   templatesDir.append( "content" );
-   templatesDir.append( "templates" );
-   templatesDir.append( templateName );
-   return templatesDir.path;
-}
-
-function xslt(xmlUri, xslUri)
-{
-   // TODO: Check uri's for CHROME:// and convert path to local path
-   var xslProc = new XSLTProcessor();
-
-   var result = document.implementation.createDocument("", "", null);
-   var xmlDoc = document.implementation.createDocument("", "", null);
-   var xslDoc = document.implementation.createDocument("", "", null);
-
-   xmlDoc.load(xmlUri, "text/xml");
-   xslDoc.load(xslUri, "text/xml");
-   xslProc.transformDocument(xmlDoc, xslDoc, result, null);
-
-   return result;
-}
-
-*/
-
-/** PRIVATE
-*
-*   Opens a file and returns the content
-*   It supports Uri's like chrome://
-*/
-
-function loadFile(aUriSpec)
-{
-    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-    var serv = Components.classes["@mozilla.org/network/io-service;1"].
-        getService(Components.interfaces.nsIIOService);
-    if (!serv) {
-        throw Components.results.ERR_FAILURE;
-    }
-    var chan = serv.newChannel(aUriSpec, null, null);
-    var instream = 
-        Components.classes["@mozilla.org/scriptableinputstream;1"].createInstance(Components.interfaces.nsIScriptableInputStream);
-    instream.init(chan.open());
-
-    return instream.read(instream.available());
-}
-
-/** PUBLIC GetXcsDocument
-*
-*/
-
-function getXcsDocument( calendarEventArray )
-{
-   var xmlDocument = getXmlDocument( calendarEventArray );
-
-   var xcsDocument = transformXML( xmlDocument, "xml2xcs.xsl" );
-
-   var processingInstruction = xcsDocument.createProcessingInstruction(
-      "xml", "version=\"1.0\" encoding=\"UTF-8\"");
-   // xcsDocument.insertBefore(processingInstruction, xcsDocument.firstChild);
-   
-   return xcsDocument;
-}
-
-
-/** PUBLIC
-*
-*   Opens a xsl transformation file and applies it to xmlDocuments.
-*   xslFile can be in the convertersDirectory, or a full Uri
-*   Returns the resulting document
-*/
-
-function transformXML( xmlDocument, xslFilename )
-{
-   var xslProc = new XSLTProcessor();
-   var gParser = new DOMParser;
-   // .load isn't synchrone
-   // var xslDoc = document.implementation.createDocument("", "", null);
-   // xslDoc.load(path, "text/xml");
-
-   // if only passsed a filename, assume it is a file in the default directory
-   if( xslFilename.indexOf( ":" ) == -1 )
-     xslFilename = convertersDirectory + xslFilename;
-
-   var xslContent = loadFile( xslFilename );
-   var xslDocument = gParser.parseFromString(xslContent, 'text/xml');
-   var result = document.implementation.createDocument("", "", null);
-
-   xslProc.transformDocument(xmlDocument, xslDocument, result, null);
-
-   return result;
-}
-
-/** PUBLIC
-*
-*   Serializes a DOM document.if stylesheet is null, returns the document serialized
-*   Applies the stylesheet when available, and return the serialized transformed document,
-*   or the transformiix data
-*/
-
-function serializeDocument( xmlDocument, stylesheet )
-{
-   var serializer = new XMLSerializer;
-   if( stylesheet )
-   {
-      var resultDocument = transformXML( xmlDocument, stylesheet );
-      var transformiixResult = resultDocument.getElementById( "transformiixResult" );
-      if( transformiixResult && transformiixResult.hasChildNodes() )
-      {  // It's a document starting with:
-         // <a0:html xmlns:a0="http://www.w3.org/1999/xhtml">
-         // <a0:head/><a0:body><a0:pre id="transformiixResult">
-         var textNode = transformiixResult.firstChild;
-         if( textNode.nodeType == textNode.TEXT_NODE )
-            return textNode.nodeValue;
-         else
-            return serializer.serializeString( transformiixResult );
-      }
-      else
-         // No transformiixResult, return the serialized transformed document
-         return serializer.serializeToString ( resultDocument );
-   }
-   else
-      // No transformation, return the serialized xmlDocument
-      return serializer.serializeToString ( xmlDocument );
-}
-
-/** PUBLIC
-*
-*   not used?
-*/
-
-function deserializeDocument(text, stylesheet )
-{
-   var gParser = new DOMParser;
-   var xmlDocument = gParser.parseFromString(text, 'text/xml');
-}
-
-/** PRIVATE
-*
-*   transform a calendar event into a dom node.
-*   hack, this is going to be part of libical
-*/
-
-function makeXmlNode( xmlDocument, calendarEvent )
-{
-
-   // Adds a property node to a event node
-   //  do not add empty properties, valueType is optional
-   var addPropertyNode = function( xmlDocument, eventNode, name, value, valueType )
-   {
-      if(!value)
-         return;
-
-      var propertyNode = xmlDocument.createElement( "property" );
-      propertyNode.setAttribute( "name", name );
-
-      var valueNode = xmlDocument.createElement( "value" );
-      var textNode  = xmlDocument.createTextNode( value );
-
-      if( valueType )
-         valueNode.setAttribute( "value", valueType );
-
-      valueNode.appendChild( textNode );
-      propertyNode.appendChild( valueNode );
-      eventNode.appendChild( propertyNode );
-   }
-
-   var addAlarmNode = function( xmlDocument, eventNode, triggerTime, triggerUnits )
-   {
-      if(triggerUnits == "minutes")
-        triggerIcalUnits = "M";
-      else  if(triggerUnits == "hours")
-        triggerIcalUnits = "H";
-      else  if(triggerUnits == "days")
-        triggerIcalUnits = "D";
-
-      var valarmNode = xmlDocument.createElement( "component" );
-      valarmNode.setAttribute( "name", "VALARM" );
-
-      var propertyNode = xmlDocument.createElement( "property" );
-      propertyNode.setAttribute( "name", "TRIGGER" );
-
-      var valueNode = xmlDocument.createElement( "value" );
-      //valueNode.setAttribute( "value", "DURATION" );
-
-      var textNode  = xmlDocument.createTextNode( "-PT" + triggerTime + triggerIcalUnits );
-
-      valueNode.appendChild( textNode );
-      propertyNode.appendChild( valueNode );
-      valarmNode.appendChild( propertyNode )
-      eventNode.appendChild( valarmNode );
-   }
-   
-   var addRRuleNode = function( xmlDocument, eventNode )
-   {
-      // extremly ugly hack, but this will be done in libical soon
-      var ruleText = "";
-      var eventText = calendarEvent.getIcalString();
-      var i = eventText.indexOf("RRULE");
-      if( i > -1)
-      {
-         ruleText = eventText.substring(i+8);      
-         ruleText = ruleText.substring(0, ruleText.indexOf("\n"));
-      }
-      if( ruleText && ruleText.length > 0)
-      {
-         var propertyNode = xmlDocument.createElement( "property" );
-         propertyNode.setAttribute( "name", "RRULE" );
-
-         var valueNode = xmlDocument.createElement( "value" );
-         var textNode  = xmlDocument.createTextNode( ruleText );
-
-         valueNode.appendChild( textNode );
-         propertyNode.appendChild( valueNode );
-         eventNode.appendChild( propertyNode );
-      }
-   }
-
-     var checkString = function( str )
-    {
-        if( typeof( str ) == "string" )
-            return str;
-        else
-            return ""
-    }
-
-    var checkNumber = function( num )
-    {
-        if( typeof( num ) == "undefined" || num == null )
-            return "";
-        else
-            return num
-    }
-
-    var checkBoolean = function( bool )
-    {
-        if( bool == "false")
-            return "false"
-        else if( bool )      // this is false for: false, 0, undefined, null, ""
-            return "true";
-        else
-            return "false"
-    }
-
-    // create a string in the iCalendar format, UTC time '20020412T121314Z'
-    var checkDate = function ( dt, isDate )
-    {   
-        var dateObj = new Date( dt.getTime() );
-        var result = "";
-
-        if( isDate )
-        {
-            result += dateObj.getFullYear();
-            if( dateObj.getMonth() + 1 < 10 )
-               result += "0";
-            result += dateObj.getMonth() + 1;
-
-            if( dateObj.getDate() < 10 )
-               result += "0";
-            result += dateObj.getDate();
-        }
-        else
-        {
-           result += dateObj.getUTCFullYear();
-
-           if( dateObj.getUTCMonth() + 1 < 10 )
-              result += "0";
-           result += dateObj.getUTCMonth() + 1;
-
-           if( dateObj.getUTCDate() < 10 )
-              result += "0";
-           result += dateObj.getUTCDate();
-
-           result += "T"
-
-           if( dateObj.getUTCHours() < 10 )
-              result += "0";
-           result += dateObj.getUTCHours();
-
-           if( dateObj.getUTCMinutes() < 10 )
-              result += "0";
-           result += dateObj.getUTCMinutes();
-
-           if( dateObj.getUTCSeconds() < 10 )
-              result += "0";
-           result += dateObj.getUTCSeconds();
-           result += "Z";
-        }
-
-        return result;
-    }
-
-    // make the event tag
-    var calendarNode = xmlDocument.createElement( "component" );
-    calendarNode.setAttribute( "name", "VCALENDAR" );
-
-    addPropertyNode( xmlDocument, calendarNode, "PRODID", "-//Mozilla.org/NONSGML Mozilla Calendar V 1.0 //EN" );
-    addPropertyNode( xmlDocument, calendarNode, "VERSION", "2.0" );
-    if(calendarEvent.method == calendarEvent.ICAL_METHOD_PUBLISH)
-       addPropertyNode( xmlDocument, calendarNode, "METHOD", "PUBLISH" );
-    else if(calendarEvent.method == calendarEvent.ICAL_METHOD_REQUEST )
-       addPropertyNode( xmlDocument, calendarNode, "METHOD", "REQUEST" );
-
-    var eventNode = xmlDocument.createElement( "component" );
-    eventNode.setAttribute( "name", "VEVENT" );
-
-    addPropertyNode( xmlDocument, eventNode, "UID", calendarEvent.id );
-    addPropertyNode( xmlDocument, eventNode, "SUMMARY", checkString( calendarEvent.title ) );
-    addPropertyNode( xmlDocument, eventNode, "DTSTAMP", checkDate( calendarEvent.stamp ) );
-    if( calendarEvent.allDay )
-       addPropertyNode( xmlDocument, eventNode, "DTSTART", checkDate( calendarEvent.start, true ), "DATE" );
-    else
-    {
-       addPropertyNode( xmlDocument, eventNode, "DTSTART", checkDate( calendarEvent.start ) );
-       addPropertyNode( xmlDocument, eventNode, "DTEND", checkDate( calendarEvent.end ) );
-    }
-
-    addPropertyNode( xmlDocument, eventNode, "DESCRIPTION", checkString( calendarEvent.description ) );
-    addPropertyNode( xmlDocument, eventNode, "CATEGORIES", checkString( calendarEvent.categories ) );
-    addPropertyNode( xmlDocument, eventNode, "LOCATION", checkString( calendarEvent.location ) );
-    addPropertyNode( xmlDocument, eventNode, "PRIVATEEVENT", checkString( calendarEvent.privateEvent ) );
-    addPropertyNode( xmlDocument, eventNode, "URL", checkString( calendarEvent.url ) );
-    addPropertyNode( xmlDocument, eventNode, "PRIORITY", checkNumber( calendarEvent.priority ) );
-
-    addAlarmNode( xmlDocument, eventNode, calendarEvent.alarmLength, calendarEvent.alarmUnits );
-    addRRuleNode( xmlDocument, eventNode );
-
-    calendarNode.appendChild( eventNode );
-    return calendarNode;
-}
-
-/** PUBLIC
-*
-*   Transforms an array of calendar events into a dom-document
-*   hack, this is going to be part of libical
-*/
-
-function getXmlDocument ( eventList )
-{
-    // use the domparser to create the XML 
-    var domParser = new DOMParser;
-    // start with one tag
-    var xmlDocument = domParser.parseFromString( "<libical/>", "text/xml" );
-    
-    // get the top tag, there will only be one.
-    var topNodeList = xmlDocument.getElementsByTagName( "libical" );
-    var topNode = topNodeList[0];
-
-
-    // add each event as an element
- 
-    for( var index = 0; index < eventList.length; ++index )
-    {
-        var calendarEvent = eventList[ index ];
-        
-        var eventNode = this.makeXmlNode( xmlDocument, calendarEvent );
-        
-        topNode.appendChild( eventNode );
-    }
-    return xmlDocument;
-}
diff --git a/calendar/resources/content/calendarMail.js b/calendar/resources/content/calendarMail.js
index 0dc9743048a..4b35eee1ed6 100644
--- a/calendar/resources/content/calendarMail.js
+++ b/calendar/resources/content/calendarMail.js
@@ -202,10 +202,12 @@ function sendEvent()
       }
    }
    
+   var EmailSubject;
+
    if( gCalendarWindow.EventSelection.selectedEvents.length == 1 )
-      var EmailSubject = Event.title;
+      EmailSubject = Event.title;
    else
-      var EmailSubject = emailStringBundle.GetStringFromName( "EmailSubject" );
+      EmailSubject = emailStringBundle.GetStringFromName( "EmailSubject" );
 
    saveCalendarObject(CalendarDataFilePath, CalendarText);
 
diff --git a/calendar/resources/content/calendarManager.js b/calendar/resources/content/calendarManager.js
index 533483083ee..eaeeefbe7df 100644
--- a/calendar/resources/content/calendarManager.js
+++ b/calendar/resources/content/calendarManager.js
@@ -76,7 +76,7 @@ function calendarManager( CalendarWindow )
       this.rootContainer = this.rdf.addRootSeq( "urn:calendarcontainer" );
 
       //add the default calendar
-      var profileFile = this.getProfileDirectory();
+      profileFile = this.getProfileDirectory();
       profileFile.append("Calendar");
       profileFile.append("CalendarDataFile.ics");
                          
@@ -201,10 +201,12 @@ calendarManager.prototype.addServerDialogResponse = function calMan_addServerDia
    node.setAttribute("http://home.netscape.com/NC-rdf#serverNumber", this.rootContainer.getSubNodes().length);
    node.setAttribute("http://home.netscape.com/NC-rdf#name", CalendarObject.name);
    
+   var profileFile;
+
    if( CalendarObject.path == "" )
    {
       //they didn't set a path in the box, that's OK, its not required.
-      var profileFile = this.getProfileDirectory();
+      profileFile = this.getProfileDirectory();
       profileFile.append("Calendar");
       profileFile.append("CalendarDataFile"+this.rootContainer.getSubNodes().length+".ics");
       CalendarObject.path = profileFile.path;
@@ -214,7 +216,7 @@ calendarManager.prototype.addServerDialogResponse = function calMan_addServerDia
 
    if( CalendarObject.path.indexOf( "http://" ) != -1 )
    {
-      var profileFile = this.getProfileDirectory();
+      profileFile = this.getProfileDirectory();
       profileFile.append( "Calendar" );
       profileFile.append("RemoteCalendar"+this.rootContainer.getSubNodes().length+".ics");
 
@@ -504,6 +506,7 @@ calendarManager.prototype.getRemoteCalendarText = function calMan_getRemoteCalen
          {
             onResponse( result );
          }
+         return true;
       }
    }
    
@@ -604,12 +607,12 @@ calendarManager.prototype.getAndConvertAllOldCalendars = function calMan_getAllC
 
       this.rdf.flush();
       //if the file CalendarDataFile.ics exists in the users profile directory, move it to Calendar/CalendarDataFile.ics
-      var newCalendarFile = this.getProfileDirectory();
+      newCalendarFile = this.getProfileDirectory();
       newCalendarFile.append( "Calendar" );
       newCalendarFile.append( "RemoteCalendar"+this.rootContainer.getSubNodes().length+".ics" );
    
-      var oldCalendarDataFile = new File( thisCalendar.path );
-      var newCalendarDataFile = new File( newCalendarFile.path );
+      oldCalendarDataFile = new File( thisCalendar.path );
+      newCalendarDataFile = new File( newCalendarFile.path );
    
       if( oldCalendarDataFile.exists() && thisCalendar.remote == true )
       {
diff --git a/calendar/resources/content/calendarMonthView.js b/calendar/resources/content/calendarMonthView.js
index ec633a5d243..e69de29bb2d 100644
--- a/calendar/resources/content/calendarMonthView.js
+++ b/calendar/resources/content/calendarMonthView.js
@@ -1,929 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is OEone Calendar Code, released October 31st, 2001.
- *
- * The Initial Developer of the Original Code is
- * OEone Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Garth Smedley <garths@oeone.com>
- *                 Mike Potter <mikep@oeone.com>
- *                 Karl Guertin <grayrest@grayrest.com> 
- *                 Colin Phillips <colinp@oeone.com> 
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*-----------------------------------------------------------------
-*   MonthView Class  subclass of CalendarView
-*
-*  Calendar month view class
-*
-* PROPERTIES
-*     selectedEventBox     - Events are displayed in dynamically created event boxes
-*                            this is the selected box, or null
-*   
-*     showingLastDay       - When the user changes to a new month we select
-*                            the same day in the new month that was selected in the original month. If the
-*                            new month does not have that day ( i.e. 31 was selected and the new month has 
-*                            only 30 days ) we move the selection to the last day. When this happens we turn on
-*                            the 'showingLastDay' flag. Now we will always select the last day when the month
-*                            is changed so that if they go back to the original month, 31 is selected again.
-*                            'showingLastDay' is turned off when the user selects a new day or changes the view.
-*                       
-*                            
-*     dayNumberItemArray   - An array [ 0 to 41 ] of text boxes that hold the day numbers in the month view.
-*                            We set the value attribute to the day number, or "" for boxes that are not in the month.
-*                            In the XUL they have id's of the form  month-week-<row_number>-day-<column_number>
-*                            where row_number is 1 - 6 and column_number is 1 - 7.
-*
-*     dayBoxItemArray      - An array [ 0 to 41 ] of  boxes, one for each day in the month view. These boxes
-*                            are selected when a day is selected. They contain a dayNumberItem and event boxes.
-*                            In the XUL they have id's of the form  month-week-<row_number>-day-<column_number>-box
-*                            where row_number is 1 - 6 and column_number is 1 - 7.
-*
-*    dayBoxItemByDateArray - This array is reconstructed whenever the month changes ( and probably more
-*                            often than that ) It contains day box items, just like the dayBoxItemArray above,
-*                            except this array contains only those boxes that belong to the current month
-*                            and is indexed by date. So for a 30 day month that starts on a Wednesday, 
-*                            dayBoxItemByDateArray[0]  === dayBoxItemArray[3] and 
-*                            dayBoxItemByDateArray[29] === dayBoxItemArray[36]
-*
-*    kungFooDeathGripOnEventBoxes - This is to keep the event box javascript objects around so when we get 
-*                                   them back they still have the calendar event property on them.
-* 
-*
-*    NOTES
-*
-*       Events are displayed in dynamically created event boxes. these boxes have a property added to them
-*       called "calendarEvent" which contains the event represented by the box. 
-*
-*       There is one day box item for every day box in the month grid. These have an attribute
-*       called "empty" which is set to "true", like so: 
-*
-*                                   dayBoxItem.setAttribute( "empty" , "true" );
-*
-*       when the day box is not in the month. This allows the display to be controlled from css.
-*
-*       The day boxes also have a couple of properties added to them:
-*
-*            dayBoxItem.dayNumber  - null when day is not in month.
-*                                  - the date, 1 to 31, otherwise,
-*           
-*            dayBoxItem.numEvents  - The number of events for the day, used to limit the number displayed
-*                                    since there is only room for 3.
-* 
-*/
-
-// Make MonthView inherit from CalendarView
-
-MonthView.prototype = new CalendarView();
-MonthView.prototype.constructor = MonthView;
-
-
-/**
-*   MonthView Constructor.
-* 
-* PARAMETERS
-*      calendarWindow     - the owning instance of CalendarWindow.
-*
-*/
-
-function MonthView( calendarWindow )
-{
-   // call the super constructor
-   
-   this.superConstructor( calendarWindow );
-   
-   this.numberOfEventsToShow = false;
-
-   var monthViewEventSelectionObserver = 
-   {
-      onSelectionChanged : function( EventSelectionArray )
-      {
-         
-         dump( "\nIn Month view, on selection changed");
-         if( EventSelectionArray.length > 0 )
-         {
-            //if there are selected events.
-            
-            //for some reason, this function causes the tree to go into a select / unselect loop
-            //putting it in a settimeout fixes this.
-            setTimeout( "gCalendarWindow.monthView.clearSelectedDate();", 1 );
-
-            gCalendarWindow.monthView.clearSelectedBoxes();
-            
-            //dump( "\nIn Month view, eventSelectionArray.length is "+EventSelectionArray.length );
-            var i = 0;
-            
-            for( i = 0; i < EventSelectionArray.length; i++ )
-            {
-               //dump( "\nin Month view, going to try and get the event boxes with name 'month-view-event-box-"+EventSelectionArray[i].id+"'" );
-               var EventBoxes = document.getElementsByAttribute( "name", "month-view-event-box-"+EventSelectionArray[i].id );
-               //dump( "\nIn Month view, found "+EventBoxes.length+" matches for the selected event." );
-               for ( j = 0; j < EventBoxes.length; j++ ) 
-               {
-                  EventBoxes[j].setAttribute( "eventselected", "true" );
-               }
-            }
-            //dump( "\nAll Done in Selection for Month View" );
-         }
-         else
-         {
-            //select the proper day
-            gCalendarWindow.monthView.hiliteSelectedDate();
-         }
-      }
-   }
-      
-   calendarWindow.EventSelection.addObserver( monthViewEventSelectionObserver );
-   
-   this.showingLastDay = false;
-  
-   // set up month day box's and day number text items, see notes above
-   
-   this.dayNumberItemArray = new Array();
-   this.dayBoxItemArray = new Array();
-   this.kungFooDeathGripOnEventBoxes = new Array();
-   this.dayBoxItemByDateArray = new Array();
-   
-   var dayItemIndex = 0;
-   
-   for( var weekIndex = 1; weekIndex <= 6; ++weekIndex )
-   {
-      for( var dayIndex = 1; dayIndex <= 7; ++dayIndex )
-      {
-         // add the day text item to an array[0..41]
-         
-         var dayNumberItem = document.getElementById( "month-week-" + weekIndex + "-day-" + dayIndex );
-         this.dayNumberItemArray[ dayItemIndex ] = dayNumberItem;
-         
-         // add the day box to an array[0..41]
-         
-         var dayBoxItem = document.getElementById( "month-week-" + weekIndex + "-day-" + dayIndex + "-box" );
-         this.dayBoxItemArray[ dayItemIndex ] = dayBoxItem;
-         
-         // set on click of day boxes
-         
-         dayBoxItem.setAttribute( "onclick", "gCalendarWindow.monthView.clickDay( event )" );
-         dayBoxItem.setAttribute( "oncontextmenu", "gCalendarWindow.monthView.contextClickDay( event )" );
-
-         //set the drop
-         dayBoxItem.setAttribute( "ondragdrop", "nsDragAndDrop.drop(event,monthViewEventDragAndDropObserver)" );
-         dayBoxItem.setAttribute( "ondragover", "nsDragAndDrop.dragOver(event,monthViewEventDragAndDropObserver)" );
-         
-         //set the double click of day boxes
-         dayBoxItem.setAttribute( "ondblclick", "gCalendarWindow.monthView.doubleClickDay( event )" );
-
-         // array index
-         
-         ++dayItemIndex;
-      }
-   }
-}
-
-/** PUBLIC
-*
-*   Redraw the events for the current month
-* 
-*   We create XUL boxes dynamically and insert them into the XUL. 
-*   To refresh the display we remove all the old boxes and make new ones.
-*/
-MonthView.prototype.refreshEvents = function monthView_refreshEvents( )
-{
-   // get this month's events and display them
-   var monthEventList = this.calendarWindow.eventSource.getEventsForMonth( this.calendarWindow.getSelectedDate() );
-   
-   // remove old event boxes
-   var eventBoxList = document.getElementsByAttribute( "eventbox", "monthview" );
-
-   var eventBox = null;
-
-   for( var eventBoxIndex = 0;  eventBoxIndex < eventBoxList.length; ++eventBoxIndex )
-   {
-      eventBox = eventBoxList[ eventBoxIndex ];
-      eventBox.parentNode.removeChild( eventBox );
-   }
-   
-   // clear calendarEvent counts, we only display 3 events per day 
-   // count them by adding a property to the dayItem, which is zeroed here
-   for( var dayItemIndex = 0; dayItemIndex < this.dayBoxItemArray.length; ++dayItemIndex )
-   {
-      var dayItem = this.dayBoxItemArray[ dayItemIndex ];
-      dayItem.numEvents = 0;
-   }  
-   this.kungFooDeathGripOnEventBoxes = new Array();
-   
-   // add each calendarEvent
-   for( var eventIndex = 0; eventIndex < monthEventList.length; ++eventIndex )
-   {
-      var calendarEventDisplay = monthEventList[ eventIndex ];
-      
-      var eventDate = new Date( calendarEventDisplay.displayDate );
-      // get the day box for the calendarEvent's day
-      var eventDayInMonth = eventDate.getDate();
-      
-      var dayBoxItem = this.dayBoxItemByDateArray[ eventDayInMonth ];
-            
-      if( !dayBoxItem )
-         break;
-
-      // Display no more than three, show dots for the events > 3
-      
-      dayBoxItem.numEvents +=  1;
-      
-      if( this.numberOfEventsToShow == false && dayBoxItem.numEvents > 1 )
-      {
-         this.setNumberOfEventsToShow();
-      }
-
-      if( dayBoxItem.numEvents == 1 || dayBoxItem.numEvents < this.numberOfEventsToShow )
-      {
-         // Make a box item to hold the event
-         eventBox = document.createElement( "box" );
-         eventBox.setAttribute( "id", "month-view-event-box-"+calendarEventDisplay.event.id );
-         eventBox.setAttribute( "name", "month-view-event-box-"+calendarEventDisplay.event.id );
-         eventBox.setAttribute( "event"+calendarEventDisplay.event.id, true );
-         eventBox.setAttribute( "class", "month-day-event-box-class" );
-         if( calendarEventDisplay.event.categories && calendarEventDisplay.event.categories != "" )
-         {
-            eventBox.setAttribute( calendarEventDisplay.event.categories, "true" );
-         }
-            
-         eventBox.setAttribute( "eventbox", "monthview" );
-         eventBox.setAttribute( "onclick", "monthEventBoxClickEvent( this, event )" );
-         eventBox.setAttribute( "ondblclick", "monthEventBoxDoubleClickEvent( this, event )" );
-         eventBox.setAttribute( "onmouseover", "gCalendarWindow.changeMouseOverInfo( calendarEventDisplay, event )" );
-         eventBox.setAttribute( "tooltip", "eventTooltip" );
-         eventBox.setAttribute( "ondraggesture", "nsDragAndDrop.startDrag(event,monthViewEventDragAndDropObserver);" );
-         // add a property to the event box that holds the calendarEvent that the
-         // box represents
-
-         eventBox.calendarEventDisplay = calendarEventDisplay;
-         
-         this.kungFooDeathGripOnEventBoxes.push( eventBox );
-         
-         // Make a text item to show the event title
-         
-         var eventBoxText = document.createElement( "label" );
-         eventBoxText.setAttribute( "crop", "end" );
-         eventBoxText.setAttribute( "class", "month-day-event-text-class" );
-         eventBoxText.setAttribute( "value", calendarEventDisplay.event.title );
-         //you need this flex in order for text to crop
-         eventBoxText.setAttribute( "flex", "1" );
-         eventBoxText.setAttribute( "ondraggesture", "nsDragAndDrop.startDrag(event,monthViewEventDragAndDropObserver);" );
-
-         // add the text to the event box and the event box to the day box
-         
-         eventBox.appendChild( eventBoxText );        
-         
-         dayBoxItem.appendChild( eventBox );
-      }
-      else
-      {
-         //if there is not a box to hold the little dots for this day...
-         if ( !document.getElementById( "dotboxholder"+calendarEventDisplay.event.start.day ) )
-         {
-            //make one
-            dotBoxHolder = document.createElement( "hbox" );
-            dotBoxHolder.setAttribute( "id", "dotboxholder"+calendarEventDisplay.event.start.day );
-            dotBoxHolder.setAttribute( "eventbox", "monthview" );
-                        
-            //add the box to the day.
-            dayBoxItem.appendChild( dotBoxHolder );
-         }
-         else
-         {
-            //otherwise, get the box
-            dotBoxHolder = document.getElementById( "dotboxholder"+calendarEventDisplay.event.start.day );
-         }
-         
-         if( dotBoxHolder.childNodes.length < kMAX_NUMBER_OF_DOTS_IN_MONTH_VIEW )
-         {
-            eventDotBox = document.createElement( "box" );
-            eventDotBox.setAttribute( "eventbox", "monthview" );
-            
-            //show a dot representing an event.
-            
-            //NOTE: This variable is named eventBox because it needs the same name as 
-            // the regular boxes, for the next part of the function!
-            eventBox = document.createElement( "image" );
-            eventBox.setAttribute( "class", "month-view-event-dot-class" );
-            eventBox.setAttribute( "id", "month-view-event-box-"+calendarEventDisplay.event.id );
-            eventBox.setAttribute( "name", "month-view-event-box-"+calendarEventDisplay.event.id );
-            eventBox.calendarEventDisplay = calendarEventDisplay;
-            eventBox.setAttribute( "onmouseover", "gCalendarWindow.changeMouseOverInfo( calendarEventDisplay, event )" );
-            eventBox.setAttribute( "onclick", "monthEventBoxClickEvent( this, event )" );
-            eventBox.setAttribute( "ondblclick", "monthEventBoxDoubleClickEvent( this, event )" );
-            eventBox.setAttribute( "tooltip", "eventTimeViewTooltip" );
-   
-            this.kungFooDeathGripOnEventBoxes.push( eventBox );
-            
-            //add the dot to the extra box.
-            eventDotBox.appendChild( eventBox );
-            dotBoxHolder.appendChild( eventDotBox );
-         }
-         
-         
-      }
-
-      // mark the box as selected, if the event is
-      if( this.calendarWindow.EventSelection.isSelectedEvent( calendarEventDisplay.event ) )
-      {
-         this.selectBoxForEvent( calendarEventDisplay.event ); 
-      } 
-   }
-}
-
-
-/** PUBLIC
-*
-*   Called when the user switches to a different view
-*/
-
-MonthView.prototype.switchFrom = function monthView_switchFrom( )
-{
-   
-}
-
-
-/** PUBLIC
-*
-*   Called when the user switches to the month view
-*/
-
-MonthView.prototype.switchTo = function monthView_switchTo( )
-{
-   // see showingLastDay notes above
-   
-   this.showingLastDay = false;
-      
-   // disable/enable view switching buttons   
-   
-   var weekViewButton = document.getElementById( "week_view_command" );
-   var monthViewButton = document.getElementById( "month_view_command" );
-   var dayViewButton = document.getElementById( "day_view_command" );
-   
-   monthViewButton.setAttribute( "disabled", "true" );
-   weekViewButton.removeAttribute( "disabled" );
-   dayViewButton.removeAttribute( "disabled" );
-
-   // switch views in the deck
-   
-   var calendarDeckItem = document.getElementById( "calendar-deck" );
-   calendarDeckItem.selectedIndex = 0;
-}
-
-
-/** PUBLIC
-*
-*   Redraw the display, but not the events
-*/
-
-MonthView.prototype.refreshDisplay = function monthView_refreshDisplay( )
-{ 
-   // set the month/year in the header
-   
-   var selectedDate = this.calendarWindow.getSelectedDate();
-   var newMonth = selectedDate.getMonth();
-   var newYear =  selectedDate.getFullYear();
-   var titleMonthArray = new Array();
-   var titleYearArray = new Array();
-   var toDebug = "";
-   for (var i=-2; i < 3; i++){
-      titleMonthArray[i] = newMonth + i;
-      titleMonthArray[i] = (titleMonthArray[i] >= 0)? titleMonthArray[i] % 12 : titleMonthArray[i] + 12;
-      titleMonthArray[i] = this.calendarWindow.dateFormater.getMonthName( titleMonthArray[i] );
-      var idName = i + "-month-title";
-      document.getElementById( idName ).setAttribute( "value" , titleMonthArray[i] );
-   }
-	document.getElementById( "0-year-title" ).setAttribute( "value" , newYear );
-   
-   var Offset = getIntPref(this.calendarWindow.calendarPreferences.calendarPref, "week.start", 0 );
-   
-   NewArrayOfDayNames = new Array();
-   
-   for( i = 0; i < ArrayOfDayNames.length; i++ )
-   {
-      NewArrayOfDayNames[i] = ArrayOfDayNames[i];
-   }
-
-   for( i = 0; i < Offset; i++ )
-   {
-      var FirstElement = NewArrayOfDayNames.shift();
-
-      NewArrayOfDayNames.push( FirstElement );
-   }
-
-   //set the day names 
-   for( i = 1; i <= 7; i++ )
-   {
-      document.getElementById( "month-view-header-day-"+i ).value = NewArrayOfDayNames[ (i-1) ];
-   }
-   
-
-   // Write in all the day numbers and create the dayBoxItemByDateArray, see notes above
-   
-   // figure out first and last days of the month
-   
-   var firstDate = new Date( newYear, newMonth, 1 );
-   var firstDayOfWeek = firstDate.getDay() - Offset;
-   if( firstDayOfWeek < 0 )
-      firstDayOfWeek+=7;
-
-   var lastDayOfMonth = DateUtils.getLastDayOfMonth( newYear, newMonth );
-   
-   // prepare the dayBoxItemByDateArray, we will be filling this in
-   
-   this.dayBoxItemByDateArray = new Array();
-   
-   // loop through all the day boxes
-   
-   var dayNumber = 1;
-   
-   for( var dayIndex = 0; dayIndex < this.dayNumberItemArray.length; ++dayIndex )
-   {
-      var dayNumberItem = this.dayNumberItemArray[ dayIndex ];
-      var dayBoxItem = this.dayBoxItemArray[ dayIndex ];
-      
-      if( dayIndex < firstDayOfWeek || dayNumber > lastDayOfMonth )
-      {
-         // this day box is NOT in the month, 
-         dayBoxItem.dayNumber = null;
-
-         dayBoxItem.setAttribute( "empty" , "true" );  
-         dayBoxItem.removeAttribute( "weekend" );
-         
-         if( dayIndex < firstDayOfWeek )
-         {
-            var thisDate = new Date( newYear, newMonth, 1-(firstDayOfWeek - dayIndex ) );
-            
-            dayBoxItem.date = thisDate;
-            
-            dayNumberItem.setAttribute( "value" , thisDate.getDate() );  
-
-         }
-         else
-         {
-            var thisDate = new Date( newYear, newMonth, lastDayOfMonth+( dayIndex - lastDayOfMonth - firstDayOfWeek + 1 ) );
-            
-            dayBoxItem.date = thisDate;
-            dayBoxItem.setAttribute( "date", thisDate );
-
-            dayNumberItem.setAttribute( "value" , thisDate.getDate() );  
-         }
-      }  
-      else
-      {
-         dayNumberItem.setAttribute( "value" , dayNumber );
-         
-         dayBoxItem.removeAttribute( "empty" ); 
-         var thisDate = new Date( newYear, newMonth, dayNumber );
-         if( thisDate.getDay() == 0 | thisDate.getDay() == 6 )
-         {
-            dayBoxItem.setAttribute( "weekend", "true" );
-         }
-         else
-            dayBoxItem.removeAttribute( "weekend" ); 
-
-         dayBoxItem.dayNumber = dayNumber;
-         
-         this.dayBoxItemByDateArray[ dayNumber ] = dayBoxItem; 
-         ++dayNumber;  
-      }
-   }
-  
-   // if we aren't showing an event, highlite the selected date.
-   if ( this.calendarWindow.EventSelection.selectedEvents.length < 1 ) 
-   {
-      this.hiliteSelectedDate( );
-   }
-   
-   //always highlight today's date.
-   this.hiliteTodaysDate( );
-}
-
-
-/** PRIVATE
-*
-*   Mark the selected date, also unmark the old selection if there was one
-*/
-
-MonthView.prototype.hiliteSelectedDate = function monthView_hiliteSelectedDate( )
-{
-   // Clear the old selection if there was one
-
-   this.clearSelectedDate();
-
-   this.clearSelectedBoxes();
-
-   // Set the background for selection
-   
-   var ThisBox = this.dayBoxItemByDateArray[ this.calendarWindow.getSelectedDate().getDate() ];
-   
-   if( ThisBox )
-      ThisBox.setAttribute( "monthselected" , "true" );
-}
-
-
-/** PUBLIC
-*
-*  Unmark the selected date if there is one.
-*/
-
-MonthView.prototype.clearSelectedDate = function monthView_clearSelectedDate( )
-{
-   var SelectedBoxes = document.getElementsByAttribute( "monthselected", "true" );
-   
-   for( i = 0; i < SelectedBoxes.length; i++ )
-   {
-      SelectedBoxes[i].removeAttribute( "monthselected" );
-   }
-}
-
-/** PUBLIC
-*
-*  Unmark the selected date if there is one.
-*/
-
-MonthView.prototype.clearSelectedBoxes = function monthView_clearSelectedBoxes( )
-{
-   var SelectedBoxes = document.getElementsByAttribute( "eventselected", "true" );
-   
-   for( i = 0; i < SelectedBoxes.length; i++ )
-   {
-      SelectedBoxes[i].removeAttribute( "eventselected" );
-   }
-}
-
-/** PRIVATE
-*
-*  Mark today as selected, also unmark the old today if there was one.
-*/
-
-MonthView.prototype.hiliteTodaysDate = function monthView_hiliteTodaysDate( )
-{
-   var Month = this.calendarWindow.getSelectedDate().getMonth();
-   
-   var Year = this.calendarWindow.getSelectedDate().getFullYear();
-
-   // Clear the old selection if there was one
-   var TodayBox = document.getElementsByAttribute( "today", "true" );
-   
-   for( i = 0; i < TodayBox.length; i++ )
-   {
-      TodayBox[i].removeAttribute( "today" );
-   }
-
-   //highlight today.
-   var Today = new Date( );
-   if ( Year == Today.getFullYear() && Month == Today.getMonth() ) 
-   {
-      var ThisBox = this.dayBoxItemByDateArray[ Today.getDate() ];
-      if( ThisBox )
-         ThisBox.setAttribute( "today", "true" );
-   }
-}
-
-
-/** PUBLIC
-*
-*   This is called when we are about the make a new event
-*   and we want to know what the default start date should be for the event.
-*/
-
-MonthView.prototype.getNewEventDate = function monthView_getNewEventDate( )
-{
-   // use the selected year, month and day
-   // and the current hours and minutes
-   
-   var now = new Date();
-   var start = new Date( this.calendarWindow.getSelectedDate() );
-   
-   start.setHours( now.getHours() );
-   start.setMinutes( Math.ceil( now.getMinutes() / 5 ) * 5 );
-   start.setSeconds( 0 );
-   
-   return start;     
-}
-
-
-/** PUBLIC
-*
-*   Moves goMonths months in the future, goes to next month if no argument.
-*/
-
-MonthView.prototype.goToNext = function monthView_goToNext( goMonths )
-{  
-   if(goMonths){
-      var nextMonth = new Date(  this.calendarWindow.selectedDate.getFullYear(),  this.calendarWindow.selectedDate.getMonth() + goMonths, 1 );
-      this.adjustNewMonth( nextMonth );  
-      this.goToDay( nextMonth );
-   }else{
-      var nextMonth = new Date(  this.calendarWindow.selectedDate.getFullYear(),  this.calendarWindow.selectedDate.getMonth() + 1, 1 );
-      this.adjustNewMonth( nextMonth );  
-      this.goToDay( nextMonth );
-   }
-}
-
-
-/** PUBLIC
-*
-*   Goes goMonths months into the past, goes to the previous month if no argument.
-*/
-
-MonthView.prototype.goToPrevious = function monthView_goToPrevious( goMonths )
-{
-   if(goMonths){
-      var prevMonth = new Date(  this.calendarWindow.selectedDate.getFullYear(),  this.calendarWindow.selectedDate.getMonth() - goMonths, 1 );
-      this.adjustNewMonth( prevMonth );  
-      this.goToDay( prevMonth );
-   }else{
-      var prevMonth = new Date(  this.calendarWindow.selectedDate.getFullYear(),  this.calendarWindow.selectedDate.getMonth() - 1, 1 );
-      this.adjustNewMonth( prevMonth );  
-      this.goToDay( prevMonth );
-   }
-   
-}
-
-/** PRIVATE
-*
-*   Helper function for goToNext and goToPrevious
-*
-*   When the user changes to a new month the new month may not have the selected day in it.
-*   ( i.e. 31 was selected and the new month has only 30 days ). 
-*   In that case our addition, or subtraction, in  goToNext or goToPrevious will cause the
-*   date to jump a month. ( Say the date starts at May 31, we add 1 to the month, Now the
-*   date would be June 31, but the Date object knows there is no June 31, so it sets itself
-*   to July 1. )
-*
-*   In goToNext or goToPrevious we set the date to be 1, so the month will be correct. Here
-*   we set the date to be the selected date, making adjustments if the selected date is not in the month.
-*/
-
-MonthView.prototype.adjustNewMonth = function monthView_adjustNewMonth( newMonth )
-{
-   // Don't let a date beyond the end of the month make us jump
-   // too many or too few months
-  
-   var lastDayOfMonth = DateUtils.getLastDayOfMonth( newMonth.getFullYear(), newMonth.getMonth() );
-   
-   if( this.calendarWindow.selectedDate.getDate() > lastDayOfMonth )
-   {
-      // The selected date is NOT in the month
-      // set it to the last day of the month and turn on showingLastDay, see notes in MonthView class
-      
-      newMonth.setDate( lastDayOfMonth )
-      
-      this.showingLastDay = true;
-   }
-   else if( this.showingLastDay )
-   {
-      // showingLastDay is on so select the last day of the month, see notes in MonthView class
-      
-      newMonth.setDate( lastDayOfMonth )
-   }
-   else
-   {
-      // date is NOT beyond the last.
-      
-      newMonth.setDate(  this.calendarWindow.selectedDate.getDate() )
-   }
-}
-
-
-
-
-/** PUBLIC  -- monthview only
-*
-*   Called when a day box item is single clicked
-*/
-
-MonthView.prototype.clickDay = function monthView_clickDay( event )
-{
-   if( event.button > 0 )
-      return;
-  
-   var dayBoxItem = event.currentTarget;
-   
-   if( dayBoxItem.dayNumber != null && event.detail == 1 )
-   {
-      // turn off showingLastDay - see notes in MonthView class
-      this.showingLastDay = false;
-   
-      // change the selected date and redraw it
-      var newDate = this.calendarWindow.getSelectedDate();
-
-      newDate.setDate( dayBoxItem.dayNumber );
-      
-      this.calendarWindow.setSelectedDate( newDate );
-
-      //changing the selection will redraw the day as selected (colored blue) in the month view.
-      //therefor, this has to happen after setSelectedDate
-      gCalendarWindow.EventSelection.emptySelection();
-   }
-}
-
-/** PUBLIC  -- monthview only
-*
-*   Called when a day box item is single clicked
-*/
-MonthView.prototype.contextClickDay = function monthView_contextClickDay( event )
-{
-   var dayBoxItem = event.currentTarget;
-   
-   if( dayBoxItem.dayNumber != null )
-   {
-      // turn off showingLastDay - see notes in MonthView class
-      
-      this.showingLastDay = false;
-   
-      // change the selected date and redraw it
-      
-      gNewDateVariable = gCalendarWindow.getSelectedDate();
-
-      gNewDateVariable.setDate( dayBoxItem.dayNumber );
-   }
-}
-
-/*
-** Don't forget that clickDay gets called before double click day gets called
-*/
-
-MonthView.prototype.doubleClickDay = function monthView_doubleClickDay( event )
-{
-   if( event.button > 0 )
-      return;
-   
-   if ( event.currentTarget.dayNumber != null ) 
-   {
-      // change the selected date and redraw it
-
-      var startDate = this.getNewEventDate();
-      
-      newEvent( startDate, false );
-
-   }
-   else
-   {
-      newEvent( dayBoxItem.date, false );
-   }
-}
-
-
-MonthView.prototype.clearSelectedEvent = function monthView_clearSelectedEvent( )
-{
-   var ArrayOfBoxes = document.getElementsByAttribute( "eventselected", "true" );
-
-   for( i = 0; i < ArrayOfBoxes.length; i++ )
-   {
-      ArrayOfBoxes[i].removeAttribute( "eventselected" );   
-   }
-}
-
-
-MonthView.prototype.getVisibleEvent = function monthView_getVisibleEvent( calendarEvent )
-{
-   var eventBox = document.getElementById( "month-view-event-box-"+calendarEvent.id );
-
-   if ( eventBox ) 
-   {
-      return eventBox;
-   }
-   else
-      return false;
-}
-
-MonthView.prototype.selectBoxForEvent = function monthView_selectBoxForEvent( calendarEvent )
-{
-   var EventBoxes = document.getElementsByAttribute( "name", "month-view-event-box-"+calendarEvent.id );
-            
-   for ( j = 0; j < EventBoxes.length; j++ ) 
-   {
-      EventBoxes[j].setAttribute( "eventselected", "true" );
-   }
-}
-
-/*Just calls setCalendarSize, it's here so it can be implemented on the other two views without difficulty.*/
-MonthView.prototype.doResize = function monthView_doResize( )
-{
-   this.setCalendarSize(this.getViewHeight());
-
-   this.setNumberOfEventsToShow();
-}
-
-/*Takes in a height, sets the calendar's container box to that height, the grid expands and contracts to fit it.*/
-MonthView.prototype.setCalendarSize = function monthView_setCalendarSize( height )
-{
-    var offset = document.defaultView.getComputedStyle(document.getElementById("month-controls-box"), "").getPropertyValue("height");
-    offset = parseInt( offset );
-    height = (height-offset)+"px";
-    document.getElementById( "month-content-box" ).setAttribute( "height", height );
-} 
-
-/*returns the height of the current view in pixels*/ 
-MonthView.prototype.getViewHeight = function monthView_getViewHeight( )
-{
-    toReturn = document.defaultView.getComputedStyle(document.getElementById("month-view-box"), "").getPropertyValue("height");
-    toReturn = parseInt( toReturn ); //strip off the px at the end
-    return toReturn;
-}
-
-
-MonthView.prototype.setNumberOfEventsToShow = function monthView_getNumberOfEventsToShow( )
-{
-   //get the style height of the month view box.
-   var MonthViewBoxHeight = document.defaultView.getComputedStyle(document.getElementById("month-week-4-day-4-box"), "").getPropertyValue("height");
-   MonthViewBoxHeight = parseInt( MonthViewBoxHeight ); //strip off the px at the end
-   
-   //get the height of an event box.
-   var Element = document.getElementsByAttribute( "eventbox", "monthview" )[0];
-   if( !Element )
-      return;
-
-   var EventBoxHeight = document.defaultView.getComputedStyle( Element, "" ).getPropertyValue( "height" );
-   EventBoxHeight = parseInt( EventBoxHeight ); //strip off the px at the end
-
-   //calculate the number of events to show.
-   dump( "\n\n"+( MonthViewBoxHeight - EventBoxHeight ) / EventBoxHeight );
-   dump( "\n"+MonthViewBoxHeight );
-   dump( "\n"+EventBoxHeight );
-   this.numberOfEventsToShow = parseInt( ( MonthViewBoxHeight - EventBoxHeight ) / EventBoxHeight ); 
-}
-
-
-/*
-drag and drop stuff 
-*/
-gEventBeingDragged = false;
-gBoxBeingDroppedOn = false;
-
-var monthViewEventDragAndDropObserver  = {
-  onDragStart: function (evt, transferData, action){
-      if( evt.target.calendarEventDisplay ) 
-         gEventBeingDragged = evt.target.calendarEventDisplay.event;
-      else if( evt.target.parentNode.calendarEventDisplay )
-         gEventBeingDragged = evt.target.parentNode.calendarEventDisplay.event;
-
-      //dump( "\nEvent being dragged is "+gEventBeingDragged );
-      transferData.data=new TransferData();
-      transferData.data.addDataForFlavour("text/unicode",0);
-  },
-  getSupportedFlavours : function () {
-    var weekflavours = new FlavourSet();
-    weekflavours.appendFlavour("text/unicode");
-    return weekflavours;
-  },
-  onDragOver: function (evt,flavour,session){
-    //dump( "on dragged over "+evt.target.getAttribute( "id" )+"\n" );
-    gBoxBeingDroppedOn = document.getElementById( evt.target.getAttribute( "id" ) );
-    //dump( evt.target.getAttribute( "id" ) );
-  },
-  onDrop: function (evt,dropdata,session){
-      //get the date of the current event box.
-      //dump( "\n\nDROP EVNET->\n"+gEventBeingDragged.start );
-      var newDay = gBoxBeingDroppedOn.dayNumber;
-      if( newDay == null )
-         return;
-
-      var OldStartDate = new Date( gEventBeingDragged.start.getTime() );
-      var newStartDate = new Date( OldStartDate.getTime() );
-      newStartDate.setDate( newDay );
-      
-      var Difference = newStartDate.getTime() - OldStartDate.getTime();
-      var oldEndDate = new Date( gEventBeingDragged.end.getTime() );
-      var newEndDate = oldEndDate.getTime() + Difference;
-
-      gEventBeingDragged.start.setTime( newStartDate.getTime() );
-      gEventBeingDragged.end.setTime( newEndDate );
-
-      //edit the event being dragged to change its start and end date
-      //don't change the start and end time though.
-      gICalLib.modifyEvent( gEventBeingDragged, gEventBeingDragged.parent.server );
-      
-      //refresh the view
-  }
-};
diff --git a/calendar/resources/content/calendarPublish.js b/calendar/resources/content/calendarPublish.js
index 6738a76d8ce..e69de29bb2d 100644
--- a/calendar/resources/content/calendarPublish.js
+++ b/calendar/resources/content/calendarPublish.js
@@ -1,287 +0,0 @@
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001-2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): ArentJan Banck <ajbanck@planet.nl> 
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// Original code:
-// http://lxr.mozilla.org/mozilla/source/editor/ui/composer/content/publish.js
-// TODO Implement uploadfile with:
-//void setUploadFile(in nsIFile file, in string contentType, in long contentLength);
-
-var gPublishHandler = null;
-
-
-/* Create an instance of the given ContractID, with given interface */
-function createInstance(contractId, intf) {
-    return Components.classes[contractId].createInstance(Components.interfaces[intf]);
-}
-
-
-var gPublishIOService;
-function GetIOService()
-{
-  if (gPublishIOService)
-    return gPublishIOService;
-
-  gPublishIOService = Components.classes["@mozilla.org/network/io-service;1"].getService(Components.interfaces.nsIIOService);
-  if (!gPublishIOService)
-    dump("failed to get io service\n");
-  
-  return gPublishIOService;
-}
-
-
-function calendarPublish(aDataString, newLocation, fileName, login, password, contentType)
-{
-  try
-  {
-    var protocolChannel = get_destination_channel(newLocation, fileName, login, password);
-    if (!protocolChannel)
-    {
-      dump("failed to get a destination channel\n");
-      return;
-    }
-
-    output_string_to_channel(protocolChannel, aDataString, contentType);
-    protocolChannel.asyncOpen(gPublishingListener, null);
-    dump("done\n");
-  }
-  catch (e)
-  {
-    alert("an error occurred: " + e + "\n");
-  }
-}
-
-// XXX WARNING: I DIDN'T TEST THIS!!!!!
-function calendarUploadFile(aSourceFilename, newLocation, fileName, login, password, contentType)
-{
-   try
-   {
-      var protocolChannel = get_destination_channel(newLocation, fileName, login, password);
-    
-      if (!protocolChannel)
-      {
-         dump("failed to get a destination channel\n");
-         return;
-      }
-
-       //void setUploadFile(in nsIFile file, in string contentType, in long contentLength);
-   
-       output_file_to_channel(protocolChannel, aSourceFilename, contentType);
-       protocolChannel.asyncOpen(gPublishingListener, null);
-       dump("done\n");
-   }
-   catch (e)
-   {
-      alert("an error occurred: " + e + "\n");
-   }
-}
-
-
-function output_string_to_channel( aChannel, aDataString, contentType )
-{
-   var uploadChannel = aChannel.QueryInterface(Components.interfaces.nsIUploadChannel);
-   var postStream = createInstance('@mozilla.org/io/string-input-stream;1', 'nsIStringInputStream');
-
-   postStream.setData(aDataString, aDataString.length);
-   uploadChannel.setUploadStream(postStream, contentType, -1);
-}
-
-
-function output_file_to_channel( aChannel, aFilePath, contentType )
-{
-   var uploadChannel = aChannel.QueryInterface(Components.interfaces.nsIUploadChannel);
-   var file = createInstance('@mozilla.org/file/local;1', 'nsILocalFile');
-
-   file.initWithPath( aFilePath );
-   uploadChannel.setUploadFile(file, contentType, -1);
-}
-
-
-// this function takes a login and password and adds them to the destination url
-function get_destination_channel(destinationDirectoryLocation, fileName, login, password)
-{
-  try
-  {
-    var ioService = GetIOService();
-    if (!ioService)
-    {
-       return;
-    }
-
-    // create a channel for the destination location
-    var fullurl = destinationDirectoryLocation + fileName;
-    destChannel = create_channel_from_url(ioService, fullurl, login, password);
-    if (!destChannel)
-    {
-      dump("can't create dest channel\n");
-      return;
-    }
-    try {
-    dump("about to set callbacks\n");
-    destChannel.notificationCallbacks = window.docshell;  // docshell
-    dump("notification callbacks set\n");
-    }
-    catch(e) {dump(e+"\n");}
-    
-    try {
-       var httpChannel = destChannel.QueryInterface(Components.interfaces.nsIHttpChannel);
-    }
-    catch( e )
-    {
-       //alert( e );
-    }
-    
-    if (httpChannel) 
-    {
-       dump("http channel found\n");
-       return httpChannel;
-    }
-    var ftpChannel = destChannel.QueryInterface(Components.interfaces.nsIFTPChannel);
-    if (ftpChannel) dump("ftp channel found\n");
-    if (ftpChannel)
-      return ftpChannel;
-    
-    var httpsChannel = destChannel.QueryInterface(Components.interfaces.nsIHttpsChannel);
-    if (httpsChannel) dump("https channel found\n");
-    if (httpsChannel)
-      return httpsChannel;
-    else
-      return null;
-  }
-  catch (e)
-  {
-    return null;
-  }
-}
-
-
-// this function takes a full url, creates an nsIURI, and then creates a channel from that nsIURI
-function create_channel_from_url(ioService, aURL, aLogin, aPassword)
-{
-  try
-  {
-    var nsiuri = Components.classes["@mozilla.org/network/standard-url;1"].createInstance(Components.interfaces.nsIURI);
-    if (!nsiuri)
-      return null;
-    nsiuri.spec = aURL;
-    if (aLogin)
-    {
-      nsiuri.username = aLogin;
-      if (aPassword)
-        nsiuri.password = aPassword;
-    }
-    return ioService.newChannelFromURI(nsiuri);
-  }
-  catch (e) 
-  {
-    alert(e+"\n");
-    return null;
-  }
-}
-
-/*
-function PublishCopyFile(srcDirectoryLocation, destinationDirectoryLocation, fileName, aLogin, aPassword)
-{
-  // append '/' if it's not there; inputs should be directories so should end in '/'
-  if ( srcDirectoryLocation.charAt(srcDirectoryLocation.length-1) != '/' )
-    srcDirectoryLocation = srcDirectoryLocation + '/';
-  if ( destinationDirectoryLocation.charAt(destinationDirectoryLocation.length-1) != '/' )
-    destinationDirectoryLocation = destinationDirectoryLocation + '/';
-
-  try
-  {
-    // grab an io service
-    var ioService = GetIOService();
-    if (!ioService)
-      return;
-
-    // create a channel for the source location
-    srcChannel = create_channel_from_url(ioService, srcDirectoryLocation + fileName, null, null);
-    if (!srcChannel)
-    {
-      dump("can't create src channel\n");
-      return;
-    }
-
-    // create a channel for the destination location
-    var ftpChannel = get_destination_channel(destinationDirectoryLocation, fileName, aLogin, aPassword);
-    if (!ftpChannel)
-    {
-      dump("failed to get ftp channel\n");
-      return;
-    }
-    
-    ftpChannel.open();
-    protocolChannel.uploadStream = srcChannel.open();
-    protocolChannel.asyncOpen(null, null);
-    dump("done\n");
-  }
-  catch (e)
-  {
-    dump("an error occurred: " + e + "\n");
-  }
-}
-*/
-
-var gPublishingListener =
-{
-  QueryInterface: function(aIId, instance)
-  {
-    if (aIId.equals(Components.interfaces.nsIStreamListener))
-      return this;
-    if (aIId.equals(Components.interfaces.nsISupports))
-      return this;
-    
-    dump("QueryInterface " + aIId + "\n");
-    throw Components.results.NS_NOINTERFACE;
-  },
-
-  onStartRequest: function(request, ctxt)
-  {
-    dump("onStartRequest status = " + request.status + "\n");
-  },
-
-  onStopRequest: function(request, ctxt, status, errorMsg)
-  {
-    dump("onStopRequest status = " + request.status + " " + errorMsg + "\n");
-  },
-
-  onDataAvailable: function(request, ctxt, inStream, sourceOffset, count)
-  {
-    dump("onDataAvailable status = " + request.status + " " + count + "\n");
-  }
-}
-
diff --git a/calendar/resources/content/calendarWeekView.js b/calendar/resources/content/calendarWeekView.js
index 7216730abce..e69de29bb2d 100644
--- a/calendar/resources/content/calendarWeekView.js
+++ b/calendar/resources/content/calendarWeekView.js
@@ -1,727 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is OEone Calendar Code, released October 31st, 2001.
- *
- * The Initial Developer of the Original Code is
- * OEone Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Garth Smedley <garths@oeone.com>
- *                 Mike Potter <mikep@oeone.com>
- *                 Colin Phillips <colinp@oeone.com> 
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-/*-----------------------------------------------------------------
-*   WeekView Class  subclass of CalendarView
-*
-*  Calendar week view class    :TODO: display of events has not been started
-*
-* PROPERTIES
-*     gHeaderDateItemArray   - Array of text boxes used to display the dates of the currently displayed
-*                             week.
-*   
-* 
-*/
-
-
-
-// Make WeekView inherit from CalendarView
-
-WeekView.prototype = new CalendarView();
-WeekView.prototype.constructor = WeekView;
-
-/**
-*   WeekView Constructor.
-* 
-* PARAMETERS
-*      calendarWindow     - the owning instance of CalendarWindow.
-*
-*/
-
-
-function WeekView( calendarWindow )
-{
-   // call super 
-   
-   this.superConstructor( calendarWindow );
-   
-   //set the time on the left hand side labels
-   //need to do this in JavaScript to preserve formatting
-   for( var i = 0; i < 24; i++ )
-   {
-      /*
-      ** FOR SOME REASON, THIS IS NOT WORKING FOR MIDNIGHT
-      */ 
-      var TimeToFormat = new Date();
-
-      TimeToFormat.setHours( i );
-
-      TimeToFormat.setMinutes( "0" );
-
-      var FormattedTime = calendarWindow.dateFormater.getFormatedTime( TimeToFormat );
-
-      var Label = document.getElementById( "week-view-hour-"+i );
-      
-      Label.setAttribute( "value", FormattedTime );
-   }
-   
-   // get week view header items
-   
-   gHeaderDateItemArray = new Array();
-   
-   for( var dayIndex = 1; dayIndex <= 7; ++dayIndex )
-   {
-      var headerDateItem = document.getElementById( "week-header-date-" + dayIndex );
-      
-      gHeaderDateItemArray[ dayIndex ] = headerDateItem;
-   }
-
-   var weekViewEventSelectionObserver = 
-   {
-      onSelectionChanged : function( EventSelectionArray )
-      {
-         for( i = 0; i < EventSelectionArray.length; i++ )
-         {
-            gCalendarWindow.weekView.selectBoxForEvent( EventSelectionArray[i] );
-         }
-      }
-   }
-      
-   calendarWindow.EventSelection.addObserver( weekViewEventSelectionObserver );
-
-}
-
-
-/** PUBLIC
-*
-*   Redraw the events for the current week
-*/
-
-WeekView.prototype.refreshEvents = function( )
-{
-   this.kungFooDeathGripOnEventBoxes = new Array();
-   
-   var eventBoxList = document.getElementsByAttribute( "eventbox", "weekview" );
-
-   for( var eventBoxIndex = 0;  eventBoxIndex < eventBoxList.length; ++eventBoxIndex )
-   {
-      var eventBox = eventBoxList[ eventBoxIndex ];
-      
-      eventBox.parentNode.removeChild( eventBox );
-   }
-
-   for( var dayIndex = 1; dayIndex <= 7; ++dayIndex )
-   {
-      var headerDateItem = document.getElementById( "week-header-date-" + dayIndex );
-      
-      headerDateItem.numEvents = 0;
-   }
-   
-   //get the all day box.
-   
-   var AllDayBox = document.getElementById( "week-view-all-day-content-box" );
-   AllDayBox.setAttribute( "collapsed", "true" );      
-   
-   //expand the day's content box by setting allday to false..
-   
-   document.getElementById( "week-view-content-box" ).removeAttribute( "allday" );
-
-   //START FOR LOOP FOR DAYS---> 
-   for ( dayIndex = 1; dayIndex <= 7; ++dayIndex )
-   {
-
-      //make the text node that will contain the text for the all day box.
-      
-      var TextNode = document.getElementById( "all-day-content-box-text-week-"+dayIndex );
-      
-      // get the events for the day and loop through them
-      dayToGet = new Date( gHeaderDateItemArray[dayIndex].getAttribute( "date" ) );
-      
-      var dayEventList = new Array();
-      
-      dayEventList = this.calendarWindow.eventSource.getEventsForDay( dayToGet );
-     
-      //refresh the array and the current spot.
-      
-      for ( i = 0; i < dayEventList.length; i++ ) 
-      {
-         dayEventList[i].OtherSpotArray = new Array('0');
-         dayEventList[i].CurrentSpot = 0;
-         dayEventList[i].NumberOfSameTimeEvents = 0;
-      }
-   
-      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...
-         
-         if ( calendarEventDisplay.event.allDay != true ) 
-         {
-            //see if there's another event at the same start time.
-            
-            for ( j = 0; j < dayEventList.length; j++ ) 
-            {
-               thisCalendarEventDisplay = dayEventList[j];
-   
-               //if this event overlaps with another event...
-               if ( ( ( thisCalendarEventDisplay.displayDate >= calendarEventDisplay.displayDate &&
-                    thisCalendarEventDisplay.displayDate.getTime() < calendarEventDisplay.event.end.getTime() ) ||
-                     ( calendarEventDisplay.displayDate >= thisCalendarEventDisplay.displayDate &&
-                    calendarEventDisplay.displayDate.getTime() < thisCalendarEventDisplay.event.end.getTime() ) ) &&
-                    calendarEventDisplay.event.id != thisCalendarEventDisplay.event.id &&
-                    thisCalendarEventDisplay.event.allDay != true )
-               {
-                  //get the spot that this event will go in.
-                  var ThisSpot = thisCalendarEventDisplay.CurrentSpot;
-                  
-                  calendarEventDisplay.OtherSpotArray.push( ThisSpot );
-                  ThisSpot++;
-                  
-                  if ( ThisSpot > calendarEventDisplay.CurrentSpot ) 
-                  {
-                     calendarEventDisplay.CurrentSpot = ThisSpot;
-                  } 
-               }
-            }
-            SortedOtherSpotArray = new Array();
-            //the sort must use the global variable gCalendarWindow, not this.calendarWindow
-            SortedOtherSpotArray = calendarEventDisplay.OtherSpotArray.sort( gCalendarWindow.compareNumbers);
-            LowestNumber = this.calendarWindow.getLowestElementNotInArray( SortedOtherSpotArray );
-            
-            //this is the actual spot (0 -> n) that the event will go in on the day view.
-            calendarEventDisplay.CurrentSpot = LowestNumber;
-            if ( SortedOtherSpotArray.length > 4 ) 
-            {
-               calendarEventDisplay.NumberOfSameTimeEvents = 4;
-            }
-            else
-            {
-               calendarEventDisplay.NumberOfSameTimeEvents = SortedOtherSpotArray.length;
-            }
-            
-         dayEventList[i] = calendarEventDisplay;
-         }
-   
-      }
-      var ThisDayAllDayBox = document.getElementById( "all-day-content-box-week-"+dayIndex );
-      
-      while ( ThisDayAllDayBox.hasChildNodes() ) 
-      {
-         ThisDayAllDayBox.removeChild( ThisDayAllDayBox.firstChild );
-      }
-      
-      for ( var eventIndex = 0; eventIndex < dayEventList.length; ++eventIndex )
-      {
-         calendarEventDisplay = dayEventList[ eventIndex ];
-   
-         // get the day box for the calendarEvent's day
-         
-         var eventDayInMonth = calendarEventDisplay.event.start.day;
-         
-         var weekBoxItem = gHeaderDateItemArray[ dayIndex ];
-               
-         // Display no more than three, show dots for the events > 3
-         
-         if ( calendarEventDisplay.event.allDay != true ) 
-         {
-            weekBoxItem.numEvents +=  1;
-         }
-         
-         //if its an all day event, don't show it in the hours bulletin board.
-         
-         if ( calendarEventDisplay.event.allDay == true ) 
-         {
-            // build up the text to show for this event
-            
-            var eventText = calendarEventDisplay.event.title;
-            
-            if( calendarEventDisplay.event.location )
-            {
-               eventText += " " + calendarEventDisplay.event.location;
-            }
-               
-            if( calendarEventDisplay.event.description )
-            {
-               eventText += " " + calendarEventDisplay.event.description;
-            }
-            
-            //show the all day box 
-            AllDayBox.removeAttribute( "collapsed" );
-            
-            //shrink the day's content box.
-            document.getElementById( "week-view-content-box" ).setAttribute( "allday", "true" );
-            
-            //note the use of the WeekViewAllDayText Attribute.  
-            //This is used to remove the text when the day is changed.
-            
-            newHTMLNode = document.createElement( "label" );
-            newHTMLNode.setAttribute( "crop", "end" );
-            newHTMLNode.setAttribute( "flex", "1" );            
-            newHTMLNode.setAttribute( "value", eventText );
-            newHTMLNode.setAttribute( "WeekViewAllDayText", "true" );
-            newHTMLNode.calendarEventDisplay = calendarEventDisplay;
-            newHTMLNode.setAttribute( "onmouseover", "gCalendarWindow.changeMouseOverInfo( calendarEventDisplay, event )" );
-            newHTMLNode.setAttribute( "onclick", "weekEventItemClick( this, event )" );
-            newHTMLNode.setAttribute( "ondblclick", "weekEventItemDoubleClick( this, event )" );
-            newHTMLNode.setAttribute( "tooltip", "eventTooltip" );
-         
-            newImage = document.createElement("image");
-				newImage.setAttribute( "class", "all-day-event-class" );
-            newImage.setAttribute( "WeekViewAllDayText", "true" );
-            newImage.calendarEventDisplay = calendarEventDisplay;
-            newImage.setAttribute( "onmouseover", "gCalendarWindow.changeMouseOverInfo( calendarEventDisplay, event )" );
-            newImage.setAttribute( "onclick", "weekEventItemClick( this, event )" );
-            newImage.setAttribute( "ondblclick", "weekEventItemDoubleClick( this, event )" );
-            newImage.setAttribute( "tooltip", "eventTooltip" );
-            
-            ThisDayAllDayBox.appendChild( newImage );
-            ThisDayAllDayBox.appendChild( newHTMLNode );
-         }
-         else if ( calendarEventDisplay.CurrentSpot <= 4 ) 
-         {
-            eventBox = this.createEventBox( calendarEventDisplay, dayIndex );    
-            
-            //add the box to the bulletin board.
-            document.getElementById( "week-view-content-board" ).appendChild( eventBox );
-         }
-
-         if( this.calendarWindow.EventSelection.isSelectedEvent( calendarEventDisplay.event ) )
-         {
-            this.selectBoxForEvent( calendarEventDisplay.event );
-         }
-      }
-         
-   }
-   //--> END THE FOR LOOP FOR THE WEEK VIEW
-}
-
-
-/** PRIVATE
-*
-*   This creates an event box for the day view
-*/
-WeekView.prototype.createEventBox = function ( calendarEventDisplay, dayIndex )
-{
-   
-   // build up the text to show for this event
-
-   var eventText = calendarEventDisplay.event.title;
-      
-   var eventStartDate = calendarEventDisplay.displayDate;
-   var startHour = eventStartDate.getHours();
-   var startMinutes = eventStartDate.getMinutes();
-
-   var eventEndDateTime = new Date( 2000, 1, 1, calendarEventDisplay.event.end.hour, calendarEventDisplay.event.end.minute, 0 );
-   var eventStartDateTime = new Date( 2000, 1, 1, eventStartDate.getHours(), eventStartDate.getMinutes(), 0 );
-
-   var eventDuration = new Date( eventEndDateTime - eventStartDateTime );
-   
-   var hourDuration = eventDuration / (3600000);
-   
-   var eventBox = document.createElement( "vbox" );
-   
-   eventBox.calendarEventDisplay = calendarEventDisplay;
-   
-   var totalWeekWidth = parseFloat(document.defaultView.getComputedStyle(document.getElementById("week-view-content-holder"), "").getPropertyValue("width")) + 1;
-   var boxLeftOffset = Math.ceil(parseFloat(document.defaultView.getComputedStyle(document.getElementById("week-tree-hour-0"), "").getPropertyValue("width")));
-   var boxWidth = (totalWeekWidth - boxLeftOffset)/ kDaysInWeek;
-   var Height = ( hourDuration * kWeekViewHourHeight ) + 1;
-   var Width = Math.floor( boxWidth / calendarEventDisplay.NumberOfSameTimeEvents ) + 1;
-   eventBox.setAttribute( "height", Height );
-   eventBox.setAttribute( "width", Width );
-      
-   top = eval( ( startHour*kWeekViewHourHeight ) + ( ( startMinutes/60 ) * kWeekViewHourHeight ) - kWeekViewHourHeightDifference );
-   eventBox.setAttribute( "top", top );
-   
-   left = eval( boxLeftOffset + ( boxWidth * ( dayIndex - 1 ) ) + ( ( calendarEventDisplay.CurrentSpot - 1 ) * eventBox.getAttribute( "width" ) ) ) ;
-   eventBox.setAttribute( "left", left );
-   
-   eventBox.setAttribute( "class", "week-view-event-class" );
-   eventBox.setAttribute( "eventbox", "weekview" );
-   eventBox.setAttribute( "onclick", "weekEventItemClick( this, event )" );
-   eventBox.setAttribute( "ondblclick", "weekEventItemDoubleClick( this, event )" );
-   eventBox.setAttribute( "ondraggesture", "nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" );
-   eventBox.setAttribute( "ondragover", "nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" );
-   eventBox.setAttribute( "ondragdrop", "nsDragAndDrop.drop(event,calendarViewDNDObserver)" );
-   eventBox.setAttribute( "id", "week-view-event-box-"+calendarEventDisplay.event.id );
-   eventBox.setAttribute( "name", "week-view-event-box-"+calendarEventDisplay.event.id );
-   eventBox.setAttribute( "onmouseover", "gCalendarWindow.changeMouseOverInfo( calendarEventDisplay, event )" );
-   eventBox.setAttribute( "tooltip", "eventTooltip" );
-   if( calendarEventDisplay.event.categories && calendarEventDisplay.event.categories != "" )
-   {
-      eventBox.setAttribute( calendarEventDisplay.event.categories, "true" );
-   }      
-
-   /*
-   ** The event description. This doesn't go multi line, but does crop properly.
-   */
-   var eventDescriptionElement = document.createElement( "label" );
-   eventDescriptionElement.calendarEventDisplay = calendarEventDisplay;
-   eventDescriptionElement.setAttribute( "class", "week-view-event-label-class" );
-   eventDescriptionElement.setAttribute( "value", eventText );
-   eventDescriptionElement.setAttribute( "flex", "1" );
-   var DescriptionText = document.createTextNode( " " );
-   eventDescriptionElement.appendChild( DescriptionText );
-   eventDescriptionElement.setAttribute( "style", "height: "+Height+";" );
-   eventDescriptionElement.setAttribute( "crop", "end" );
-   eventDescriptionElement.setAttribute( "ondraggesture", "nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" );
-   eventDescriptionElement.setAttribute( "ondragover", "nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" );
-   eventDescriptionElement.setAttribute( "ondragdrop", "nsDragAndDrop.drop(event,calendarViewDNDObserver)" );
-
-   eventBox.appendChild( eventDescriptionElement );
-   
-   
-   // add a property to the event box that holds the calendarEvent that the
-   // box represents
-   
-   this.kungFooDeathGripOnEventBoxes.push( eventBox );
-         
-   return( eventBox );
-
-}
-
-
-/** PUBLIC
-*
-*   Called when the user switches to a different view
-*/
-
-WeekView.prototype.switchFrom = function( )
-{
-}
-
-
-/** PUBLIC
-*
-*   Called when the user switches to the week view
-*/
-
-WeekView.prototype.switchTo = function( )
-{
-   // disable/enable view switching buttons   
-
-   var weekViewButton = document.getElementById( "week_view_command" );
-   var monthViewButton = document.getElementById( "month_view_command" );
-   var dayViewButton = document.getElementById( "day_view_command" );
-   
-   monthViewButton.removeAttribute( "disabled" );
-   weekViewButton.setAttribute( "disabled", "true" );
-   dayViewButton.removeAttribute( "disabled" );
-
-   // switch views in the deck
-
-   var calendarDeckItem = document.getElementById( "calendar-deck" );
-   calendarDeckItem.selectedIndex = 1;
-}
-
-
-/** PUBLIC
-*
-*   Redraw the display, but not the events
-*/
-
-WeekView.prototype.refreshDisplay = function( )
-{
-   
-   // Set the from-to title string, based on the selected date
-   var Offset = getIntPref(this.calendarWindow.calendarPreferences.calendarPref, "week.start", 0 );
-   
-   var viewDay = this.calendarWindow.getSelectedDate().getDay();
-   var viewDayOfMonth = this.calendarWindow.getSelectedDate().getDate();
-   var viewMonth = this.calendarWindow.getSelectedDate().getMonth();
-   var viewYear = this.calendarWindow.getSelectedDate().getFullYear();
-   
-   viewDay -= Offset;
-
-   if( viewDay < 0 )
-      viewDay += 7;
-
-   NewArrayOfDayNames = new Array();
-   
-   /* 
-      Set the header information for the week view
-   */
-   for( i = 0; i < ArrayOfDayNames.length; i++ )
-   {
-      NewArrayOfDayNames[i] = ArrayOfDayNames[i];
-   }
-
-   for( i = 0; i < Offset; i++ )
-   {
-      var FirstElement = NewArrayOfDayNames.shift();
-
-      NewArrayOfDayNames.push( FirstElement );
-   }
-
-   var dateOfLastDayInWeek = viewDayOfMonth + ( 6 - viewDay );
-   
-   var dateOfFirstDayInWeek = viewDayOfMonth - viewDay;
-   
-   var firstDayOfWeek = new Date( viewYear, viewMonth, dateOfFirstDayInWeek );
-   var lastDayOfWeek = new Date( viewYear, viewMonth, dateOfLastDayInWeek );
-    
-   var firstDayMonthName = this.calendarWindow.dateFormater.getMonthName( firstDayOfWeek.getMonth() );
-   var lastDayMonthName =  this.calendarWindow.dateFormater.getMonthName( lastDayOfWeek.getMonth() );
-   
-   var weekNumber = this.getWeekNumber();
-
-   var dateString = "Week "+weekNumber+ ": "+firstDayMonthName + " " + firstDayOfWeek.getDate() + " - " +
-                    lastDayMonthName  + " " + lastDayOfWeek.getDate();
-   
-   var weekTextItem = document.getElementById( "week-title-text" );
-   weekTextItem.setAttribute( "value" , dateString ); 
-   
-   /* done setting the header information */
-
-   /* Fix the day names because users can choose which day the week starts on  */
-   var weekDate = new Date( viewYear, viewMonth, dateOfFirstDayInWeek );
-   
-   for( var dayIndex = 1; dayIndex < 8; ++dayIndex )
-   {
-      var dateOfDay = weekDate.getDate();
-      
-      var headerDateItem = document.getElementById( "week-header-date-"+dayIndex );
-      headerDateItem.setAttribute( "value" , dateOfDay );
-      headerDateItem.setAttribute( "date", weekDate );
-      headerDateItem.numEvents = 0;
-      
-      document.getElementById( "week-header-date-text-"+dayIndex ).setAttribute( "value", NewArrayOfDayNames[dayIndex-1] );
-      
-      var arrayOfBoxes = new Array();
-
-      if( weekDate.getDay() == 0 || weekDate.getDay() == 6 )
-      {
-         /* its a weekend */
-         arrayOfBoxes = document.getElementsByAttribute( "day", dayIndex );
-
-         for( i = 0; i < arrayOfBoxes.length; i++ )
-         {
-            arrayOfBoxes[i].setAttribute( "weekend", "true" );
-         }
-      }
-      else
-      {
-         /* its not a weekend */
-         arrayOfBoxes = document.getElementsByAttribute( "day", dayIndex );
-
-         for( i = 0; i < arrayOfBoxes.length; i++ )
-         {
-            arrayOfBoxes[i].removeAttribute( "weekend" );
-         }
-      }
-
-      // advance to next day 
-      
-      weekDate.setDate( dateOfDay + 1 );
-   }
-
-   this.hiliteTodaysDate( );
-}
-
-
-/** PUBLIC
-*
-*   This is called when we are about the make a new event
-*   and we want to know what the default start date should be for the event.
-*/
-
-WeekView.prototype.getNewEventDate = function( )
-{
-   return this.calendarWindow.getSelectedDate();
-}
-
-
-/** PUBLIC
-*
-*   Go to the next week.
-*/
-
-WeekView.prototype.goToNext = function()
-{
-   var nextWeek = new Date( this.calendarWindow.selectedDate.getFullYear(),  this.calendarWindow.selectedDate.getMonth(),  this.calendarWindow.selectedDate.getDate() + 7 );
-   
-   this.goToDay( nextWeek );
-}
-
-
-/** PUBLIC
-*
-*   Go to the previous week.
-*/
-
-WeekView.prototype.goToPrevious = function()
-{
-   var prevWeek = new Date(  this.calendarWindow.selectedDate.getFullYear(),  this.calendarWindow.selectedDate.getMonth(),  this.calendarWindow.selectedDate.getDate() - 7 );
-   
-   this.goToDay( prevWeek );
-}
-
-
-WeekView.prototype.selectBoxForEvent = function( calendarEvent )
-{
-   var EventBoxes = document.getElementsByAttribute( "name", "week-view-event-box-"+calendarEvent.id );
-            
-   for ( j = 0; j < EventBoxes.length; j++ ) 
-   {
-      EventBoxes[j].setAttribute( "eventselected", "true" );
-   }
-}
-
-WeekView.prototype.getVisibleEvent = function( calendarEvent )
-{
-   eventBox = document.getElementById( "week-view-event-box-"+calendarEvent.id );
-   if ( eventBox ) 
-   {
-      return eventBox;
-   }
-   else
-      return false;
-
-}
-
-
-/** PRIVATE
-*
-*  Mark today as selected, also unmark the old today if there was one.
-*/
-
-WeekView.prototype.hiliteTodaysDate = function( )
-{
-   //clear out the old today boxes.
-   var OldTodayArray = document.getElementsByAttribute( "today", "true" );
-   for ( i = 0; i < OldTodayArray.length; i++ ) 
-   {
-      OldTodayArray[i].removeAttribute( "today" );
-   }
-                                                      
-
-   // get the events for the day and loop through them
-   var FirstDay = new Date( gHeaderDateItemArray[1].getAttribute( "date" ) );
-   var LastDay  = new Date( gHeaderDateItemArray[7].getAttribute( "date" ) );
-   LastDay.setHours( 23 );
-   LastDay.setMinutes( 59 );
-   LastDay.setSeconds( 59 );
-   var Today = new Date();
-
-   if ( Today.getTime() > FirstDay.getTime() && Today.getTime() < LastDay.getTime() ) 
-   {
-      //today is visible, get the day index for today
-      for ( dayIndex = 1; dayIndex <= 7; ++dayIndex )
-      {
-         ThisDate = new Date( gHeaderDateItemArray[dayIndex].getAttribute( "date" ) );
-         if ( ThisDate.getFullYear() == Today.getFullYear()
-                && ThisDate.getMonth() == Today.getMonth()
-                && ThisDate.getDay()   == Today.getDay() ) 
-         {
-            break;
-         }
-      }
-      //dayIndex now contains the box numbers that we need.
-      for ( i = 0; i < 24; i++ ) 
-      {
-         document.getElementById( "week-tree-day-"+(dayIndex-1)+"-item-"+i ).setAttribute( "today", "true" );
-      }
-
-   }
-}
-
-
-/** PUBLIC
-*
-*   clear the selected event by taking off the selected attribute.
-*/
-WeekView.prototype.clearSelectedEvent = function( )
-{
-   //Event = gCalendarWindow.getSelectedEvent();
-   
-   var ArrayOfBoxes = document.getElementsByAttribute( "eventselected", "true" );
-
-   for( i = 0; i < ArrayOfBoxes.length; i++ )
-   {
-      ArrayOfBoxes[i].removeAttribute( "eventselected" );   
-   }
-}
-
-
-/** PUBLIC
-*
-*   This is called when we are about the make a new event
-*   and we want to know what the default start date should be for the event.
-*/
-
-WeekView.prototype.getNewEventDate = function( )
-{
-   var start = new Date( this.calendarWindow.getSelectedDate() );
-   
-   start.setHours( start.getHours() );
-   start.setMinutes( Math.ceil( start.getMinutes() / 5 ) * 5 );
-   start.setSeconds( 0 );
-   
-   return start; 
-}
-
-
-/** PUBLIC
-*
-*  Unmark the selected date if there is one.
-*/
-
-WeekView.prototype.clearSelectedDate = function( )
-{
-   if ( this.selectedBox ) 
-   {
-      this.selectedBox.removeAttribute( "eventselected" );
-      this.selectedBox = null;
-   }
-}
-
-
-WeekView.prototype.getWeekNumber = function()
-{
-	var today = new Date( this.calendarWindow.getSelectedDate() );
-	Year = today.getYear() + 1900;
-	Month = today.getMonth();
-	Day = today.getDate();
-   now = new Date(Year,Month,Day+1);
-	now = now.getTime();
-   var Firstday = new Date( this.calendarWindow.getSelectedDate() );
-	Firstday.setYear(Year);
-	Firstday.setMonth(0);
-	Firstday.setDate(1);
-	then = new Date(Year,0,1);
-   then = then.getTime();
-	var Compensation = Firstday.getDay();
-	if (Compensation > 3) Compensation -= 4;
-	else Compensation += 3;
-	NumberOfWeek =  Math.round((((now-then)/86400000)+Compensation)/7);
-	return NumberOfWeek;
-}
diff --git a/calendar/resources/content/calendarWindow.js b/calendar/resources/content/calendarWindow.js
index 5aaacc9210b..e09b60f4a3e 100644
--- a/calendar/resources/content/calendarWindow.js
+++ b/calendar/resources/content/calendarWindow.js
@@ -358,7 +358,9 @@ CalendarWindow.prototype.setSelectedDate = function calWin_setSelectedDate( date
    
    this.selectedDate = new Date( date );
 
-   if( document.getElementById( "event-filter-menulist" ).selectedItem.value == "current" )
+   /* on some machines, we need to check for .selectedItem first */
+   if( document.getElementById( "event-filter-menulist" ).selectedItem &&
+       document.getElementById( "event-filter-menulist" ).selectedItem.value == "current" )
    {
       //redraw the top tree
       setTimeout( "refreshEventTree( getAndSetEventTable() );", 150 );
@@ -463,7 +465,7 @@ CalendarWindow.prototype.getLowestElementNotInArray = function calWin_getLowestE
    //CAUTION: Watch the scope here.  This function is called from inside a nested for loop.
    //You can't have the index variable named anything that is used in those for loops.
 
-   for ( Mike = 0; Mike < InputArray.length; Mike++ ) 
+   for ( var Mike = 0; Mike < InputArray.length; Mike++ ) 
    {
       
       if ( InputArray[Mike] > Temp ) 
diff --git a/calendar/resources/content/clipboard.js b/calendar/resources/content/clipboard.js
index 4af92b392b1..888bc66166e 100644
--- a/calendar/resources/content/clipboard.js
+++ b/calendar/resources/content/clipboard.js
@@ -148,7 +148,7 @@ function copyToClipboard( calendarEventArray )
 {  
    if( !calendarEventArray)
    {
-      var calendarEventArray = new Array();
+      var calendarEventArray = new Array( 0 );
       calendarEventArray = gCalendarWindow.EventSelection.selectedEvents;
    }
 
@@ -195,6 +195,7 @@ function copyToClipboard( calendarEventArray )
          return true;         
       }
    }
+   return true;
 }
 
 
@@ -233,6 +234,8 @@ function pasteFromClipboard()
 	 //DEBUG alert("clipboard type: " + flavour.value);
     var calendarEventArray;
     var startDate;
+    var endDateTime;
+    var MinutesToAddOn;
 
 	 switch (flavour.value) {
 	 case "text/calendar":
@@ -241,9 +244,9 @@ function pasteFromClipboard()
             
             //change the date of all the events to now
             startDate = gCalendarWindow.currentView.getNewEventDate();
-            var MinutesToAddOn = getIntPref(gCalendarWindow.calendarPreferences.calendarPref, "event.defaultlength", 60 );
+            MinutesToAddOn = getIntPref(gCalendarWindow.calendarPreferences.calendarPref, "event.defaultlength", 60 );
    
-            var endDateTime = startDate.getTime() + ( 1000 * 60 * MinutesToAddOn );
+            endDateTime = startDate.getTime() + ( 1000 * 60 * MinutesToAddOn );
    
             for( var i = 0; i < calendarEventArray.length; i++ )
             {
@@ -266,11 +269,11 @@ function pasteFromClipboard()
                calendarEventArray = parseIcalData( data );
                //change the date of all the events to now
                startDate = gCalendarWindow.currentView.getNewEventDate();
-               var MinutesToAddOn = getIntPref(gCalendarWindow.calendarPreferences.calendarPref, "event.defaultlength", 60 );
+               MinutesToAddOn = getIntPref(gCalendarWindow.calendarPreferences.calendarPref, "event.defaultlength", 60 );
       
-               var endDateTime = startDate.getTime() + ( 1000 * 60 * MinutesToAddOn );
+               endDateTime = startDate.getTime() + ( 1000 * 60 * MinutesToAddOn );
       
-               for( var i = 0; i < calendarEventArray.length; i++ )
+               for( i = 0; i < calendarEventArray.length; i++ )
                {
                   calendarEventArray[i].start.setTime( startDate );
                   calendarEventArray[i].end.setTime( endDateTime );
diff --git a/calendar/resources/content/contactsSelectAddressesDialog.js b/calendar/resources/content/contactsSelectAddressesDialog.js
index 1d85d5b5e9c..e69de29bb2d 100644
--- a/calendar/resources/content/contactsSelectAddressesDialog.js
+++ b/calendar/resources/content/contactsSelectAddressesDialog.js
@@ -1,1748 +0,0 @@
-/* INSERT OPEN OEONE LICENSE */
-
-
-/***** contactsSelectAddresses
-* AUTHORS
-*   Mark Wood
-*
-* REQUIRED INCLUDES
-*
-* NOTES
-*   Code for the 'Select Addresses' dialog called from 
-*   an email compose dialog
-*  
-* IMPLEMENTATION NOTES 
-*
-**********
-*/
-
-
-/** Dialog elements */
-const kADDRESS_BOOK_MENU_LIST = "addressBookList";
-const kADDRESS_BOOK_MENU_POPUP = "addressBookList-menupopup";
-const kCONTACT_CARDS_TREE = "abResultsTree";
-const kMAIL_TO_COMMAND_ID_TO = "addToAddress";
-const kMAIL_TO_COMMAND_ID_CC = "addCcAddress";
-const kMAIL_TO_COMMAND_ID_BCC = "addBccAddress";
-const kREMOVE_ADDRESS_COMMAND_ID = "removeAddress";
-const kRECIPIENT_LIST_TREE = "addressBucket";
-const kRECIPIENT_LIST_TREE_CHILDREN = "bucketBody";
-const kRECIPIENT_LIST_CELL_ATTRIBUTE_ADDRESS_PREFIX = "addressPrefix";
-const kRECIPIENT_LIST_CELL_ATTRIBUTE_EMAIL = "email";
-
-/** Event dialog elements */
-const kINVITE_COMMAND_ID = "addToInviteList";
-const kINVITE_REMOVE_COMMAND_ID = "removeFromInviteList";
-const kINVITE_LIST_CELL_ATTRIBUTE_CARD_ID = "contactId";
-const kINVITE_LIST_ITEM_ATTRIBUTE_CARD_ID = "contactId";
-
-/** Address prefixes */
-const kADDRESS_PREFIX_TO = "to";
-const kADDRESS_PREFIX_CC = "cc";
-const kADDRESS_PREFIX_BCC = "bcc";
-
-/** Global instance of Contact card tree */
-var gContactsTree;
-
-/** Global instance of Contacts Datasource */
-var gContactsDataSource;
-
-/** Command arrays */
-var gMailToCommandsArray;
-var gRemoveCommandsArray;
-var gInviteCommandsArray;
-var gInviteRemoveCommandsArray;
-
-/** Global instance of RDF service */
-var gRdf = Components.classes[ "@mozilla.org/rdf/rdf-service;1" ].getService( Components.interfaces.nsIRDFService );
-var gHeaderParser = Components.classes[ "@mozilla.org/messenger/headerparser;1" ].getService( Components.interfaces.nsIMsgHeaderParser );
-
-/** Global refs to original composer window */
-var gMsgCompFields = 0;
-var gComposeWindow;
-var gTopWindow;
-
-/** Array of nsIAbCards for attaching to event */
-var gEventCardArray = new Array();
-
-
-/***** onLoadSelectAddresses
-* METHODS
-*   onLoadSelectAddresses:  initializes the select addresses dialog
-*
-* PARAMETERS
-*   None
-*
-* RETURN VALUE
-*   None
-*
-* NOTES
-**********
-*/
-function onLoadSelectAddresses()
-{
-    // Set the dialog buttons
-    setupOkCancelButtons( selectAddressesOkButton, 0 );
-
-    // Setup the the address book chooser
-    setupAddressBookChooser();
-
-    // Setup the commands
-    initCommands();
-
-    if( window.arguments && window.arguments[ 0 ] )
-    {
-        // Get the Contacts Data Source
-        gContactsDataSource = window.arguments[ 0 ].contactsDataSource;
-
-        // Get the uri of the first address book in the chooser
-        var bookUri = document.getElementById( kADDRESS_BOOK_MENU_LIST ).getAttribute( "value" );
-        
-        // Generate the cardset for the specified book
-        //updateCardSet( gContactsDataSource, bookUri );
-        updateSelectAddressesCardSet( gContactsDataSource, bookUri )
-
-        // Get the compose window and associated elements
-        var toAddress = "", ccAddress = "", bccAddress = "";
-
-        gComposeWindow = window.arguments[0].composeWindow;
-        gMsgCompFields = window.arguments[ 0 ].msgCompFields;
-        gTopWindow = window.arguments[ 0 ].topWindow;
-        toAddress = window.arguments[ 0 ].toAddress;
-        ccAddress = window.arguments[ 0 ].ccAddress;
-        bccAddress = window.arguments[ 0 ].bccAddress;
-
-        // Add any existing addresses to the recipient list
-        addAddressFromComposeWindow( toAddress, DTD_toPrefix, kADDRESS_PREFIX_TO );
-        addAddressFromComposeWindow( ccAddress, DTD_ccPrefix, kADDRESS_PREFIX_CC );
-        addAddressFromComposeWindow( bccAddress, DTD_bccPrefix, kADDRESS_PREFIX_BCC );
-    }
-}   // End function onLoadSelectAddresses
-
-
-
-/***** addAddressFromComposeWindow
-* METHODS
-*   addAddressFromComposeWindow:    adds existing addresses from the
-*                                   compose window to the list of
-*                                   recipients
-*
-* PARAMETERS
-*   addresses:  comma-separated list of email addresses
-*   displayPrefix:  prefix to display with addresses
-*   addressPrefix:  mailto prefix to use with addresses
-*
-* RETURN VALUE
-*   None
-*
-* NOTES
-**********
-*/
-function addAddressFromComposeWindow( addresses, displayPrefix, addressPrefix )
-{
-    if( addresses.length > 0 )
-    {
-        var addressArray = addresses.split(",");
-    
-        for( var index = 0; index < addressArray.length; index++ )
-        {
-            // remove leading spaces
-            while ( addressArray[index][0] == " " )
-            {
-                addressArray[ index ] = addressArray[ index ].substring( 1, addressArray[ index ].length );
-            }
-            
-            addAddressIntoBucket( addressPrefix, ( displayPrefix + addressArray[ index ] ), addressArray[ index ] );
-        }
-    }
-}   // End function addAddressFromComposeWindow
-
-
-
-/***** setupAddressBookChooser
-* METHODS
-*   setupAddressBookChooser:    initializes the address book chooser
-*                               by selecting the first address book
-*                               in the list
-*
-* PARAMETERS
-*   None
-*
-* RETURN VALUE
-*   None
-*
-* NOTES
-**********
-*/
-function setupAddressBookChooser()
-{
-    // Select the first item in the menulist
-	var addressBookChooser = document.getElementById( kADDRESS_BOOK_MENU_LIST );
-    
-	if( addressBookChooser )
-	{
-        // Default to the first valid addressbook when none is
-        // selected. (the 0th is an empty/invalid entry)
-		var menupopup = document.getElementById( kADDRESS_BOOK_MENU_POPUP );
-        addressBookChooser.label = menupopup.childNodes[ 1 ].getAttribute( "label" );
-        addressBookChooser.value = menupopup.childNodes[ 1 ].getAttribute( "value" );
-	}
-}   // End function setupAddressBookChooser
-
-
-
-/***** onChooseAddressBook
-* METHODS
-*   onChooseAddressBook:    called when an address book is selected 
-*                           from the address book chooser
-*
-* PARAMETERS
-*   addressBookMenuList:    menulist item containing address book ids
-*
-* RETURN VALUE
-*   None
-*
-* NOTES
-**********
-*/
-function onChooseAddressBook( addressBookListMenuList )
-{
-    // Get the uri of the selected address book
-    var bookUri = addressBookListMenuList.getAttribute( "value" );
-
-    // Generate the cardset for the specified book
-    //updateCardSet( gContactsDataSource, bookUri );
-    updateSelectAddressesCardSet( gContactsDataSource, bookUri )
-
-    // Update the commands
-    updateCommands( gMailToCommandsArray, true );
-}   // End function onChooseAddressBook
-
-
-
-/***** updateCardSet
-* METHODS
-*   updateCardSet:  updates the current cardset for the specified
-*                   address book uri
-*
-* PARAMETERS
-*   dataSource: instance of Contacts datasource
-*   bookUri:    uri of specified address book
-*
-* RETURN VALUE
-*   None
-*
-* NOTES
-**********
-*/
-function updateCardSet( dataSource, bookUri )
-{
-    // Get the card set for the selected address book
-    var targetBook = dataSource.makeAddressBook( bookUri );
-    var cardSet = dataSource.makeCardSet( "GeneratedName", "ascending" );
-    cardSet.initWithAddressBookUri( targetBook.getBookUri() );
-    
-    // Setup the tree displaying the contacts for the selected address book
-    //gContactsTree = new ContactsTree( cardSet );
-    return cardSet;
-}   // End function updateCardSet
-
-function updateSelectAddressesCardSet( dataSource, bookUri )
-{
-    var cardSet = updateCardSet( dataSource, bookUri );
-    gContactsTree = new ContactsTree( cardSet );
-}
-
-
-function updateEventCardSet( dataSource, bookUri )
-{
-    var cardSet = updateCardSet( dataSource, bookUri );
-    gContactsTree = new EventContactsTree( cardSet );
-}
-
-
-
-/***** ContactsTree
-* METHODS
-*   ContactsTree:   definition for tree used to display contact cards
-*
-* PARAMETERS
-*   cardSet:    CardSet object containing cards for selected address book   
-*
-* RETURN VALUE
-*   None
-*
-* NOTES
-**********
-*/
-function ContactsTree( cardSet )
-{
-    this.cardSet = cardSet;
-    
-    this.resultsTree = document.getElementById( kCONTACT_CARDS_TREE );
-    this.resultsTree.treeBoxObject.view = this;
-    this.resultsTree.contactsTree = this;
-
-    this.atomRowEnabled = makeAtom( "enabled" );
-    this.atomRowDisabled = makeAtom( "disabled" );
-}   // End ContactsTree definition
-
-
-/***** ContactsTree
-* METHODS
-*   Method definition for ContactsTree object
-*
-* PARAMETERS
-*   None
-*
-* RETURN VALUE
-*   None
-*
-* NOTES
-**********
-*/
-ContactsTree.prototype = 
-{
-    // TREE Functions
-    mTree: null,
-    mSelection: null,
-
-    get rowCount() 
-    { 
-        return this.cardSet.cardList.length; 
-    },
-
-    get selection() { return this.mSelection; },
-
-    set selection(aSelection) { this.mSelection = aSelection; },
-    setTree: function(aTree) { this.mTree = aTree; },
-    getCellText: function(aRow, aColId) 
-    { 
-        var card = this.cardSet.cardList[ aRow ];
-
-        if( card )
-        {
-            if( aColId == "PrimaryEmail" && !card.isMailList() )
-            {
-                if( card.getCardValue( aColId ).length == 0 )
-                {
-                    return DTD_noEmailMessage;
-                }
-
-                else
-                {
-                    return card.getCardValue( aColId );
-                }
-            }
-
-            else
-            {
-                return card.getCardValue( aColId );
-            }
-        }
-
-        else
-        {
-            return "";
-        }
-    },
-    
-    getRowProperties: function(aIndex, aProperties)
-    {
-        var card = this.cardSet.cardList[ aIndex ];
-         
-        if( !card.isMailList() )
-        {
-            if( card.getCardValue( "PrimaryEmail" ) == "" )
-            {
-                aProperties.AppendElement( this.atomRowDisabled  );
-            }
-            else
-            {
-                aProperties.AppendElement( this.atomRowEnabled  );
-            }
-        }
-    },
-
-    getCellProperties: function(aRow, aColId, aProperties) 
-    {
-        var card = this.cardSet.cardList[ aRow ];
-        
-        if( !card.isMailList() )
-        {
-            if( card.getCardValue( "PrimaryEmail" ) == "" )
-            {
-                aProperties.AppendElement( this.atomRowDisabled  );
-            }
-            else
-            {
-                aProperties.AppendElement( this.atomRowEnabled  );
-            }
-        }
-    },
-    
-    getColumnProperties: function(aColId, aColElt, aProperties) {},
-    getParentIndex: function(aRowIndex) { return -1; },
-    //hasNextSibling: function(aRowIndex, aAfterIndex) { },
-    getLevel: function(aIndex) { return 0; },
-    getImageSrc: function(aRow, aColId) {},
-    //getProgressMode: function(aRow, aColId) {},
-    //getCellValue: function(aRow, aColId) {},
-    isContainer: function(aIndex) { return false; },
-    //isContainerOpen: function(aIndex) {},
-    //isContainerEmpty: function(aIndex) {},
-    isSeparator: function(aIndex) { return false; },
-    isSorted: function() {},
-    //toggleOpenState: function(aIndex) {},
-    
-    selectionChanged: function() 
-    {
-    },
-    
-    
-    cycleHeader: function(aColId, aElt) {},
-    //cycleCell: function(aRow, aColId) {},
-    //isEditable: function(aRow, aColId) {},
-    setCellText: function(aRow, aColId, aValue) {},
-    //performAction: function(aAction) {},
-    //performActionOnRow: function(aAction, aRow) {},
-    //performActionOnCell: function(aAction, aRow, aColId) {},
-    
-    
-    // extra utility stuff
-    
-    setSelection : function( selList )
-    {
-        this.selection.clearSelection();
-        
-        for( var i = 0; i < selList.length; ++i )
-        {
-            this.selection.rangedSelect( selList[i], selList[i], true );
-        }
-    },
-    
-    getSelectedCardIndexes : function(  )
-    {
-        var selectedCardIndexes = new Array( this.selection.count );
-        
-        var count = this.selection.getRangeCount();
-        
-        var current = 0;
-        
-        var start = new Object();
-        var end = new Object();
-        
-        for( var i = 0; i < count; i++) 
-        {
-            this.selection.getRangeAt(i,start,end);
-            
-            for( var j = start.value; j <= end.value; j++ ) 
-            {
-                selectedCardIndexes[current] = j;
-                current++;
-            }
-        }
-        
-        return selectedCardIndexes;
-    },
-        
-    onMouseDown : function( event )
-    {
-        // we only care about button 0 (left click) events
-        if (event.button != 0) return;
-        
-        // all we need to worry about here is double clicks
-        // and column header clicks.
-        //
-        // we get in here for clicks on the "treecol" (headers)
-        // and the "scrollbarbutton" (scrollbar buttons)
-        // we don't want those events to cause a "double click"
-        
-        var target = event.originalTarget;
-        
-        if (target.localName == "treecol") 
-        {
-            var columnSortField = target.getAttribute( "sort-field" );
-            sortAndUpdateIndicators( columnSortField );
-        }
-        else if (target.localName == "treechildren") 
-        {
-            var row = new Object();
-            
-            this.recipientTreeElement.treeBoxObject.getCellAt( event.clientX, event.clientY, row, {}, {} );
-            
-            if( row.value != -1 && row.value < this.recipientTreeElement.view.rowCount )
-            {
-                var card = this.cardSet.cardList[ row.value ];
-                
-                if( card.getPrimaryEmail() != "" )
-                {
-                    card._checked = !card._checked; 
-                    this.recipientTreeElement.treeBoxObject.invalidateRow( row.value ); 
-                }
-            }
-        }
-    },
-
-    onClick: function( event )
-    {
-        // Get the target
-        var target = event.originalTarget;
-
-        if( target.localName == "treechildren" ) 
-        {
-            // Get the email address of the card just clicked
-            var row = new Object();
-            this.resultsTree.treeBoxObject.getCellAt( event.clientX, event.clientY, row, {}, {} );
-
-            if( row.value != -1 )
-            {
-                var card = this.cardSet.cardList[ row.value ];
- 
-                // If the card has no email address, remove it from the selection
-                if( card && ( !card.isMailList() ) && ( card.getCardValue( "PrimaryEmail" ) == "" ) )
-                {
-                    this.selection.clearRange( row.value, row.value );
-                    return;
-                }
-    
-                if( this.getSelectedCardIndexes().length > 0 )
-                {
-                    updateCommands( gMailToCommandsArray, false );
-                }
-        
-                else
-                {
-                    updateCommands( gMailToCommandsArray, true );
-                }
-            }
-        }
-    },
-
-    // If an address is double clicked, add it to the list as a 'To' address
-    onDblClick: function( event )
-    {
-        addSelectedAddressesIntoBucket( DTD_toPrefix, kADDRESS_PREFIX_TO );
-    },
-
-};
-
-
-function makeAtom( aVal )
-{
-    var svc = Components.classes[ "@mozilla.org/atom-service;1" ].getService( Components.interfaces.nsIAtomService );
-    return svc.getAtom(aVal);
-}
-
-
-/***** initCommands
-* METHODS
-*   initCommands:   calls all required command initializers
-*
-* PARAMETERS
-*   None
-*
-* RETURN VALUE
-*   None
-*
-* NOTES
-**********
-*/
-function initCommands()
-{
-    initMailToCommands();
-    initRemoveCommands();
-}   // End function initCommands
-
-
-/***** initMailToCommands
-* METHODS
-*   initMailToCommands: initializes the commands associated with
-*                       selecting existing contacts  
-*
-* PARAMETERS
-*   None
-*
-* RETURN VALUE
-*   None
-*
-* NOTES
-**********
-*/
-function initMailToCommands()
-{
-    gMailToCommandsArray = new Array( kMAIL_TO_COMMAND_ID_TO, kMAIL_TO_COMMAND_ID_CC, kMAIL_TO_COMMAND_ID_BCC );
-}   // End function initMailToCommands
-
-
-/***** initRemoveCommands
-* METHODS
-*   initRemoveCommands: initializes the commands associated with
-*                       selecting recipients  
-*
-* PARAMETERS
-*   None
-*
-* RETURN VALUE
-*   None
-*
-* NOTES
-**********
-*/
-function initRemoveCommands()
-{
-    gRemoveCommandsArray = new Array( kREMOVE_ADDRESS_COMMAND_ID );
-}   // End function initRemoveCommands
-
-
-/***** updateCommands
-* METHODS
-*   updateCommands: updates specified commands associated with 
-*                   specified status  
-*
-* PARAMETERS
-*   commandsArray:  Array containing command ids
-*   disableStatus:  true to disable commands, false to enable
-*
-* RETURN VALUE
-*   None
-*
-* NOTES
-**********
-*/
-function updateCommands( commandsArray, disableStatus )
-{
-    if( commandsArray )
-    {
-        var element;
-
-        for( var index = 0; index < commandsArray.length; index++ )
-        {
-            element = document.getElementById( commandsArray[ index ] );
-    
-            if( element )
-            {
-                element.setAttribute( "disabled", disableStatus );
-            }
-        }
-    }
-}   // End function updateCommands
-
-
-/***** addSelectedAddressesIntoBucket
-* METHODS
-*   addSelectedAddressesIntoBucket: adds the selected addresses to the 
-*                                   recipient list using the specified
-*                                   prefix  
-*
-* PARAMETERS
-*   displayPrefix:  display prefix to use with selected addresses  
-*   addressPrefix:  address prefix to use with selected addresses
-*
-* RETURN VALUE
-*   None
-*
-* NOTES
-**********
-*/
-function addSelectedAddressesIntoBucket( displayPrefix, addressPrefix )
-{
-    addSelectedCardsToBucket( displayPrefix, addressPrefix );
-
-    // Clear selection and update mailto commands
-    gContactsTree.resultsTree.treeBoxObject.selection.clearSelection();
-    updateCommands( gMailToCommandsArray, true );
-}   // End function addSelectedAddressesIntoBucket
-
-
-function addSelectedCardsToBucket( displayPrefix, addressPrefix )
-{
-    var cards = getSelectedCards();
-    var count = cards.length;
-    
-    for( var i = 0; i < count; i++ )
-    {
-        addCardIntoBucket( displayPrefix, addressPrefix, cards[ i ] );
-    }
-}
-
-
-function addSelectedInviteCardsToBucket( displayPrefix, addressPrefix )
-{
-    var cards = getSelectedCards();
-    var count = cards.length;
-    var cardId;
-    
-    for( var i = 0; i < count; i++ )
-    {
-        var address = displayPrefix + getAddressFromCard( cards[ i ] );
-        
-        if( !cards[ i ].isMailList )
-        {
-            // Add the card to the display
-            cardId = generateCardId( cards[ i ] );
-            addInviteAddressIntoBucket( address, cardId );
-        
-            // Add to the event card array as well
-            gEventCardArray[ cardId ] = cards[ i ];
-        }
-    }
-}
-
-
-/***** generateCardId
-* METHODS
-*   generateCardId: returns a unique card id using the key of the
-*                   specified nsIAbCard and its associated 
-*                   address book id 
-*
-* PARAMETERS
-*   card:   instance of nsIAbCard
-*   [ bookId ]: uri of associated address book; uses current book if none specified 
-*
-* RETURN VALUE
-*   String: unique card identifier
-*
-* NOTES
-**********
-*/
-function generateCardId( card, bookId )
-{
-    var cardId;
-
-    // If no bookId specified, get the current address book uri
-    if( !bookId )
-    {
-        bookId = document.getElementById( kADDRESS_BOOK_MENU_LIST ).getAttribute( "value" );
-    }
-
-    cardId = bookId + "/Card" + card.key;
-
-    return cardId;        
-}   // End function generateCardId
-
-
-
-/***** addCardIntoBucket
-* METHODS
-*   addCardIntoBucket:  adds the specified card to the recipient
-*                       list with the specified prefix  
-*
-* PARAMETERS
-*   displayPrefix:  address prefix to display
-*   addressPrefix:  address prefix to use 
-*   card:   nsIAbCard to add to recipient list  
-*
-* RETURN VALUE
-*   None
-*
-* NOTES
-**********
-*/
-function addCardIntoBucket( displayPrefix, addressPrefix, card )
-{
-    var address = displayPrefix + getAddressFromCard( card );
-
-    if( card.isMailList )
-    {
-        addAddressIntoBucket( addressPrefix, address, getAddressFromCard( card ) );
-    }
-
-    else
-    {
-        addAddressIntoBucket( addressPrefix, address, card.primaryEmail );
-    }
-}   // End function addCardIntoBucket
-
-
-function getAddressFromCard( card )
-{
-    var email;
-    
-    if( card.isMailList ) 
-    {
-        var directory = getDirectoryFromURI(card.mailListURI);
-
-        if( directory.description )
-        {
-            email = directory.description;
-        }
-    
-        else
-        {
-            email = card.displayName;
-        }
-    }
-
-    else
-    {
-        email = card.primaryEmail;
-    }
-    
-    email = gHeaderParser.makeFullAddressWString( card.displayName, email );
-    return email;
-}
-   
-function getDirectoryFromURI( uri )
-{
-    var directory = gRdf.GetResource( uri ).QueryInterface( Components.interfaces.nsIAbDirectory );
-    return directory;
-}
-
-/***** getSelectedCards
-* METHODS
-*   getSelectedCards:   returns an array of selected address cards  
-*
-* PARAMETERS
-*   None
-*
-* RETURN VALUE
-*   Array containing address cards
-*
-* NOTES
-**********
-*/
-function getSelectedCards()
-{
-    var cards = new Array();
-    var selectedIndexes = gContactsTree.getSelectedCardIndexes();
-
-    if( selectedIndexes.length > 0 )
-    {
-        for( var index = 0; index < selectedIndexes.length; index++ )
-        {
-            cards.push( gContactsTree.cardSet.cardList[ selectedIndexes[ index ] ].abCard );
-        }
-    }
-
-    return cards;
-}   // End function getSelectedCards
-
-
-/***** addAddressIntoBucket
-* METHODS
-*   addAddressIntoBucket:   add the address to the recipient
-*                           display  
-*
-* PARAMETERS
-*   addressPrefix:  address prefix to use 
-*   displayAddress: address that gets displayed in recipient list
-*   email:  email address to use
-*
-* RETURN VALUE
-*   None
-*
-* NOTES
-**********
-*/
-function addAddressIntoBucket( addressPrefix, displayAddress, email )
-{
-    var body = document.getElementById( kRECIPIENT_LIST_TREE_CHILDREN );
-    
-    var item = document.createElement( "treeitem" );
-    var row = document.createElement( "treerow" );
-    var cell = document.createElement( "treecell" );
-
-    cell.setAttribute( "label", displayAddress );
-    cell.setAttribute( kRECIPIENT_LIST_CELL_ATTRIBUTE_EMAIL, email );
-    cell.setAttribute( kRECIPIENT_LIST_CELL_ATTRIBUTE_ADDRESS_PREFIX, addressPrefix );
-    
-    row.appendChild( cell );
-    item.appendChild( row );
-    body.appendChild( item );
-}   // End function addAddressIntoBucket
-
-
-/***** addInviteAddressIntoBucket
-* METHODS
-*   addInviteAddressIntoBucket: add the address to the invite list
-*
-* PARAMETERS
-*   displayAddress: address that gets displayed in invite list
-*   cardId: unique identifier of associated card in gEventCardArray
-*
-* RETURN VALUE
-*   None
-*
-* NOTES
-**********
-*/
-function addInviteAddressIntoBucket( displayAddress, cardId )
-{
-    var body = document.getElementById( kRECIPIENT_LIST_TREE_CHILDREN );
-    
-    var item = document.createElement( "treeitem" );
-    var row = document.createElement( "treerow" );
-    var cell = document.createElement( "treecell" );
-
-    cell.setAttribute( "label", displayAddress );
-    item.setAttribute( kINVITE_LIST_ITEM_ATTRIBUTE_CARD_ID, cardId );
-    
-    row.appendChild( cell );
-    item.appendChild( row );
-    body.appendChild( item );
-}   // End function addInviteAddressIntoBucket
-
-
-/***** selectRecipient
-* METHODS
-*   selectRecipient:    called when a recipient is selected or
-*                       unselected; used to update appropriate 
-*                       commands
-*
-* PARAMETERS
-*   tree:   XUL tree containing recipients
-*
-* RETURN VALUE
-*   None
-*
-* NOTES
-**********
-*/
-function selectRecipient( tree )
-{
-    var selectedItems = getSelectedRecipients( tree );
-   
-    if( selectedItems.length > 0 )
-    {
-        updateCommands( gRemoveCommandsArray, false );
-    }
-
-    else
-    {
-        updateCommands( gRemoveCommandsArray, true );
-    }
-}   // End function selectRecipient
-
-
-function getSelectedRecipients( tree )
-{
-    var selectedItems = new Array();
-                                      
-    if( tree && tree.treeBoxObject && tree.treeBoxObject.selection )
-    {
-        var rangeCount = tree.treeBoxObject.selection.getRangeCount();
-    
-        for( var i = 0; i < rangeCount; i++ )
-        {
-            var startIndex = new Object();
-            var endIndex = new Object();
-    
-            tree.treeBoxObject.selection.getRangeAt( i, startIndex, endIndex );
-    
-            for( var j = startIndex.value; j <= endIndex.value; j++ )
-            {
-                selectedItems.push( tree.treeBoxObject.view.getItemAtIndex( j ) );
-            }
-        }
-    }
-
-    return selectedItems;
-}
-
-
-/***** removeSelectedFromBucket
-* METHODS
-*   removeSelectedFromBucket:   removes selected items from the
-*                               specified tree    
-*
-* PARAMETERS
-*   bucketTree: XUL tree containing selected items
-*
-* RETURN VALUE
-*   None
-*
-* NOTES
-**********
-*/
-function removeSelectedFromBucket( bucketTree )
-{
-    if( bucketTree )
-    {
-        var body = document.getElementById( kRECIPIENT_LIST_TREE_CHILDREN );
-        var selection = bucketTree.view.selection;
-        var rangeCount = selection.getRangeCount();
-        
-        for( i = rangeCount-1; i >= 0; --i )
-        {
-            var start = {}, end = {};
-            selection.getRangeAt( i, start, end );
-
-            for( j = end.value; j >= start.value; --j )
-            {
-                var item = bucketTree.contentView.getItemAtIndex( j );
-                body.removeChild( item );
-            }
-        }
-    }
-}   // End function removeSelectedFromBucket
-
-
-
-/***** removeSelectedFromRecipientBucket
-* METHODS
-*   removeSelectedFromRecipientBucket:  removes selected addresses
-*                                       from recipient list    
-*
-* PARAMETERS
-*   None
-*
-* RETURN VALUE
-*   None
-*
-* NOTES
-**********
-*/
-function removeSelectedFromRecipientBucket()
-{
-    // Remove selected items from recipient list
-    var bucketTree = document.getElementById( kRECIPIENT_LIST_TREE );
-    removeSelectedFromBucket( bucketTree );
-
-    // Disable remove command
-    updateCommands( gRemoveCommandsArray, true );
-}   // End function removeSelectedFromRecipientBucket
-
-
-
-/***** selectAddressesOkButton
-* METHODS
-*   selectAddressesOkButton:    adds the selected recipients to the
-*                               compose window and closes the select
-*                               addresses dialog
-*
-* PARAMETERS
-*   None
-*
-* RETURN VALUE
-*   None
-*
-* NOTES
-**********
-*/
-function selectAddressesOkButton()
-{
-    var body = document.getElementById( kRECIPIENT_LIST_TREE_CHILDREN );
-    var item, row, cell, text, mailPrefix, colon, email;
-    var toAddress = "", ccAddress = "", bccAddress = "", emptyEmail = "";
-    
-    for( var index = 0; index < body.childNodes.length; index++ )
-    {
-        item = body.childNodes[index];
-
-        if( item.childNodes && item.childNodes.length )
-        {
-            row = item.childNodes[ 0 ];
-
-            if( row.childNodes &&  row.childNodes.length )
-            {
-                cell = row.childNodes[0];
-                mailPrefix = cell.getAttribute( kRECIPIENT_LIST_CELL_ATTRIBUTE_ADDRESS_PREFIX );
-                text = cell.getAttribute( "label" );
-                email = cell.getAttribute( kRECIPIENT_LIST_CELL_ATTRIBUTE_EMAIL );
-
-                if( mailPrefix )
-                {
-                    switch( mailPrefix )
-                    {
-                        case kADDRESS_PREFIX_TO:
-                        toAddress += email + ",";
-                        break;
-
-                        case kADDRESS_PREFIX_CC:
-                        ccAddress += email + ",";
-                        break;
-
-                        case kADDRESS_PREFIX_BCC:
-                        bccAddress += email + ",";
-                        break;
-                    }
-                }
-                
-                if(!email)
-                {
-                    if (emptyEmail)
-                    {
-                        emptyEmail +=", ";
-                    }
-                    
-                    emptyEmail += text.substring(prefixTo.length, text.length-2);
-                }
-            }
-        }
-    }
-
-    if(emptyEmail)
-    {
-        var alertText = gAddressBookBundle.getString("emptyEmailCard");
-        alert(alertText + emptyEmail);
-        return false;
-    }
-
-    // Trim any trailing commas from the address lists
-    if( toAddress[ toAddress.length - 1 ] == "," )
-    {
-        toAddress = toAddress.substring( 0, ( toAddress.length - 1 ) );
-    }
-
-    if( ccAddress[ ccAddress.length - 1 ] == "," )
-    {
-        ccAddress = ccAddress.substring( 0, ( ccAddress.length - 1 ) );
-    }
-
-    if( bccAddress[ bccAddress.length - 1 ] == "," )
-    {
-        bccAddress = bccAddress.substring( 0, ( bccAddress.length - 1 ) );
-    }
-
-    // reset the UI in compose window
-    gMsgCompFields.to = toAddress;
-    gMsgCompFields.cc = ccAddress;
-    gMsgCompFields.bcc = bccAddress;
-    gTopWindow.CompFields2Recipients( gMsgCompFields );
-    
-    // Return true to close OE dialog
-    return true;
-}   // End function selectAddressesOkButton
-
-
-
-/***** onLoadEventDialog
-* METHODS
-*   onLoadEventDialog:  initializes the 'Contacts' portion of the
-*                       Calendar Event dialog
-*
-* PARAMETERS
-*   None
-*
-* RETURN VALUE
-*   None
-*
-* NOTES
-**********
-*/
-function onLoadEventDialog()
-{
-    // Get the Contacts Data Source
-    gContactsDataSource = pendialog.getService( "org.penzilla.contacts" ).contactsDataSource;
-
-    // Store any existing attached cards in the event card array
-    initializeContactsArray();
-
-    // Display any existing attached contacts
-    setupAttachedContacts( gEventCardArray );
-
-    // Setup the the address book chooser
-    setupAddressBookChooser();
-
-    // Setup the commands
-    initEventAddressesCommands();
-
-    // Get the uri of the first address book in the chooser
-    var bookUri = document.getElementById( kADDRESS_BOOK_MENU_LIST ).getAttribute( "value" );
-
-    // Generate the cardset for the specified book
-    updateEventCardSet( gContactsDataSource, bookUri );
-}   // End function onLoadEventDialog
-
-
-function getAddressBookDatabase( bookId )
-{
-    var book = Components.classes[ "@mozilla.org/addressbook;1" ].createInstance( Components.interfaces.nsIAddressBook );
-    var bookDatabase = book.getAbDatabaseFromURI( bookId );
-    return bookDatabase;
-}
-
-
-/***** initializeContactsArray
-* METHODS
-*   initializeContactsArray:    initalizes the contacts with any
-*                               existing contacts attached to the
-*                               event  
-*
-* PARAMETERS
-*   None
-*
-* RETURN VALUE
-*   None
-*
-* NOTES
-**********
-*/
-function initializeContactsArray()
-{
-    var contactsArray = gEvent.contactsArray;
-    
-    if( contactsArray )
-    {
-        var bookId;
-        var cardId;
-        var card;
-        var mdbCard;
-
-        for( var i = 0; i < contactsArray.Count(); i++ )
-        {
-            card = contactsArray.QueryElementAt( i, Components.interfaces.nsIAbCard );
-            mdbCard = contactsArray.QueryElementAt( i, Components.interfaces.nsIAbMDBCard );
-            bookId = getBookId( card );
-            cardId = generateCardId( mdbCard, bookId );
-            gEventCardArray[ cardId ] = card;
-        }
-    }
-}   // End function initializeContactsArray
-
-
-
-/***** getBookId
-* METHODS
-*   getBookId:  returns the uri of the containing address book
-*               of the specified card  
-*
-* PARAMETERS
-*   card:   instance of nsIAbCard
-*
-* RETURN VALUE
-*   String: uri of containing address book
-*
-* NOTES
-*   nsIAbCard instances no longer contain a unique key across
-*   address books, only a key within their book.  To figure out
-*   where it belongs, this goes through all the existing books
-*   and determines where the card belongs.  If there is a simpler
-*   way to do this, please implement it.  This is done when displaying
-*   existing attached contacts in an event to get a unique id and avoid
-*   adding duplicates and to remove the correct contact from the array
-*   Mark Wood, July 23, 2002
-**********
-*/
-function getBookId( card )
-{
-    // Go through all the address books until a match is found
-    var addressBookList = gContactsDataSource.getAllAddressBookUris();
-    var bookDatabase;
-    var bookId;
-
-    for( var i = 0; i < addressBookList.length; i++ )
-    {
-        bookDatabase = getAddressBookDatabase( addressBookList[ i ] );
-
-        if( bookDatabase && bookDatabase.containsCard( card ) )
-        {
-            bookId = addressBookList[ i ];
-            break;
-        }
-    }    
-
-    return bookId;
-}   // End function getBookId
-
-
-
-/***** EventContactsTree
-* METHODS
-*   EventContactsTree:   definition for tree used to display contact cards
-*
-* PARAMETERS
-*   cardSet:    CardSet object containing cards for selected address book   
-*
-* RETURN VALUE
-*   None
-*
-* NOTES
-**********
-*/
-function EventContactsTree( cardSet )
-{
-    this.cardSet = cardSet;
-    
-    this.resultsTree = document.getElementById( kCONTACT_CARDS_TREE );
-    this.resultsTree.treeBoxObject.view = this;
-    this.resultsTree.contactsTree = this;
-
-    this.atomRowEnabled = makeAtom( "enabled" );
-    this.atomRowDisabled = makeAtom( "disabled" );
-}   // End EventContactsTree definition
-
-
-/***** EventContactsTree
-* METHODS
-*   Method definition for EventContactsTree object
-*
-* PARAMETERS
-*   None
-*
-* RETURN VALUE
-*   None
-*
-* NOTES
-**********
-*/
-EventContactsTree.prototype = 
-{
-    // TREE Functions
-    mTree: null,
-    mSelection: null,
-
-    get rowCount() 
-    { 
-        return this.cardSet.cardList.length; 
-    },
-
-    get selection() { return this.mSelection; },
-
-    set selection(aSelection) { this.mSelection = aSelection; },
-    setTree: function(aTree) { this.mTree = aTree; },
-    getCellText: function(aRow, aColId) 
-    { 
-        var card = this.cardSet.cardList[ aRow ];
-
-        if( card )
-        {
-            if( aColId == "PrimaryEmail" && !card.isMailList() )
-            {
-                if( card.getCardValue( aColId ).length == 0 )
-                {
-                    return DTD_noEmailMessage;
-                }
-
-                else
-                {
-                    return card.getCardValue( aColId );
-                }
-            }
-
-            else
-            {
-                return card.getCardValue( aColId );
-            }
-        }
-
-        else
-        {
-            return "";
-        }
-    },
-    
-    getRowProperties: function(aIndex, aProperties)
-    {
-        var card = this.cardSet.cardList[ aIndex ];
-         
-        if( !card.isMailList() )
-        {
-            if( card.getCardValue( "PrimaryEmail" ) == "" )
-            {
-                aProperties.AppendElement( this.atomRowDisabled  );
-            }
-            else
-            {
-                aProperties.AppendElement( this.atomRowEnabled  );
-            }
-        }
-    },
-
-    getCellProperties: function(aRow, aColId, aProperties) 
-    {
-        var card = this.cardSet.cardList[ aRow ];
-        
-        if( !card.isMailList() )
-        {
-            if( card.getCardValue( "PrimaryEmail" ) == "" )
-            {
-                aProperties.AppendElement( this.atomRowDisabled  );
-            }
-            else
-            {
-                aProperties.AppendElement( this.atomRowEnabled  );
-            }
-        }
-    },
-    
-    getColumnProperties: function(aColId, aColElt, aProperties) {},
-    getParentIndex: function(aRowIndex) { return -1; },
-    //hasNextSibling: function(aRowIndex, aAfterIndex) { },
-    getLevel: function(aIndex) { return 0; },
-    getImageSrc: function(aRow, aColId) {},
-    //getProgressMode: function(aRow, aColId) {},
-    //getCellValue: function(aRow, aColId) {},
-    isContainer: function(aIndex) { return false; },
-    //isContainerOpen: function(aIndex) {},
-    //isContainerEmpty: function(aIndex) {},
-    isSeparator: function(aIndex) { return false; },
-    isSorted: function() {},
-    //toggleOpenState: function(aIndex) {},
-    
-    selectionChanged: function() 
-    {
-    },
-    
-    
-    cycleHeader: function(aColId, aElt) {},
-    //cycleCell: function(aRow, aColId) {},
-    //isEditable: function(aRow, aColId) {},
-    setCellText: function(aRow, aColId, aValue) {},
-    //performAction: function(aAction) {},
-    //performActionOnRow: function(aAction, aRow) {},
-    //performActionOnCell: function(aAction, aRow, aColId) {},
-    
-    
-    // extra utility stuff
-    
-    setSelection : function( selList )
-    {
-        this.selection.clearSelection();
-        
-        for( var i = 0; i < selList.length; ++i )
-        {
-            this.selection.rangedSelect( selList[i], selList[i], true );
-        }
-    },
-    
-    getSelectedCardIndexes : function(  )
-    {
-        var selectedCardIndexes = new Array( this.selection.count );
-        
-        var count = this.selection.getRangeCount();
-        
-        var current = 0;
-        
-        var start = new Object();
-        var end = new Object();
-        
-        for( var i = 0; i < count; i++) 
-        {
-            this.selection.getRangeAt(i,start,end);
-            
-            for( var j = start.value; j <= end.value; j++ ) 
-            {
-                selectedCardIndexes[current] = j;
-                current++;
-            }
-        }
-        
-        return selectedCardIndexes;
-    },
-        
-    onMouseDown : function( event )
-    {
-        // we only care about button 0 (left click) events
-        if (event.button != 0) return;
-        
-        // all we need to worry about here is double clicks
-        // and column header clicks.
-        //
-        // we get in here for clicks on the "treecol" (headers)
-        // and the "scrollbarbutton" (scrollbar buttons)
-        // we don't want those events to cause a "double click"
-        
-        var target = event.originalTarget;
-        
-        if (target.localName == "treecol") 
-        {
-            var columnSortField = target.getAttribute( "sort-field" );
-            sortAndUpdateIndicators( columnSortField );
-        }
-        else if (target.localName == "treechildren") 
-        {
-            var row = new Object();
-            
-            this.recipientTreeElement.treeBoxObject.getCellAt( event.clientX, event.clientY, row, {}, {} );
-            
-            if( row.value != -1 && row.value < this.recipientTreeElement.view.rowCount )
-            {
-                var card = this.cardSet.cardList[ row.value ];
-                
-                if( card.getPrimaryEmail() != "" )
-                {
-                    card._checked = !card._checked; 
-                    this.recipientTreeElement.treeBoxObject.invalidateRow( row.value ); 
-                }
-            }
-        }
-    },
-
-    onClick: function( event )
-    {
-        // Get the target
-        var target = event.originalTarget;
-
-        if( target.localName == "treechildren" ) 
-        {
-            // Get the email address of the card just clicked
-            var row = new Object();
-            this.resultsTree.treeBoxObject.getCellAt( event.clientX, event.clientY, row, {}, {} );
-
-            if( row.value != -1 )
-            {
-                var card = this.cardSet.cardList[ row.value ];
- 
-                // If the card has no email address, remove it from the selection
-                if( card && ( !card.isMailList() ) && ( card.getCardValue( "PrimaryEmail" ) == "" ) )
-                {
-                    this.selection.clearRange( row.value, row.value );
-                    return;
-                }
-    
-                if( this.getSelectedCardIndexes().length > 0 )
-                {
-                    updateCommands( gInviteCommandsArray, false );
-                }      
-
-                else
-                {
-                    updateCommands( gInviteCommandsArray, true );
-                }
-            }
-        }
-    },
-
-    // If an address is double clicked, add it to the list as a 'To' address
-    onDblClick: function( event )
-    {
-        addSelectedAddressesIntoInviteBucket( '', '' );
-    },
-
-};
-
-
-/***** onChooseAddressBook
-* METHODS
-*   onChooseAddressBook:    called when an address book is selected 
-*                           from the address book chooser
-*
-* PARAMETERS
-*   addressBookMenuList:    menulist item containing address book ids
-*
-* RETURN VALUE
-*   None
-*
-* NOTES
-**********
-*/
-function onChooseAddressBookEventDialog( addressBookListMenuList )
-{
-    // Get the uri of the selected address book
-    var bookUri = addressBookListMenuList.getAttribute( "value" );
-
-    // Generate the cardset for the specified book
-    updateEventCardSet( gContactsDataSource, bookUri )
-
-    // Update the commands
-    updateCommands( gInviteCommandsArray, true );
-}   // End function onChooseAddressBook
-
-
-/***** initEventAddressesCommands
-* METHODS
-*   initEventAddressesCommands: calls all required command initializers
-*
-* PARAMETERS
-*   None
-*
-* RETURN VALUE
-*   None
-*
-* NOTES
-**********
-*/
-function initEventAddressesCommands()
-{
-    initInviteCommands();
-    initRemoveInviteCommands();
-}   // End function initEventAddressesCommands
-
-
-
-/***** initInviteCommands
-* METHODS
-*   initInviteCommands: initializes the commands associated with
-*                       selecting contacts to invite to event
-*
-* PARAMETERS
-*   None
-*
-* RETURN VALUE
-*   None
-*
-* NOTES
-**********
-*/
-function initInviteCommands()
-{
-    gInviteCommandsArray = new Array( kINVITE_COMMAND_ID );
-}   // End function initInviteCommands
-
-
-/***** initRemoveInviteCommands
-* METHODS
-*   initRemoveInviteCommands:   initializes the commands associated 
-*                               with removing contacts from the invite list
-*
-* PARAMETERS
-*   None
-*
-* RETURN VALUE
-*   None
-*
-* NOTES
-**********
-*/
-function initRemoveInviteCommands()
-{
-    gInviteRemoveCommandsArray = new Array( kINVITE_REMOVE_COMMAND_ID );
-}   // End function initRemoveInviteCommands
-
-
-
-/***** selectEventRecipient
-* METHODS
-*   selectEventRecipient:   called when a recipient is selected or
-*                           unselected; used to update appropriate 
-*                           commands
-*
-* PARAMETERS
-*   tree:   XUL tree containing recipients
-*
-* RETURN VALUE
-*   None
-*
-* NOTES
-**********
-*/
-function selectEventRecipient( tree )
-{
-    var selectedItems = getSelectedRecipients( tree );
-   
-    if( selectedItems.length > 0 )
-    {
-        updateCommands( gInviteRemoveCommandsArray, false );
-    }
-
-    else
-    {
-        updateCommands( gInviteRemoveCommandsArray, true );
-    }
-}   // End function selectEventRecipient
-
-
-/***** addSelectedAddressesIntoInviteBucket
-* METHODS
-*   addSelectedAddressesIntoInviteBucket:   adds the selected addresses
-*                                           to the recipient list   
-*
-* PARAMETERS
-*   displayPrefix:  display prefix to use with selected addresses  
-*   addressPrefix:  address prefix to use with selected addresses
-*
-* RETURN VALUE
-*   None
-*
-* NOTES
-**********
-*/
-function addSelectedAddressesIntoInviteBucket( displayPrefix, addressPrefix )
-{
-    // Add the selected cards
-    addSelectedInviteCardsToBucket( displayPrefix, addressPrefix );
-
-    // Clear selection and update mailto commands
-    gContactsTree.resultsTree.treeBoxObject.selection.clearSelection();
-    updateCommands( gInviteCommandsArray, true );
-}   // End function addSelectedAddressesIntoInviteBucket
-
-
-/***** removeSelectedFromInviteBucket
-* METHODS
-*   removeSelectedFromInviteBucket: removes selected addresses from the
-*                                   invite list    
-*
-* PARAMETERS
-*   None
-*
-* RETURN VALUE
-*   None
-*
-* NOTES
-**********
-*/
-function removeSelectedFromInviteBucket()
-{
-    var bucketTree = document.getElementById( kRECIPIENT_LIST_TREE );
-
-    // Remove the items from the event card array
-    removeSelectedFromEventArray( bucketTree );
-
-    // Remove selected items
-    removeSelectedFromBucket( bucketTree );
-
-    // Disable remove command
-    updateCommands( gInviteRemoveCommandsArray, true );
-}   // End function removeSelectedFromInviteBucket
-
-
-
-/***** removeSelectedFromEventArray
-* METHODS
-*   removeSelectedFromEventArray:   removes the selected cards in the
-*                                   invite list from the array of cards
-*                                   to be attached to the event
-*
-* PARAMETERS
-*   None
-*
-* RETURN VALUE
-*   None
-*
-* NOTES
-**********
-*/
-function removeSelectedFromEventArray( bucketTree )
-{
-    if( bucketTree )
-    {
-        var body = document.getElementById( kRECIPIENT_LIST_TREE_CHILDREN );
-        var selection = bucketTree.view.selection;
-        var rangeCount = selection.getRangeCount();
-        
-        for( i = rangeCount-1; i >= 0; --i )
-        {
-            var start = {}, end = {};
-            selection.getRangeAt( i, start, end );
-            var item;
-            var cardId;
-
-            for( j = end.value; j >= start.value; --j )
-            {
-                item = bucketTree.contentView.getItemAtIndex( j );
-                cardId = item.getAttribute( kINVITE_LIST_ITEM_ATTRIBUTE_CARD_ID );
-                gEventCardArray[ cardId ] = null;
-            }
-        }
-    }
-}   // End function removeSelectedFromEventArray
-
-
-
-/***** setupAttachedContacts
-* METHODS
-*   setupAttachedContacts:  display any existing attached contacts
-*                           in the dialog    
-*
-* PARAMETERS
-*   attachedContacts:   array of nsIAbCards
-*
-* RETURN VALUE
-*   None
-*
-* NOTES
-**********
-*/
-function setupAttachedContacts( attachedContacts )
-{
-    var address;
-
-    for( var cardId in attachedContacts )
-    {
-        address = "" + getAddressFromCard( attachedContacts[ cardId ] );    
-        addInviteAddressIntoBucket( address, cardId );
-    }
-}   // End function setupAttachedContacts
diff --git a/calendar/resources/content/datepicker/datepicker.xml b/calendar/resources/content/datepicker/datepicker.xml
index 6a7cd4d53bb..22d539ae867 100644
--- a/calendar/resources/content/datepicker/datepicker.xml
+++ b/calendar/resources/content/datepicker/datepicker.xml
@@ -42,7 +42,7 @@
 				if (val) this.value = val;
 				else this.value = new Date();
             
-            var val = this.getAttribute("ondatepick");
+            val = this.getAttribute("ondatepick");
             dump( "\ncallback is "+val );
 				if (val) this.callback = new Function( val );
             
diff --git a/calendar/resources/content/dayView.js b/calendar/resources/content/dayView.js
index 32645058738..85d4037a9bb 100644
--- a/calendar/resources/content/dayView.js
+++ b/calendar/resources/content/dayView.js
@@ -144,9 +144,9 @@ DayView.prototype.refreshEvents = function dayview_refreshEvents( )
    //make the text node that will contain the text for the all day box.
    var calendarStringBundle = srGetStrBundle("chrome://calendar/locale/calendar.properties");
    
-   HtmlNode = document.createElement( "description" );
+   var HtmlNode = document.createElement( "description" );
    HtmlNode.setAttribute( "class", "all-day-content-box-text-title" );
-   TextNode = document.createTextNode( calendarStringBundle.GetStringFromName( "AllDayEvents" ) );
+   var TextNode = document.createTextNode( calendarStringBundle.GetStringFromName( "AllDayEvents" ) );
    HtmlNode.appendChild( TextNode );
    document.getElementById( "all-day-content-box" ).appendChild( HtmlNode );
       
@@ -327,7 +327,7 @@ DayView.prototype.createEventBox = function dayview_createEventBox( calendarEven
    var topHeight = document.getElementById( "day-tree-item-"+startHour ).boxObject.y - document.getElementById( "day-tree-item-"+startHour ).parentNode.boxObject.y;
    var boxWidth = document.getElementById( "day-tree-item-"+startHour ).boxObject.width;
    
-   var topHeight = eval( topHeight + ( ( startMinutes/60 ) * boxHeight ) );
+   topHeight = eval( topHeight + ( ( startMinutes/60 ) * boxHeight ) );
    topHeight = Math.round( topHeight ) - 2;
    eventBox.setAttribute( "top", topHeight );
    
@@ -429,42 +429,49 @@ DayView.prototype.switchTo = function dayview_switchTo( )
 DayView.prototype.refreshDisplay = function dayview_refreshDisplay( )
 {
    // update the title
+   var dayNamePrev1;
+   var dayNamePrev2;
+
    var dayName = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() );
 	if (this.calendarWindow.getSelectedDate().getDay() < 2)
 	{
-		if (this.calendarWindow.getSelectedDate().getDay() == 0)
+      if (this.calendarWindow.getSelectedDate().getDay() == 0)
 		{
-			var dayNamePrev1 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() + 6 );
-			var dayNamePrev2 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() + 5 );
+			dayNamePrev1 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() + 6 );
+			dayNamePrev2 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() + 5 );
 		}
 		else
 		{
-			var dayNamePrev1 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() - 1 );
-			var dayNamePrev2 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() + 5 );
+			dayNamePrev1 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() - 1 );
+			dayNamePrev2 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() + 5 );
 		}
 	}
 	else
 	{
-		var dayNamePrev1 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() - 1 );
-		var dayNamePrev2 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() - 2 );
+		dayNamePrev1 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() - 1 );
+		dayNamePrev2 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() - 2 );
 	}
-	if (this.calendarWindow.getSelectedDate().getDay() > 4)
+	
+   var dayNameNext1;
+   var dayNameNext2;
+   
+   if (this.calendarWindow.getSelectedDate().getDay() > 4)
 	{
 		if (this.calendarWindow.getSelectedDate().getDay() == 6)
 		{
-			var dayNameNext1 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() - 6);
-			var dayNameNext2 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() - 5);
+			dayNameNext1 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() - 6);
+			dayNameNext2 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() - 5);
 		}
 		else
 		{
-			var dayNameNext1 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() + 1);
-			var dayNameNext2 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() - 5);
+			dayNameNext1 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() + 1);
+			dayNameNext2 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() - 5);
 		}
 	}
 	else
 	{
-		var dayNameNext1 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() + 1);
-		var dayNameNext2 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() + 2);
+		dayNameNext1 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() + 1);
+		dayNameNext2 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() + 2);
 	}
    var monthName = this.calendarWindow.dateFormater.getMonthName( this.calendarWindow.getSelectedDate().getMonth() );
    
@@ -510,14 +517,16 @@ DayView.prototype.getNewEventDate = function dayview_getNewEventDate( )
 
 DayView.prototype.goToNext = function dayview_goToNext(goDays)
 {
+   var nextDay;
+
    if (goDays)
 	{
-		var nextDay = new Date(  this.calendarWindow.selectedDate.getFullYear(),  this.calendarWindow.selectedDate.getMonth(), this.calendarWindow.selectedDate.getDate() + goDays );
+		nextDay = new Date(  this.calendarWindow.selectedDate.getFullYear(),  this.calendarWindow.selectedDate.getMonth(), this.calendarWindow.selectedDate.getDate() + goDays );
       this.goToDay( nextDay );
    }
 	else
 	{
-      var nextDay = new Date(  this.calendarWindow.selectedDate.getFullYear(),  this.calendarWindow.selectedDate.getMonth(), this.calendarWindow.selectedDate.getDate() + 1 );
+      nextDay = new Date(  this.calendarWindow.selectedDate.getFullYear(),  this.calendarWindow.selectedDate.getMonth(), this.calendarWindow.selectedDate.getDate() + 1 );
       this.goToDay( nextDay );
    }
 }
@@ -530,14 +539,16 @@ DayView.prototype.goToNext = function dayview_goToNext(goDays)
 
 DayView.prototype.goToPrevious = function dayview_goToPrevious( goDays )
 {
+   var prevDay;
+
    if (goDays)
 	{
-      var prevDay = new Date(  this.calendarWindow.selectedDate.getFullYear(),  this.calendarWindow.selectedDate.getMonth(), this.calendarWindow.selectedDate.getDate() - goDays );
+      prevDay = new Date(  this.calendarWindow.selectedDate.getFullYear(),  this.calendarWindow.selectedDate.getMonth(), this.calendarWindow.selectedDate.getDate() - goDays );
       this.goToDay( prevDay );
    }
 	else
 	{
-      var prevDay = new Date(  this.calendarWindow.selectedDate.getFullYear(),  this.calendarWindow.selectedDate.getMonth(), this.calendarWindow.selectedDate.getDate() - 1 );
+      prevDay = new Date(  this.calendarWindow.selectedDate.getFullYear(),  this.calendarWindow.selectedDate.getMonth(), this.calendarWindow.selectedDate.getDate() - 1 );
       this.goToDay( prevDay );
    }
 }
diff --git a/calendar/resources/content/dragDrop.js b/calendar/resources/content/dragDrop.js
index be0b2c3f83e..9bcde9bb585 100644
--- a/calendar/resources/content/dragDrop.js
+++ b/calendar/resources/content/dragDrop.js
@@ -106,7 +106,7 @@ var calendarViewDNDObserver = {
    },
 
 
-   onDragOver: function (aEvent, aFlavour, aDragSession)
+   onDragOver: function calendarViewOnDragOver(aEvent, aFlavour, aDragSession)
    {
       if (aDragSession.isDataFlavorSupported("text/calendar-interval")) 
       {
@@ -123,6 +123,7 @@ var calendarViewDNDObserver = {
          // if (aDragSession.isDataFlavorSupported("text/calendar-interval"))
          aEvent.target.setAttribute( "draggedover", "true" );
       }
+      return true;
    },
 
 
diff --git a/calendar/resources/content/eventDialog.js b/calendar/resources/content/eventDialog.js
index bff0d8e8ddf..72e868fa88c 100644
--- a/calendar/resources/content/eventDialog.js
+++ b/calendar/resources/content/eventDialog.js
@@ -263,7 +263,7 @@ function loadCalendarEventDialog()
    while( oldMenulist.hasChildNodes() )
       oldMenulist.removeChild( oldMenulist.lastChild );
 
-   for (var i = 0; i < categoriesList.length ; i++)
+   for (i = 0; i < categoriesList.length ; i++)
    {
       document.getElementById( "categories-field" ).appendItem(categoriesList[i], categoriesList[i]);
    }
diff --git a/calendar/resources/content/importExport.js b/calendar/resources/content/importExport.js
index ad1b949e840..65eba9ef7ee 100644
--- a/calendar/resources/content/importExport.js
+++ b/calendar/resources/content/importExport.js
@@ -111,7 +111,6 @@ function loadEventsFromFile()
   const nsIFilePicker = Components.interfaces.nsIFilePicker;
   
   var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
-     
   fp.init(window, "Open", nsIFilePicker.modeOpenMultiple);
   fp.defaultExtension = "ics";
    
@@ -122,40 +121,39 @@ function loadEventsFromFile()
   var filesToAppend = fp.files;
 
   if (filesToAppend && filesToAppend.hasMoreElements()) 
-    {
+  {
       var calendarEventArray = new Array();
       var duplicateEventArray = new Array();
       var currentFile;
       var aDataStream;
       var i;
+      var tempEventArray;
 
       while (filesToAppend.hasMoreElements())
-        {
+      {
           currentFile = filesToAppend.getNext().QueryInterface(Components.interfaces.nsILocalFile);
           aDataStream = readDataFromFile( currentFile.path, "UTF-8" );
 
           switch (fp.filterIndex) {
           case 0 : // ics
-            var tempEventArray = parseIcalData( aDataStream );
+            tempEventArray = parseIcalData( aDataStream );
             for (i=0; i < tempEventArray.length; i++)
               calendarEventArray[calendarEventArray.length]  = tempEventArray[i];    
             break;
           case 1 : // xcs
-            var tempEventArray = parseXCSData( aDataStream );
+            tempEventArray = parseXCSData( aDataStream );
             for (i=0; i < tempEventArray.length; i++)
               calendarEventArray[calendarEventArray.length]  = tempEventArray[i];    
             break;
           case 2: // csv
             var ret = parseOutlookCSVData( aDataStream, dupResult.discard, dupResult.prompt );
             for (i=0; i < ret.calendarEventArray.length; i++)
-              calendarEventArray[calendarEventArray.length]  = ret.calendarEventArray[i];
+               calendarEventArray[calendarEventArray.length]  = ret.calendarEventArray[i];
             for (i=0; i < ret.calendarDuplicateArray.length; i++)
-	      duplicateEventArray[duplicateEventArray.length] = ret.calendarDuplicateArray[i];
+	            duplicateEventArray[duplicateEventArray.length] = ret.calendarDuplicateArray[i];
             break;
           }
-      
-        }
-
+      }
 
       // If there are no events to import, let the user know
       //
@@ -180,20 +178,20 @@ function loadEventsFromFile()
                                   null,null,null,null, result); 
 
         if(buttonPressed == 0) // YES
-          { 
+        { 
             addEventsToCalendar( calendarEventArray );
             return true;
-          }
+        }
         else if(buttonPressed == 1) // NO
-          { 
+        { 
             addEventsToCalendar( calendarEventArray, true );
             return true;
-          } 
+        } 
         else if(buttonPressed == 2) // CANCEL
-          { 
+        { 
             return false; 
-          } 
-      }
+        } 
+   }
 
 
       // Depending on how the user chose to deal with duplicates,
diff --git a/calendar/resources/content/monthView.js b/calendar/resources/content/monthView.js
index ec633a5d243..a0e3dc30a8c 100644
--- a/calendar/resources/content/monthView.js
+++ b/calendar/resources/content/monthView.js
@@ -424,7 +424,7 @@ MonthView.prototype.refreshDisplay = function monthView_refreshDisplay( )
    
    var Offset = getIntPref(this.calendarWindow.calendarPreferences.calendarPref, "week.start", 0 );
    
-   NewArrayOfDayNames = new Array();
+   var NewArrayOfDayNames = new Array();
    
    for( i = 0; i < ArrayOfDayNames.length; i++ )
    {
@@ -468,7 +468,8 @@ MonthView.prototype.refreshDisplay = function monthView_refreshDisplay( )
    {
       var dayNumberItem = this.dayNumberItemArray[ dayIndex ];
       var dayBoxItem = this.dayBoxItemArray[ dayIndex ];
-      
+      var thisDate;
+
       if( dayIndex < firstDayOfWeek || dayNumber > lastDayOfMonth )
       {
          // this day box is NOT in the month, 
@@ -479,7 +480,7 @@ MonthView.prototype.refreshDisplay = function monthView_refreshDisplay( )
          
          if( dayIndex < firstDayOfWeek )
          {
-            var thisDate = new Date( newYear, newMonth, 1-(firstDayOfWeek - dayIndex ) );
+            thisDate = new Date( newYear, newMonth, 1-(firstDayOfWeek - dayIndex ) );
             
             dayBoxItem.date = thisDate;
             
@@ -488,7 +489,7 @@ MonthView.prototype.refreshDisplay = function monthView_refreshDisplay( )
          }
          else
          {
-            var thisDate = new Date( newYear, newMonth, lastDayOfMonth+( dayIndex - lastDayOfMonth - firstDayOfWeek + 1 ) );
+            thisDate = new Date( newYear, newMonth, lastDayOfMonth+( dayIndex - lastDayOfMonth - firstDayOfWeek + 1 ) );
             
             dayBoxItem.date = thisDate;
             dayBoxItem.setAttribute( "date", thisDate );
@@ -501,7 +502,7 @@ MonthView.prototype.refreshDisplay = function monthView_refreshDisplay( )
          dayNumberItem.setAttribute( "value" , dayNumber );
          
          dayBoxItem.removeAttribute( "empty" ); 
-         var thisDate = new Date( newYear, newMonth, dayNumber );
+         thisDate = new Date( newYear, newMonth, dayNumber );
          if( thisDate.getDay() == 0 | thisDate.getDay() == 6 )
          {
             dayBoxItem.setAttribute( "weekend", "true" );
@@ -558,7 +559,7 @@ MonthView.prototype.clearSelectedDate = function monthView_clearSelectedDate( )
 {
    var SelectedBoxes = document.getElementsByAttribute( "monthselected", "true" );
    
-   for( i = 0; i < SelectedBoxes.length; i++ )
+   for( var i = 0; i < SelectedBoxes.length; i++ )
    {
       SelectedBoxes[i].removeAttribute( "monthselected" );
    }
@@ -573,7 +574,7 @@ MonthView.prototype.clearSelectedBoxes = function monthView_clearSelectedBoxes(
 {
    var SelectedBoxes = document.getElementsByAttribute( "eventselected", "true" );
    
-   for( i = 0; i < SelectedBoxes.length; i++ )
+   for( var i = 0; i < SelectedBoxes.length; i++ )
    {
       SelectedBoxes[i].removeAttribute( "eventselected" );
    }
@@ -593,7 +594,7 @@ MonthView.prototype.hiliteTodaysDate = function monthView_hiliteTodaysDate( )
    // Clear the old selection if there was one
    var TodayBox = document.getElementsByAttribute( "today", "true" );
    
-   for( i = 0; i < TodayBox.length; i++ )
+   for( var i = 0; i < TodayBox.length; i++ )
    {
       TodayBox[i].removeAttribute( "today" );
    }
@@ -638,12 +639,14 @@ MonthView.prototype.getNewEventDate = function monthView_getNewEventDate( )
 
 MonthView.prototype.goToNext = function monthView_goToNext( goMonths )
 {  
+   var nextMonth;
+
    if(goMonths){
-      var nextMonth = new Date(  this.calendarWindow.selectedDate.getFullYear(),  this.calendarWindow.selectedDate.getMonth() + goMonths, 1 );
+      nextMonth = new Date(  this.calendarWindow.selectedDate.getFullYear(),  this.calendarWindow.selectedDate.getMonth() + goMonths, 1 );
       this.adjustNewMonth( nextMonth );  
       this.goToDay( nextMonth );
    }else{
-      var nextMonth = new Date(  this.calendarWindow.selectedDate.getFullYear(),  this.calendarWindow.selectedDate.getMonth() + 1, 1 );
+      nextMonth = new Date(  this.calendarWindow.selectedDate.getFullYear(),  this.calendarWindow.selectedDate.getMonth() + 1, 1 );
       this.adjustNewMonth( nextMonth );  
       this.goToDay( nextMonth );
    }
@@ -657,12 +660,14 @@ MonthView.prototype.goToNext = function monthView_goToNext( goMonths )
 
 MonthView.prototype.goToPrevious = function monthView_goToPrevious( goMonths )
 {
+   var prevMonth;
+
    if(goMonths){
-      var prevMonth = new Date(  this.calendarWindow.selectedDate.getFullYear(),  this.calendarWindow.selectedDate.getMonth() - goMonths, 1 );
+      prevMonth = new Date(  this.calendarWindow.selectedDate.getFullYear(),  this.calendarWindow.selectedDate.getMonth() - goMonths, 1 );
       this.adjustNewMonth( prevMonth );  
       this.goToDay( prevMonth );
    }else{
-      var prevMonth = new Date(  this.calendarWindow.selectedDate.getFullYear(),  this.calendarWindow.selectedDate.getMonth() - 1, 1 );
+      prevMonth = new Date(  this.calendarWindow.selectedDate.getFullYear(),  this.calendarWindow.selectedDate.getMonth() - 1, 1 );
       this.adjustNewMonth( prevMonth );  
       this.goToDay( prevMonth );
    }
@@ -847,7 +852,7 @@ MonthView.prototype.setCalendarSize = function monthView_setCalendarSize( height
 /*returns the height of the current view in pixels*/ 
 MonthView.prototype.getViewHeight = function monthView_getViewHeight( )
 {
-    toReturn = document.defaultView.getComputedStyle(document.getElementById("month-view-box"), "").getPropertyValue("height");
+    var toReturn = document.defaultView.getComputedStyle(document.getElementById("month-view-box"), "").getPropertyValue("height");
     toReturn = parseInt( toReturn ); //strip off the px at the end
     return toReturn;
 }
@@ -878,8 +883,8 @@ MonthView.prototype.setNumberOfEventsToShow = function monthView_getNumberOfEven
 /*
 drag and drop stuff 
 */
-gEventBeingDragged = false;
-gBoxBeingDroppedOn = false;
+var gEventBeingDragged = false;
+var gBoxBeingDroppedOn = false;
 
 var monthViewEventDragAndDropObserver  = {
   onDragStart: function (evt, transferData, action){
diff --git a/calendar/resources/content/publish.js b/calendar/resources/content/publish.js
index 6738a76d8ce..10cd10d3454 100644
--- a/calendar/resources/content/publish.js
+++ b/calendar/resources/content/publish.js
@@ -138,7 +138,7 @@ function get_destination_channel(destinationDirectoryLocation, fileName, login,
     var ioService = GetIOService();
     if (!ioService)
     {
-       return;
+       return null;
     }
 
     // create a channel for the destination location
@@ -147,7 +147,7 @@ function get_destination_channel(destinationDirectoryLocation, fileName, login,
     if (!destChannel)
     {
       dump("can't create dest channel\n");
-      return;
+      return null;
     }
     try {
     dump("about to set callbacks\n");
diff --git a/calendar/resources/content/selectAddressesDialog.js b/calendar/resources/content/selectAddressesDialog.js
index 1d85d5b5e9c..bf90d97cd3b 100644
--- a/calendar/resources/content/selectAddressesDialog.js
+++ b/calendar/resources/content/selectAddressesDialog.js
@@ -523,8 +523,7 @@ ContactsTree.prototype =
     onDblClick: function( event )
     {
         addSelectedAddressesIntoBucket( DTD_toPrefix, kADDRESS_PREFIX_TO );
-    },
-
+    }
 };
 
 
@@ -1499,8 +1498,7 @@ EventContactsTree.prototype =
     onDblClick: function( event )
     {
         addSelectedAddressesIntoInviteBucket( '', '' );
-    },
-
+    }
 };
 
 
diff --git a/calendar/resources/content/unifinder.js b/calendar/resources/content/unifinder.js
index 8404836c67b..cd933f50a4e 100644
--- a/calendar/resources/content/unifinder.js
+++ b/calendar/resources/content/unifinder.js
@@ -407,26 +407,27 @@ function getAndSetEventTable( )
    var Today = new Date();
    //do this to allow all day events to show up all day long
    var StartDate = new Date( Today.getFullYear(), Today.getMonth(), Today.getDate(), 0, 0, 0 );
-   
+   var EndDate;
+
    switch( document.getElementById( "event-filter-menulist" ).selectedItem.value )
    {
       case "all":
          return( gEventSource.getAllEvents() );
          
       case "today":
-         var EndDate = new Date( StartDate.getTime() + ( 1000 * 60 * 60 * 24 ) - 1 );
+         EndDate = new Date( StartDate.getTime() + ( 1000 * 60 * 60 * 24 ) - 1 );
          return( gEventSource.getEventsForRange( StartDate, EndDate ) );
          
       case "week":
-         var EndDate = new Date( StartDate.getTime() + ( 1000 * 60 * 60 * 24 * 8 ) );
+         EndDate = new Date( StartDate.getTime() + ( 1000 * 60 * 60 * 24 * 8 ) );
          return( gEventSource.getEventsForRange( StartDate, EndDate ) );
          
       case "2weeks":
-         var EndDate = new Date( StartDate.getTime() + ( 1000 * 60 * 60 * 24 * 15 ) );
+         EndDate = new Date( StartDate.getTime() + ( 1000 * 60 * 60 * 24 * 15 ) );
          return( gEventSource.getEventsForRange( StartDate, EndDate ) );
          
       case "month":
-         var EndDate = new Date( StartDate.getTime() + ( 1000 * 60 * 60 * 24 * 32 ) );
+         EndDate = new Date( StartDate.getTime() + ( 1000 * 60 * 60 * 24 * 32 ) );
          return( gEventSource.getEventsForRange( StartDate, EndDate ) );
          
       case "future":
@@ -435,7 +436,7 @@ function getAndSetEventTable( )
       case "current":
          var SelectedDate = gCalendarWindow.getSelectedDate();
          MidnightSelectedDate = new Date( SelectedDate.getFullYear(), SelectedDate.getMonth(), SelectedDate.getDate(), 0, 0, 0 );
-         var EndDate = new Date( MidnightSelectedDate.getTime() + ( 1000 * 60 * 60 * 24 ) - 1000 );
+         EndDate = new Date( MidnightSelectedDate.getTime() + ( 1000 * 60 * 60 * 24 ) - 1000 );
          return( gEventSource.getEventsForRange( MidnightSelectedDate, EndDate ) );
       
       default: 
@@ -572,7 +573,13 @@ var treeView =
                   return( calendarStringBundle.GetStringFromName( "Confirmed" ) );
                case calendarEvent.ICAL_STATUS_CANCELLED:
                   return( calendarStringBundle.GetStringFromName( "Cancelled" ) );
+               default: 
+                  return false;
             }
+            return false;
+
+         default: 
+            return false;
       }
    }
 }
@@ -584,14 +591,11 @@ function sortEvents( EventA, EventB )
 	{
 		modifier = -1;
 	}
-   //dump( "\nswitch on treeview.SelectedColumn which is "+treeView.selectedColumn );
+   
    switch(treeView.selectedColumn)
    {
       case "unifinder-search-results-tree-col-title":
-      {
-         //dump( "\nreturning "+EventA.title +" > "+EventB.title );
          return( ((EventA.title > EventB.title) ? 1 : -1) * modifier );
-      }
       
       case "unifinder-search-results-tree-col-startdate":
          return( ((EventA.start.getTime() > EventB.start.getTime()) ? 1 : -1) * modifier );
@@ -607,6 +611,9 @@ function sortEvents( EventA, EventB )
    
       case "unifinder-search-results-tree-col-status":
          return( ((EventA.status > EventB.status) ? 1 : -1) * modifier );
+
+      default:
+         return true;
    }
 }
 
@@ -687,13 +694,15 @@ function focusFirstItemIfNoSelection()
 
 function getNextOrPreviousRecurrence( calendarEvent )
 {
+   var isValid;
+
    if( calendarEvent.recur )
    {
       var now = new Date();
 
       var result = new Object();
 
-      var isValid = calendarEvent.getNextRecurrence( now.getTime(), result );
+      isValid = calendarEvent.getNextRecurrence( now.getTime(), result );
 
       if( isValid )
       {
@@ -711,6 +720,7 @@ function getNextOrPreviousRecurrence( calendarEvent )
    {
       return( new Date( calendarEvent.start.getTime() ) );
    }
+   return( false );
 }
 
 
diff --git a/calendar/resources/content/unifinderToDo.js b/calendar/resources/content/unifinderToDo.js
index a73cbca2fdb..d96db5288c1 100644
--- a/calendar/resources/content/unifinderToDo.js
+++ b/calendar/resources/content/unifinderToDo.js
@@ -148,6 +148,7 @@ function getToDoFromEvent( event )
    { 
       return( tree.taskView.getCalendarTaskAtRow( row.value ) );
    }
+   return false;
 }
 
 function getSelectedToDo()
@@ -399,7 +400,7 @@ var toDoTreeView =
    {
       calendarToDo = gTaskArray[row];
       if( !calendarToDo )
-         return;
+         return false;
 
       switch( column )
       {
@@ -410,10 +411,11 @@ var toDoTreeView =
             return( " " );
 
          case "unifinder-todo-tree-col-title":
+            var titleText;
             if( calendarToDo.title == "" )
-               var titleText = "Untitled";
+               titleText = "Untitled";
             else  
-               var titleText = calendarToDo.title;
+               titleText = calendarToDo.title;
             return( titleText );
          case "unifinder-todo-tree-col-startdate":
             return( formatUnifinderEventDate( new Date( calendarToDo.start.getTime() ) ) );
@@ -425,6 +427,8 @@ var toDoTreeView =
             return( calendarToDo.percentcomplete );
          case "unifinder-todo-tree-col-categories":
             return( calendarToDo.categories );
+         default:
+            return false;
       }
    }
 }
@@ -439,29 +443,31 @@ function sortTasks( TaskA, TaskB )
 
    switch(toDoTreeView.selectedColumn)
    {
-   case "unifinder-todo-tree-col-completed":
-      return( ((TaskA.completed.getTime() > TaskB.completed.getTime()) ? 1 : -1) * modifier );
-   
-   case "unifinder-todo-tree-col-priority":
-      return( ((TaskA.priority > TaskB.priority) ? 1 : -1) * modifier );
-
-   case "unifinder-todo-tree-col-title":
-         return( ((TaskA.title > TaskB.title) ? 1 : -1) * modifier );
-
-   case "unifinder-todo-tree-col-startdate":
-         return( ((TaskA.start.getTime() > TaskB.start.getTime()) ? 1 : -1) * modifier );
-
-   case "unifinder-todo-tree-col-duedate":
-         return( ((TaskA.due.getTime() > TaskB.due.getTime()) ? 1 : -1) * modifier );
-
-   case "unifinder-todo-tree-col-completeddate":
+      case "unifinder-todo-tree-col-completed":
          return( ((TaskA.completed.getTime() > TaskB.completed.getTime()) ? 1 : -1) * modifier );
+      
+      case "unifinder-todo-tree-col-priority":
+         return( ((TaskA.priority > TaskB.priority) ? 1 : -1) * modifier );
    
-   case "unifinder-todo-tree-col-percentcomplete":
+      case "unifinder-todo-tree-col-title":
+         return( ((TaskA.title > TaskB.title) ? 1 : -1) * modifier );
+   
+      case "unifinder-todo-tree-col-startdate":
+         return( ((TaskA.start.getTime() > TaskB.start.getTime()) ? 1 : -1) * modifier );
+   
+      case "unifinder-todo-tree-col-duedate":
+         return( ((TaskA.due.getTime() > TaskB.due.getTime()) ? 1 : -1) * modifier );
+   
+      case "unifinder-todo-tree-col-completeddate":
+         return( ((TaskA.completed.getTime() > TaskB.completed.getTime()) ? 1 : -1) * modifier );
+      
+      case "unifinder-todo-tree-col-percentcomplete":
          return( ((TaskA.percentcomplete > TaskB.percentcomplete) ? 1 : -1) * modifier );
-
-   case "unifinder-todo-tree-col-categories":
-            return( ((TaskA.categories > TaskB.categories) ? 1 : -1) * modifier );
+   
+      case "unifinder-todo-tree-col-categories":
+         return( ((TaskA.categories > TaskB.categories) ? 1 : -1) * modifier );
+      default:
+         return true;
    }
 }
 
@@ -531,7 +537,7 @@ function getTaskTable( )
       gICalLib.filter.completed.setTime( now );
    }
 
-   var taskTable = gEventSource.getAllToDos();
+   taskTable = gEventSource.getAllToDos();
    
    return( taskTable );
 }
diff --git a/calendar/resources/content/weekView.js b/calendar/resources/content/weekView.js
index 7216730abce..3accc1f690a 100644
--- a/calendar/resources/content/weekView.js
+++ b/calendar/resources/content/weekView.js
@@ -161,7 +161,7 @@ WeekView.prototype.refreshEvents = function( )
       var TextNode = document.getElementById( "all-day-content-box-text-week-"+dayIndex );
       
       // get the events for the day and loop through them
-      dayToGet = new Date( gHeaderDateItemArray[dayIndex].getAttribute( "date" ) );
+      var dayToGet = new Date( gHeaderDateItemArray[dayIndex].getAttribute( "date" ) );
       
       var dayEventList = new Array();
       
@@ -188,9 +188,9 @@ WeekView.prototype.refreshEvents = function( )
          {
             //see if there's another event at the same start time.
             
-            for ( j = 0; j < dayEventList.length; j++ ) 
+            for ( var j = 0; j < dayEventList.length; j++ ) 
             {
-               thisCalendarEventDisplay = dayEventList[j];
+               var thisCalendarEventDisplay = dayEventList[j];
    
                //if this event overlaps with another event...
                if ( ( ( thisCalendarEventDisplay.displayDate >= calendarEventDisplay.displayDate &&
@@ -201,7 +201,7 @@ WeekView.prototype.refreshEvents = function( )
                     thisCalendarEventDisplay.event.allDay != true )
                {
                   //get the spot that this event will go in.
-                  var ThisSpot = thisCalendarEventDisplay.CurrentSpot;
+                  ThisSpot = thisCalendarEventDisplay.CurrentSpot;
                   
                   calendarEventDisplay.OtherSpotArray.push( ThisSpot );
                   ThisSpot++;
@@ -212,10 +212,10 @@ WeekView.prototype.refreshEvents = function( )
                   } 
                }
             }
-            SortedOtherSpotArray = new Array();
+            var SortedOtherSpotArray = new Array();
             //the sort must use the global variable gCalendarWindow, not this.calendarWindow
             SortedOtherSpotArray = calendarEventDisplay.OtherSpotArray.sort( gCalendarWindow.compareNumbers);
-            LowestNumber = this.calendarWindow.getLowestElementNotInArray( SortedOtherSpotArray );
+            var LowestNumber = this.calendarWindow.getLowestElementNotInArray( SortedOtherSpotArray );
             
             //this is the actual spot (0 -> n) that the event will go in on the day view.
             calendarEventDisplay.CurrentSpot = LowestNumber;
@@ -359,10 +359,10 @@ WeekView.prototype.createEventBox = function ( calendarEventDisplay, dayIndex )
    eventBox.setAttribute( "height", Height );
    eventBox.setAttribute( "width", Width );
       
-   top = eval( ( startHour*kWeekViewHourHeight ) + ( ( startMinutes/60 ) * kWeekViewHourHeight ) - kWeekViewHourHeightDifference );
+   var top = eval( ( startHour*kWeekViewHourHeight ) + ( ( startMinutes/60 ) * kWeekViewHourHeight ) - kWeekViewHourHeightDifference );
    eventBox.setAttribute( "top", top );
    
-   left = eval( boxLeftOffset + ( boxWidth * ( dayIndex - 1 ) ) + ( ( calendarEventDisplay.CurrentSpot - 1 ) * eventBox.getAttribute( "width" ) ) ) ;
+   var left = eval( boxLeftOffset + ( boxWidth * ( dayIndex - 1 ) ) + ( ( calendarEventDisplay.CurrentSpot - 1 ) * eventBox.getAttribute( "width" ) ) ) ;
    eventBox.setAttribute( "left", left );
    
    eventBox.setAttribute( "class", "week-view-event-class" );
@@ -634,8 +634,9 @@ WeekView.prototype.hiliteTodaysDate = function( )
 
    if ( Today.getTime() > FirstDay.getTime() && Today.getTime() < LastDay.getTime() ) 
    {
+      var ThisDate;
       //today is visible, get the day index for today
-      for ( dayIndex = 1; dayIndex <= 7; ++dayIndex )
+      for ( var dayIndex = 1; dayIndex <= 7; ++dayIndex )
       {
          ThisDate = new Date( gHeaderDateItemArray[dayIndex].getAttribute( "date" ) );
          if ( ThisDate.getFullYear() == Today.getFullYear()
@@ -708,16 +709,16 @@ WeekView.prototype.clearSelectedDate = function( )
 WeekView.prototype.getWeekNumber = function()
 {
 	var today = new Date( this.calendarWindow.getSelectedDate() );
-	Year = today.getYear() + 1900;
-	Month = today.getMonth();
-	Day = today.getDate();
-   now = new Date(Year,Month,Day+1);
+	var Year = today.getYear() + 1900;
+	var Month = today.getMonth();
+	var Day = today.getDate();
+   var now = new Date(Year,Month,Day+1);
 	now = now.getTime();
    var Firstday = new Date( this.calendarWindow.getSelectedDate() );
 	Firstday.setYear(Year);
 	Firstday.setMonth(0);
 	Firstday.setDate(1);
-	then = new Date(Year,0,1);
+	var then = new Date(Year,0,1);
    then = then.getTime();
 	var Compensation = Firstday.getDay();
 	if (Compensation > 3) Compensation -= 4;