Bug 424651: customize toolbar sheet goes blank when the 'Show' dropdown menu is used, r=smaug, a=beltzner

git-svn-id: svn://10.0.0.236/trunk@248504 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/browser/base/content/browser.js

@@ -3212,16 +3212,22 @@ function BrowserCustomizeToolbar()
   if (splitter)
     splitter.parentNode.removeChild(splitter);
 
+  var customizeURL = "chrome://global/content/customizeToolbar.xul";
 #ifdef TOOLBAR_CUSTOMIZATION_SHEET
   var sheetFrame = document.getElementById("customizeToolbarSheetIFrame");
   sheetFrame.hidden = false;
+
+  // The document might not have been loaded yet, if this is the first time
+  if (sheetFrame.getAttribute("src") != customizeURL)
+    sheetFrame.setAttribute("src", customizeURL);
+
   // XXXmano: there's apparently no better way to get this when the iframe is
   // hidden
   var sheetWidth = sheetFrame.style.width.match(/([0-9]+)px/)[1];
   document.getElementById("customizeToolbarSheetPopup")
           .openPopup(getNavToolbox(), "after_start", (window.innerWidth - sheetWidth) / 2, 0);
 #else
-  window.openDialog("chrome://global/content/customizeToolbar.xul",
+  window.openDialog(customizeURL,
                     "CustomizeToolbar",
                     "chrome,all,dependent",
                     getNavToolbox());

mozilla/browser/base/content/browser.xul

@@ -518,11 +518,7 @@
     </vbox>
   </hbox>
 #ifdef TOOLBAR_CUSTOMIZATION_SHEET
-  <panel id="customizeToolbarSheetPopup" noautohide="true"
-         onpopupshowing="document.getElementById('customizeToolbarSheetIFrame')
-                           .setAttribute('src', 'chrome://global/content/customizeToolbar.xul');"
-         onpopuphidden="document.getElementById('customizeToolbarSheetIFrame')
-                          .setAttribute('src', 'about:blank');">
+  <panel id="customizeToolbarSheetPopup" noautohide="true">
     <iframe id="customizeToolbarSheetIFrame"
             style="&dialog.style;"
             hidden="true"/>