Bug 641894 - Set up site menu before showing it. [r=mfinkle]
authorWes Johnston <wjohnston@mozilla.com>
Fri, 18 Mar 2011 11:48:59 -0700
changeset 67526 69caa95952e5d6fc410de0e6eff907daf636c98c
parent 67525 06a900cf0e063b21bb0b47f1f954ddd6733e880f
child 67527 b7bff93480c9a1fbe44d35dd83fe2d75747aae84
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs641894
Bug 641894 - Set up site menu before showing it. [r=mfinkle]
mobile/chrome/content/browser.js
--- a/mobile/chrome/content/browser.js
+++ b/mobile/chrome/content/browser.js
@@ -1975,25 +1975,25 @@ IdentityHandler.prototype = {
   show: function ih_show() {
     Elements.contentShowing.setAttribute("disabled", "true");
 
     // dismiss any dialog which hide the identity popup
     BrowserUI.activePanel = null;
     while (BrowserUI.activeDialog)
       BrowserUI.activeDialog.close();
 
+    // Update the popup strings
+    this.setPopupMessages(this._identityBox.getAttribute("mode") || this.IDENTITY_MODE_UNKNOWN);
+
     this._identityPopup.hidden = false;
     this._identityPopup.top = BrowserUI.toolbarH - this._identityPopup.offset;
     this._identityPopup.anchorTo(this._identityBox);
 
     this._identityBox.setAttribute("open", "true");
 
-    // Update the popup strings
-    this.setPopupMessages(this._identityBox.getAttribute("mode") || this.IDENTITY_MODE_UNKNOWN);
-
     BrowserUI.pushPopup(this, [this._identityPopup, this._identityBox, Elements.toolbarContainer]);
     BrowserUI.lockToolbar();
   },
 
   hide: function ih_hide() {
     Elements.contentShowing.setAttribute("disabled", "false");
 
     this._identityPopup.hidden = true;