Bug 666257 - Connect to Sync popup is not dismissed when device Back button is tapped in Awesome bar/Desktop Tab (r=mbrubeck)

Open sync dialog after panel to ensure correct dialog stacking.
This commit is contained in:
Lucas Rocha 2011-08-19 09:29:23 -07:00
Родитель 413a54b05f
Коммит 55fa1544e8
1 изменённых файлов: 5 добавлений и 3 удалений

Просмотреть файл

@ -1263,6 +1263,9 @@ var BrowserUI = {
break;
case "cmd_remoteTabs":
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
@ -1279,11 +1282,10 @@ var BrowserUI = {
prefsBox.scrollBoxObject.scrollTo(0, syncAreaY - prefsBoxY);
}, 0);
}
return;
} else {
this.activePanel = RemoteTabsList;
}
this.activePanel = RemoteTabsList;
break;
case "cmd_quit":
// Only close one window