wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-24 08:07:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Use preprocessing instead of AppConstants.jsm

Browse source
This commit is contained in:
janekptacijarabaci 2018-04-08 08:21:28 +02:00 • committed by Roy Tam
commit e5b9c090ba
2 changed files with 27 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

39
devtools/client/framework/devtools-browser.js
View file

@ -28,10 +28,9 @@ loader.lazyRequireGetter(this, "DebuggerClient", "devtools/shared/client/main",
loader.lazyRequireGetter(this, "BrowserMenus", "devtools/client/framework/browser-menus"); loader.lazyRequireGetter(this, "BrowserMenus", "devtools/client/framework/browser-menus");
loader.lazyImporter(this, "AppConstants", "resource://gre/modules/AppConstants.jsm"); loader.lazyImporter(this, "AppConstants", "resource://gre/modules/AppConstants.jsm");
#ifdef MC_BASILISK
if (AppConstants.MOZ_APP_NAME.toLowerCase() != "palemoon") {
loader.lazyImporter(this, "CustomizableUI", "resource:///modules/CustomizableUI.jsm"); loader.lazyImporter(this, "CustomizableUI", "resource:///modules/CustomizableUI.jsm");
} #endif
const {LocalizationHelper} = require("devtools/shared/l10n"); const {LocalizationHelper} = require("devtools/shared/l10n");
const L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties"); const L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties");
@ -298,9 +297,7 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = {
* Install Developer widget * Install Developer widget
*/ */
installDeveloperWidget: function () { installDeveloperWidget: function () {
if (typeof CustomizableUI === "undefined") { #ifdef MC_BASILISK
return;
}
let id = "developer-button"; let id = "developer-button";
let widget = CustomizableUI.getWidget(id); let widget = CustomizableUI.getWidget(id);
if (widget && widget.provider == CustomizableUI.PROVIDER_API) { if (widget && widget.provider == CustomizableUI.PROVIDER_API) {
@ -349,6 +346,9 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = {
doc.getElementById("PanelUI-multiView").appendChild(view); doc.getElementById("PanelUI-multiView").appendChild(view);
} }
}); });
#else
return;
#endif
}, },
/** /**
@ -356,7 +356,8 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = {
*/ */
// Used by itself // Used by itself
installWebIDEWidget: function () { installWebIDEWidget: function () {
if ((typeof CustomizableUI === "undefined") || this.isWebIDEWidgetInstalled()) { #ifdef MC_BASILISK
if (this.isWebIDEWidgetInstalled()) {
return; return;
} }
@ -377,14 +378,18 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = {
gDevToolsBrowser.openWebIDE(); gDevToolsBrowser.openWebIDE();
} }
}); });
#else
return;
#endif
}, },
isWebIDEWidgetInstalled: function () { isWebIDEWidgetInstalled: function () {
if (typeof CustomizableUI === "undefined") { #ifdef MC_BASILISK
return false;
}
let widgetWrapper = CustomizableUI.getWidget("webide-button"); let widgetWrapper = CustomizableUI.getWidget("webide-button");
return !!(widgetWrapper && widgetWrapper.provider == CustomizableUI.PROVIDER_API); return !!(widgetWrapper && widgetWrapper.provider == CustomizableUI.PROVIDER_API);
#else
return false;
#endif
}, },
/** /**
@ -396,13 +401,14 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = {
* Uninstall WebIDE widget * Uninstall WebIDE widget
*/ */
uninstallWebIDEWidget: function () { uninstallWebIDEWidget: function () {
if (typeof CustomizableUI === "undefined") { #ifdef MC_BASILISK
return;
}
if (this.isWebIDEWidgetInstalled()) { if (this.isWebIDEWidgetInstalled()) {
CustomizableUI.removeWidgetFromArea("webide-button"); CustomizableUI.removeWidgetFromArea("webide-button");
} }
CustomizableUI.destroyWidget("webide-button"); CustomizableUI.destroyWidget("webide-button");
#else
return;
#endif
}, },
/** /**
@ -410,10 +416,11 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = {
*/ */
// Used by webide.js // Used by webide.js
moveWebIDEWidgetInNavbar: function () { moveWebIDEWidgetInNavbar: function () {
if (typeof CustomizableUI === "undefined") { #ifdef MC_BASILISK
return;
}
CustomizableUI.addWidgetToArea("webide-button", CustomizableUI.AREA_NAVBAR); CustomizableUI.addWidgetToArea("webide-button", CustomizableUI.AREA_NAVBAR);
#else
return;
#endif
}, },
/** /**

5
devtools/client/framework/moz.build
View file

@ -13,7 +13,6 @@ DevToolsModules(
'about-devtools-toolbox.js', 'about-devtools-toolbox.js',
'attach-thread.js', 'attach-thread.js',
'browser-menus.js', 'browser-menus.js',
'devtools-browser.js',
'devtools.js', 'devtools.js',
'gDevTools.jsm', 'gDevTools.jsm',
'location-store.js', 'location-store.js',
@ -31,3 +30,7 @@ DevToolsModules(
'toolbox.js', 'toolbox.js',
'ToolboxProcess.jsm', 'ToolboxProcess.jsm',
) )
FINAL_TARGET_PP_FILES.chrome.devtools.modules.devtools.client.framework += [
'devtools-browser.js',
]