Backed out changeset 8f6832870926 (bug 633599).
authorMatt Brubeck <mbrubeck@mozilla.com>
Mon, 14 Feb 2011 10:41:57 -0800
changeset 67387 1d27b49d4e13f9b1abf49a72d98a325b80755a46
parent 67386 22e615f0b7f91e26a093e20ca67f1eab7dd21261
child 67388 9b48025a1ac5362c20057df586e20613e620d86b
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)
bugs633599
Backed out changeset 8f6832870926 (bug 633599).
mobile/chrome/content/AppMenu.js
mobile/chrome/content/browser.xul
--- a/mobile/chrome/content/AppMenu.js
+++ b/mobile/chrome/content/AppMenu.js
@@ -3,33 +3,33 @@ var AppMenu = {
     delete this.panel;
     return this.panel = document.getElementById("appmenu");
   },
 
   show: function show() {
     if (BrowserUI.activePanel || BrowserUI.isPanelVisible())
       return;
     this.panel.setAttribute("count", this.panel.childNodes.length);
-    this.panel.hidden = false;
+    this.panel.collapsed = false;
 
     addEventListener("keypress", this, true);
 
     BrowserUI.lockToolbar();
     BrowserUI.pushPopup(this, [this.panel, Elements.toolbarContainer]);
   },
 
   hide: function hide() {
-    this.panel.hidden = true;
+    this.panel.collapsed = true;
 
     removeEventListener("keypress", this, true);
 
     BrowserUI.unlockToolbar();
     BrowserUI.popPopup(this);
   },
 
   toggle: function toggle() {
-    this.panel.hidden ? this.show() : this.hide();
+    this.panel.collapsed ? this.show() : this.hide();
   },
 
   handleEvent: function handleEvent(aEvent) {
     this.hide();
   }
 };
--- a/mobile/chrome/content/browser.xul
+++ b/mobile/chrome/content/browser.xul
@@ -663,17 +663,17 @@
           onclick="AlertsHelper.click(event);">
       <image id="alerts-image"/>
       <vbox flex="1">
         <label id="alerts-title" value=""/>
         <description id="alerts-text" flex="1"/>
       </vbox>
     </hbox>
 
-    <hbox id="appmenu" bottom="0" hidden="true" align="stretch" oncommand="AppMenu.hide();">
+    <hbox id="appmenu" bottom="0" collapsed="true" align="stretch" oncommand="AppMenu.hide();">
       <toolbarbutton class="appmenu-button"
         label="&appMenu.siteOptions;"
         image="chrome://browser/skin/images/appmenu-site-hdpi.png"
         oncommand="getIdentityHandler().show(); event.stopPropagation();"/>
       <toolbarbutton class="appmenu-button"
         label="&prefsHeader.label;"
         image="chrome://browser/skin/images/appmenu-preferences-hdpi.png"
         oncommand="BrowserUI.showPanel('prefs-container');"/>