Bug 361246: Don't collapse toolbar customization window since we don't animate it, r=mano

browser/base/content/customizeToolbarSheet.js

@@ -38,12 +38,5 @@
 var gCustomizeToolbarSheet = {
   init: function() {
     InitWithToolbox(window.parent.document.getElementById("navigator-toolbox"));
-  },
-
-  done: function() {
-    // XXXmano: I'm pretty sure we don't need to do this, but since
-    // the XP dialog does, we will.
-    document.getElementById("main-box").collapsed = true;
-    finishToolbarCustomization();
   }
 };

browser/base/content/customizeToolbarSheet.xul

@@ -54,7 +54,6 @@
         title="&dialog.title;"
         style="&dialog.style;"
         onload="gCustomizeToolbarSheet.init();"
-        onclose="gCustomizeToolbarSheet.done();"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <script type="application/x-javascript"
@@ -70,14 +69,14 @@
   <keyset id="CustomizeToolbarSheetKeyset">
     <key id="cmd_close_sheet"
          keycode="VK_ESCAPE"
-         oncommand="gCustomizeToolbarSheet.done();"/>
+         oncommand="finishToolbarCustomization();"/>
     <key id="cmd_close_sheet" keycode="VK_RETURN"
-         oncommand="gCustomizeToolbarSheet.done();"/>
+         oncommand="finishToolbarCustomization();"/>
     <key id="cmd_close_sheet" keycode="VK_ENTER"
-         oncommand="gCustomizeToolbarSheet.done();"/>
+         oncommand="finishToolbarCustomization();"/>
   </keyset>
 
-  <vbox id="main-box" flex="1" collapsed="true">
+  <vbox id="main-box" flex="1">
     <label id="instructions" value="&instructions.description;"/>
 
     <vbox flex="1" id="palette-box"
@@ -113,7 +112,7 @@
 
     <hbox align="center" pack="end">
       <button label="&saveChanges.label;"
-              oncommand="gCustomizeToolbarSheet.done();"
+              oncommand="finishToolbarCustomization();"
               default="true"
               icon="close"/>
     </hbox>

toolkit/content/customizeToolbar.js

@@ -74,21 +74,8 @@ function finishToolbarCustomization()
   notifyParentComplete();
 }
 
-function onUnload(aEvent)
-{
-  finishToolbarCustomization();
-}
-
-function onAccept(aEvent)
-{
-  document.getElementById("main-box").collapsed = true;
-  window.close();
-}
-
 function initDialog()
 {
-  document.getElementById("main-box").collapsed = false;
-  
   var mode = gToolbox.getAttribute("mode");
   document.getElementById("modelist").value = mode;
   gToolboxIconSize = gToolbox.getAttribute("iconsize");

toolkit/content/customizeToolbar.xul

@@ -50,8 +50,7 @@
 <window id="CustomizeToolbarWindow"
         title="&dialog.title;"
         onload="onLoad();"
-        onunload="onUnload();"
-        onclose="onAccept(); return false;"
+        onunload="finishToolbarCustomization();"
         style="&dialog.style;"
         persist="width height"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
@@ -62,12 +61,12 @@
 <stringbundle id="stringBundle" src="chrome://global/locale/customizeToolbar.properties"/>
 
 <keyset>
-  <key id="cmd_close_sheet" keycode="VK_ESCAPE" oncommand="onAccept();" />
-  <key id="cmd_close_sheet" keycode="VK_RETURN" oncommand="onAccept();" />
-  <key id="cmd_close_sheet" keycode="VK_ENTER" oncommand="onAccept();" />
+  <key id="cmd_close_sheet" keycode="VK_ESCAPE" oncommand="window.close();"/>
+  <key id="cmd_close_sheet" keycode="VK_RETURN" oncommand="window.close();"/>
+  <key id="cmd_close_sheet" keycode="VK_ENTER" oncommand="window.close();"/>
 </keyset>
 
-<vbox id="main-box" flex="1" collapsed="true">
+<vbox id="main-box" flex="1">
   <description id="instructions">
   &instructions.description;
   </description>
@@ -96,7 +95,8 @@
   <separator class="groove"/>
 
   <hbox align="center" pack="end">
-    <button label="&saveChanges.label;" oncommand="onAccept();" default="true" icon="close"/>
+    <button label="&saveChanges.label;" oncommand="window.close();"
+            default="true" icon="close"/>
   </hbox>
 </vbox>