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 /components | |
parent | 9ea7809abe7866ada574e9a58181304cb4155bb7 (diff) | |
download | iceweasel-uxp-4191f4c82c52e6d30c29f879fcd374e86bba4bf5.tar.gz |
backport uxp: Make Basilisk front-end use Weave
Diffstat (limited to 'components')
-rw-r--r-- | components/customizableui/CustomizableWidgets.jsm | 39 | ||||
-rw-r--r-- | components/customizableui/content/panelUI.inc.xul | 2 |
2 files changed, 1 insertions, 40 deletions
diff --git a/components/customizableui/CustomizableWidgets.jsm b/components/customizableui/CustomizableWidgets.jsm index abaed22..401b7ca 100644 --- a/components/customizableui/CustomizableWidgets.jsm +++ b/components/customizableui/CustomizableWidgets.jsm @@ -23,8 +23,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "CharsetMenu", "resource://gre/modules/CharsetMenu.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils", "resource://gre/modules/PrivateBrowsingUtils.jsm"); -XPCOMUtils.defineLazyModuleGetter(this, "SyncedTabs", - "resource://services-sync/SyncedTabs.jsm"); XPCOMUtils.defineLazyGetter(this, "CharsetBundle", function() { const kCharsetBundle = "chrome://global/locale/charsetMenu.properties"; @@ -311,43 +309,6 @@ const CustomizableWidgets = [ obnode.setAttribute("attribute", "syncstatus"); aNode.appendChild(obnode); }, - onViewShowing(aEvent) { - let doc = aEvent.target.ownerDocument; - this._tabsList = doc.getElementById("PanelUI-remotetabs-tabslist"); - Services.obs.addObserver(this, SyncedTabs.TOPIC_TABS_CHANGED, false); - - if (SyncedTabs.isConfiguredToSyncTabs) { - if (SyncedTabs.hasSyncedThisSession) { - this.setDeckIndex(this.deckIndices.DECKINDEX_TABS); - } else { - // Sync hasn't synced tabs yet, so show the "fetching" panel. - this.setDeckIndex(this.deckIndices.DECKINDEX_FETCHING); - } - // force a background sync. - SyncedTabs.syncTabs().catch(ex => { - Cu.reportError(ex); - }); - // show the current list - it will be updated by our observer. - this._showTabs(); - } else { - // not configured to sync tabs, so no point updating the list. - this.setDeckIndex(this.deckIndices.DECKINDEX_TABSDISABLED); - } - }, - onViewHiding() { - Services.obs.removeObserver(this, SyncedTabs.TOPIC_TABS_CHANGED); - this._tabsList = null; - }, - _tabsList: null, - observe(subject, topic, data) { - switch (topic) { - case SyncedTabs.TOPIC_TABS_CHANGED: - this._showTabs(); - break; - default: - break; - } - }, setDeckIndex(index) { let deck = this._tabsList.ownerDocument.getElementById("PanelUI-remotetabs-deck"); // We call setAttribute instead of relying on the XBL property setter due diff --git a/components/customizableui/content/panelUI.inc.xul b/components/customizableui/content/panelUI.inc.xul index 5934f5a..8ebd933 100644 --- a/components/customizableui/content/panelUI.inc.xul +++ b/components/customizableui/content/panelUI.inc.xul @@ -112,7 +112,7 @@ <vbox id="PanelUI-remotetabs-buttons"> <toolbarbutton id="PanelUI-remotetabs-view-sidebar" class="subviewbutton" - observes="viewTabsSidebar" + oncommand="BrowserOpenSyncTabs();" label="&appMenuRemoteTabs.sidebar.label;"/> <toolbarbutton id="PanelUI-remotetabs-syncnow" observes="sync-status" |