Bug 250129 - Improve toolbar customization UE on OS X. r=mconnor.

toolkit/content/customizeToolbar.js

@@ -48,7 +48,13 @@ var gToolboxIconSize = false;
 
 function onLoad()
 {
-  gToolbox = window.arguments[0];
+  InitWithToolbox(window.arguments[0]);
+  repositionDialog();
+}
+
+function InitWithToolbox(aToolbox)
+{
+  gToolbox = aToolbox;
   gToolboxDocument = gToolbox.ownerDocument;
   
   gToolbox.addEventListener("draggesture", onToolbarDragGesture, false);
@@ -56,12 +62,10 @@ function onLoad()
   gToolbox.addEventListener("dragexit", onToolbarDragExit, false);
   gToolbox.addEventListener("dragdrop", onToolbarDragDrop, false);
 
-  repositionDialog();
-  
   initDialog();
 }
 
-function onUnload(aEvent)
+function finishToolbarCustomization()
 {
   removeToolboxListeners();
   unwrapToolbarItems();
@@ -70,6 +74,11 @@ function onUnload(aEvent)
   notifyParentComplete();
 }
 
+function onUnload(aEvent)
+{
+  finishToolbarCustomization();
+}
+
 function onAccept(aEvent)
 {
   document.getElementById("main-box").collapsed = true;