Checked in parts of patch for bug 249820

calendar/resources/content/about.xul

@@ -37,16 +37,16 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
-<!DOCTYPE window [
+<!DOCTYPE dialog [
     <!ENTITY % dtd SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd;
 ]>
 
-<window title="&calendar.about.title;"
+<dialog title="&calendar.about.title;"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  class="dialog"
-  orient="vertical">
+  buttons="accept"
+  onload="document.documentElement.getButton('accept').focus();"
+  ondialogaccept="return true;">
 
   <tabbox flex="1">
     <tabs>
@@ -58,10 +58,4 @@
       <iframe id="aboutframe" src="chrome://calendar/content/about.html"/>
     </tabpanels>
   </tabbox>
-
-  <hbox>
-    <spring flex="1"/>
-    <button label="OK" onclick="doOKButton()"/>
-
-  </hbox>
-</window>
+</dialog>

calendar/resources/content/toDoDialog.js

@@ -273,13 +273,12 @@ function loadCalendarEventDialog()
    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 )
+      if( "server" in args )
       {
          setFieldValue( "server-field", args.server );
       }
@@ -423,7 +422,7 @@ function onOKCommand()
 
    var listbox = document.getElementById( "exception-dates-listbox" );
 
-   for( i = 0; i < listbox.childNodes.length; i++ )
+   for( var i = 0; i < listbox.childNodes.length; i++ )
    {
       debug( "\n exception added for "+listbox.childNodes[i].value );
 

calendar/resources/content/toDoDialog.xul

@@ -44,7 +44,6 @@
 
 <!-- CSS File with all styles specific to the dialog -->
 <?xml-stylesheet href="chrome://calendar/skin/eventDialog.css" ?>
-<?xml-stylesheet href="chrome://calendar/skin/dialogOverlay.css" type="text/css"?>
 <?xml-stylesheet
  href="chrome://calendar/content/datetimepickers/datetimepicker.css" ?>
 
@@ -117,8 +116,6 @@
 
 <!-- Dialog content -->
 
-   <vbox id="standard-dialog-content"  flex="1">
-   
       <tabbox>
          <tabs>
             <tab label="&newtodo.newtodo.tab.label;"/>
@@ -710,6 +707,4 @@
          </tabpanel>
       </tabpanels>
    </tabbox>
-
-   </vbox> <!-- standard-dialog-content -->
 </dialog>