Bug 666257 - Remove redundant activePanel update (r=mbrubeck)
authorLucas Rocha <lucasr@mozilla.com>
Fri, 19 Aug 2011 09:29:23 -0700
changeset 75569 1f7abb28b2768d2bca860ceb08cbe44826e90521
parent 75568 d73f45cc050613c69a084e52c75fd57c3525a681
child 75570 c2ca78ba49e27480fcd038180199d7ca2c45aa07
push id3
push userfelipc@gmail.com
push dateFri, 30 Sep 2011 20:09:13 +0000
reviewersmbrubeck
bugs666257
milestone9.0a1
Bug 666257 - Remove redundant activePanel update (r=mbrubeck) BrowserUI.showPanel() already unsets activePanel if necessary.
mobile/chrome/content/browser-ui.js
--- a/mobile/chrome/content/browser-ui.js
+++ b/mobile/chrome/content/browser-ui.js
@@ -1265,17 +1265,16 @@ var BrowserUI = {
         if (Weave.Status.checkSetup() == Weave.CLIENT_NOT_CONFIGURED) {
           // We have to set activePanel before showing sync's dialog
           // to make the sure the dialog stacking is correct.
           this.activePanel = RemoteTabsList;
           WeaveGlue.open();
         } else if (!Weave.Service.isLoggedIn && !Services.prefs.getBoolPref("browser.sync.enabled")) {
           // unchecked the relative command button
           document.getElementById("remotetabs-button").removeAttribute("checked");
-          this.activePanel = null;
 
           BrowserUI.showPanel("prefs-container");
           let prefsBox = document.getElementById("prefs-list");
           let syncArea = document.getElementById("prefs-sync");
           if (prefsBox && syncArea) {
             let prefsBoxY = prefsBox.firstChild.boxObject.screenY;
             let syncAreaY = syncArea.boxObject.screenY;
             setTimeout(function() {