diff options
| author | New Tobin Paradigm <email@mattatobin.com> | 2018-04-20 17:49:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-20 17:49:47 -0400 |
| commit | 55b2b54f4328ddc56211e888cb5f369d463346da (patch) | |
| tree | 4c30be4d6a04ede9fc2bbc0c6ebefa754bc572f3 /toolkit | |
| parent | a26cb28c9780c015694151771d649b7cec4086db (diff) | |
| parent | e00e3008fe1775d17c4c9bba7a382a159ba5ef9e (diff) | |
| download | UXP-55b2b54f4328ddc56211e888cb5f369d463346da.tar UXP-55b2b54f4328ddc56211e888cb5f369d463346da.tar.gz UXP-55b2b54f4328ddc56211e888cb5f369d463346da.tar.lz UXP-55b2b54f4328ddc56211e888cb5f369d463346da.tar.xz UXP-55b2b54f4328ddc56211e888cb5f369d463346da.zip | |
Merge pull request #220 from JustOff/PR_PMkit_part2
Make Add-on SDK (Jetpack) work on Pale Moon || Part 2
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/jetpack/moz.build | 12 | ||||
| -rw-r--r-- | toolkit/jetpack/sdk/addon/bootstrap.js | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/toolkit/jetpack/moz.build b/toolkit/jetpack/moz.build index ad11e90a3..2e5dbe5e8 100644 --- a/toolkit/jetpack/moz.build +++ b/toolkit/jetpack/moz.build @@ -128,9 +128,10 @@ EXTRA_JS_MODULES.commonjs += [ 'test.js', ] -EXTRA_JS_MODULES.commonjs.sdk += [ - 'sdk/webextension.js', -] +if CONFIG['MOZ_WEBEXTENSIONS']: + EXTRA_JS_MODULES.commonjs.sdk += [ + 'sdk/webextension.js', + ] EXTRA_JS_MODULES.commonjs.dev += [ 'dev/debuggee.js', @@ -228,7 +229,6 @@ EXTRA_PP_JS_MODULES.commonjs.sdk += [ ] EXTRA_JS_MODULES.commonjs.sdk.addon += [ - 'sdk/addon/bootstrap.js', 'sdk/addon/events.js', 'sdk/addon/host.js', 'sdk/addon/installer.js', @@ -237,6 +237,10 @@ EXTRA_JS_MODULES.commonjs.sdk.addon += [ 'sdk/addon/window.js', ] +EXTRA_PP_JS_MODULES.commonjs.sdk.addon += [ + 'sdk/addon/bootstrap.js', +] + EXTRA_JS_MODULES.commonjs.sdk.browser += [ 'sdk/browser/events.js', ] diff --git a/toolkit/jetpack/sdk/addon/bootstrap.js b/toolkit/jetpack/sdk/addon/bootstrap.js index 0397d91e5..6c5827f1e 100644 --- a/toolkit/jetpack/sdk/addon/bootstrap.js +++ b/toolkit/jetpack/sdk/addon/bootstrap.js @@ -134,8 +134,10 @@ Bootstrap.prototype = { const main = command === "test" ? "sdk/test/runner" : null; const prefsURI = `${baseURI}defaults/preferences/prefs.js`; +#ifdef MOZ_WEBEXTENSIONS // Init the 'sdk/webextension' module from the bootstrap addon parameter. require("sdk/webextension").initFromBootstrapAddonParam(addon); +#endif const { startup } = require("sdk/addon/runner"); startup(reason, {loader, main, prefsURI}); |