Bug 735749 - No back button in awesomescreen on Maemo 6 [r=mfinkle]
authorMatt Brubeck <mbrubeck@mozilla.com>
Fri, 30 Mar 2012 18:53:56 -0700
changeset 90767 44da25d479ef8fa9eecbc449a6af025644e0c9f4
parent 90766 db5dbc168429c9a19026a9665e727f3e0bec9bfc
child 90768 839c971b90223c70db47d2ed06023fa7217d9df9
push id22382
push userbmo@edmorley.co.uk
push dateSat, 31 Mar 2012 21:44:34 +0000
treeherdermozilla-central@bbe5086163c9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs735749
milestone14.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 735749 - No back button in awesomescreen on Maemo 6 [r=mfinkle]
mobile/xul/chrome/content/AwesomePanel.js
--- a/mobile/xul/chrome/content/AwesomePanel.js
+++ b/mobile/xul/chrome/content/AwesomePanel.js
@@ -18,16 +18,17 @@ var AwesomeScreen = {
   get _targets() {
     delete this._targets;
     return this._targets = [
       this.container,
 #ifdef MOZ_SERVICES_SYNC
       document.getElementById("syncsetup-container"),
 #endif
       document.getElementById("urlbar-container"),
+      document.getElementById("tool-app-close"),
       document.getElementById("search-engines-popup"),
       document.getElementById("context-popup")
     ]
   },
 
   _popupShowing: false,
   handleEvent: function(aEvent) {
     switch (aEvent.type) {
@@ -51,17 +52,17 @@ var AwesomeScreen = {
   },
 
   set activePanel(aPanel) {
     if (this._activePanel == aPanel)
       return;
 
     let willShowPanel = (!this._activePanel && aPanel);
     if (willShowPanel) {
-      BrowserUI.pushDialog(this._activePanel);
+      BrowserUI.pushDialog(aPanel);
       BrowserUI._edit.attachController();
       BrowserUI._editURI();
       this.container.hidden = this.headers.hidden = false;
       window.addEventListener("TapDown", this, false);
       window.addEventListener("PopupChanged", this, false);
     }
 
     if (aPanel) {