Merge pull request #101 from janekptacijarabaci/devtools_CustomizableUI_2

CustomizableUI.jsm can't be used for Pale Moon - setting conditions

2 files changed, 27 insertions, 2 deletions

diff --git a/devtools/client/framework/devtools-browser.js b/devtools/client/framework/devtools-browser.js
index fe40cdb324..152870af33 100644
--- a/devtools/client/framework/devtools-browser.js
+++ b/devtools/client/framework/devtools-browser.js
@@ -27,8 +27,10 @@ loader.lazyRequireGetter(this, "DebuggerServer", "devtools/server/main", true);
 loader.lazyRequireGetter(this, "DebuggerClient", "devtools/shared/client/main", true);
 loader.lazyRequireGetter(this, "BrowserMenus", "devtools/client/framework/browser-menus");
 
-loader.lazyImporter(this, "CustomizableUI", "resource:///modules/CustomizableUI.jsm");
 loader.lazyImporter(this, "AppConstants", "resource://gre/modules/AppConstants.jsm");
+#ifdef MC_BASILISK
+loader.lazyImporter(this, "CustomizableUI", "resource:///modules/CustomizableUI.jsm");
+#endif
 
 const {LocalizationHelper} = require("devtools/shared/l10n");
 const L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties");
@@ -295,6 +297,7 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = {
    * Install Developer widget
    */
   installDeveloperWidget: function () {
+#ifdef MC_BASILISK
     let id = "developer-button";
     let widget = CustomizableUI.getWidget(id);
     if (widget && widget.provider == CustomizableUI.PROVIDER_API) {
@@ -343,6 +346,9 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = {
         doc.getElementById("PanelUI-multiView").appendChild(view);
       }
     });
+#else
+    return;
+#endif
   },
 
   /**
@@ -350,6 +356,7 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = {
    */
   // Used by itself
   installWebIDEWidget: function () {
+#ifdef MC_BASILISK
     if (this.isWebIDEWidgetInstalled()) {
       return;
     }
@@ -371,11 +378,18 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = {
         gDevToolsBrowser.openWebIDE();
       }
     });
+#else
+    return;
+#endif
   },
 
   isWebIDEWidgetInstalled: function () {
+#ifdef MC_BASILISK
     let widgetWrapper = CustomizableUI.getWidget("webide-button");
     return !!(widgetWrapper && widgetWrapper.provider == CustomizableUI.PROVIDER_API);
+#else
+    return false;
+#endif
   },
 
   /**
@@ -387,10 +401,14 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = {
    * Uninstall WebIDE widget
    */
   uninstallWebIDEWidget: function () {
+#ifdef MC_BASILISK
     if (this.isWebIDEWidgetInstalled()) {
       CustomizableUI.removeWidgetFromArea("webide-button");
     }
     CustomizableUI.destroyWidget("webide-button");
+#else
+    return;
+#endif
   },
 
   /**
@@ -398,7 +416,11 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = {
    */
    // Used by webide.js
   moveWebIDEWidgetInNavbar: function () {
+#ifdef MC_BASILISK
     CustomizableUI.addWidgetToArea("webide-button", CustomizableUI.AREA_NAVBAR);
+#else
+    return;
+#endif
   },
 
   /**
diff --git a/devtools/client/framework/moz.build b/devtools/client/framework/moz.build
index 7b28b4b9e7..407e21f8bc 100644
--- a/devtools/client/framework/moz.build
+++ b/devtools/client/framework/moz.build
@@ -13,7 +13,6 @@ DevToolsModules(
     'about-devtools-toolbox.js',
     'attach-thread.js',
     'browser-menus.js',
-    'devtools-browser.js',
     'devtools.js',
     'gDevTools.jsm',
     'location-store.js',
@@ -31,3 +30,7 @@ DevToolsModules(
     'toolbox.js',
     'ToolboxProcess.jsm',
 )
+
+FINAL_TARGET_PP_FILES.chrome.devtools.modules.devtools.client.framework += [
+    'devtools-browser.js',
+]