diff options
author | Gaming4JC <g4jc@bulletmail.org> | 2018-12-16 17:44:01 -0500 |
---|---|---|
committer | Gaming4JC <g4jc@bulletmail.org> | 2018-12-16 17:44:01 -0500 |
commit | 4191f4c82c52e6d30c29f879fcd374e86bba4bf5 (patch) | |
tree | 735929ccf889b3170eedef695b0c044ac6c4d111 /base | |
parent | 9ea7809abe7866ada574e9a58181304cb4155bb7 (diff) | |
download | iceweasel-uxp-4191f4c82c52e6d30c29f879fcd374e86bba4bf5.tar.gz |
backport uxp: Make Basilisk front-end use Weave
Diffstat (limited to 'base')
-rw-r--r-- | base/content/browser-syncui.js | 35 | ||||
-rwxr-xr-x | base/content/browser.js | 2 |
2 files changed, 8 insertions, 29 deletions
diff --git a/base/content/browser-syncui.js b/base/content/browser-syncui.js index 51bcb15..64290a2 100644 --- a/base/content/browser-syncui.js +++ b/base/content/browser-syncui.js @@ -293,17 +293,13 @@ var gSyncUI = { */ openSetup: function SUI_openSetup(wizardType, entryPoint = "syncbutton") { - if (this.weaveService.fxAccountsEnabled) { - this.openPrefs(entryPoint); - } else { - let win = Services.wm.getMostRecentWindow("Weave:AccountSetup"); - if (win) - win.focus(); - else { - window.openDialog("chrome://browser/content/sync/setup.xul", - "weaveSetup", "centerscreen,chrome,resizable=no", - wizardType); - } + let win = Services.wm.getMostRecentWindow("Weave:AccountSetup"); + if (win) + win.focus(); + else { + window.openDialog("chrome://browser/content/sync/setup.xul", + "weaveSetup", "centerscreen,chrome,resizable=no", + wizardType); } }, @@ -328,23 +324,6 @@ var gSyncUI = { gFxAccounts.openSignInAgainPage(entryPoint); }, - openSyncedTabsPanel() { - let placement = CustomizableUI.getPlacementOfWidget("sync-button"); - let area = placement ? placement.area : CustomizableUI.AREA_NAVBAR; - let anchor = document.getElementById("sync-button") || - document.getElementById("PanelUI-menu-button"); - if (area == CustomizableUI.AREA_PANEL) { - // The button is in the panel, so we need to show the panel UI, then our - // subview. - PanelUI.show().then(() => { - PanelUI.showSubView("PanelUI-remotetabs", anchor, area); - }).catch(Cu.reportError); - } else { - // It is placed somewhere else - just try and show it. - PanelUI.showSubView("PanelUI-remotetabs", anchor, area); - } - }, - /* After Sync is initialized we perform a once-only check for the sync button being in "customize purgatory" and if so, move it to the panel. This is done primarily for profiles created before SyncedTabs landed, diff --git a/base/content/browser.js b/base/content/browser.js index bfd1e56..169e866 100755 --- a/base/content/browser.js +++ b/base/content/browser.js @@ -6243,7 +6243,7 @@ function checkEmptyPageOrigin(browser = gBrowser.selectedBrowser, } function BrowserOpenSyncTabs() { - gSyncUI.openSyncedTabsPanel(); + switchToTabHavingURI("about:sync-tabs", true); } /** |