diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-04-23 11:44:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-23 11:44:12 +0200 |
| commit | 531abf25517fd6b130bc5a1f799becf33684bb43 (patch) | |
| tree | 76d45af609ba25efce252d6ec276c0da7b223046 /browser/base | |
| parent | 1916969baaa5d2bd84f323ca0510ba2c8a04ef58 (diff) | |
| parent | b9ecf99332786f0040e63d868fa0d799ed1ab765 (diff) | |
| download | UXP-531abf25517fd6b130bc5a1f799becf33684bb43.tar UXP-531abf25517fd6b130bc5a1f799becf33684bb43.tar.gz UXP-531abf25517fd6b130bc5a1f799becf33684bb43.tar.lz UXP-531abf25517fd6b130bc5a1f799becf33684bb43.tar.xz UXP-531abf25517fd6b130bc5a1f799becf33684bb43.zip | |
Merge pull request #234 from janekptacijarabaci/about_errors_1
moebius#65: Fix: various "about:..." system pages errors
Diffstat (limited to 'browser/base')
| -rw-r--r-- | browser/base/content/sync/aboutSyncTabs.js | 13 | ||||
| -rw-r--r-- | browser/base/jar.mn | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/browser/base/content/sync/aboutSyncTabs.js b/browser/base/content/sync/aboutSyncTabs.js index 0c5dbb2d8..f4bb607ea 100644 --- a/browser/base/content/sync/aboutSyncTabs.js +++ b/browser/base/content/sync/aboutSyncTabs.js @@ -7,7 +7,6 @@ var Cu = Components.utils; Cu.import("resource://services-common/utils.js"); Cu.import("resource://services-sync/main.js"); Cu.import("resource:///modules/PlacesUIUtils.jsm"); -Cu.import("resource://gre/modules/AppConstants.jsm"); Cu.import("resource://gre/modules/PlacesUtils.jsm", this); Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); @@ -15,10 +14,10 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "Promise", "resource://gre/modules/Promise.jsm"); -if (AppConstants.MOZ_SERVICES_CLOUDSYNC) { - XPCOMUtils.defineLazyModuleGetter(this, "CloudSync", - "resource://gre/modules/CloudSync.jsm"); -} +#ifdef MOZ_SERVICES_CLOUDSYNC +XPCOMUtils.defineLazyModuleGetter(this, "CloudSync", + "resource://gre/modules/CloudSync.jsm"); +#endif var RemoteTabViewer = { _tabsList: null, @@ -184,12 +183,16 @@ var RemoteTabViewer = { } } +#ifdef MOZ_SERVICES_CLOUDSYNC if (CloudSync && CloudSync.ready && CloudSync().tabsReady && CloudSync().tabs.hasRemoteTabs()) { this._generateCloudSyncTabList() .then(complete, complete); } else { complete(); } +#else + complete(); +#endif }, _clearTabList: function () { diff --git a/browser/base/jar.mn b/browser/base/jar.mn index 9cbfe7c15..63ae6c366 100644 --- a/browser/base/jar.mn +++ b/browser/base/jar.mn @@ -138,7 +138,7 @@ browser.jar: content/browser/pageinfo/permissions.js (content/pageinfo/permissions.js) content/browser/pageinfo/security.js (content/pageinfo/security.js) content/browser/sync/aboutSyncTabs.xul (content/sync/aboutSyncTabs.xul) - content/browser/sync/aboutSyncTabs.js (content/sync/aboutSyncTabs.js) +* content/browser/sync/aboutSyncTabs.js (content/sync/aboutSyncTabs.js) content/browser/sync/aboutSyncTabs.css (content/sync/aboutSyncTabs.css) content/browser/sync/aboutSyncTabs-bindings.xml (content/sync/aboutSyncTabs-bindings.xml) content/browser/sync/setup.xul (content/sync/setup.xul) |