summaryrefslogtreecommitdiffstats
path: root/toolkit/jetpack/sdk
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-03-06 12:30:20 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-03-06 12:30:20 +0100
commite25ad543952b5afc13181aaebef9c5951fc27be0 (patch)
tree456a1359b3e5f810319edd423dd5cc5a1e22ada5 /toolkit/jetpack/sdk
parent74533a843277c3687c749989ed1522354d1054d2 (diff)
parent5dba1ebe8498286762873fff0016f35f3e14d2d5 (diff)
downloadUXP-e25ad543952b5afc13181aaebef9c5951fc27be0.tar
UXP-e25ad543952b5afc13181aaebef9c5951fc27be0.tar.gz
UXP-e25ad543952b5afc13181aaebef9c5951fc27be0.tar.lz
UXP-e25ad543952b5afc13181aaebef9c5951fc27be0.tar.xz
UXP-e25ad543952b5afc13181aaebef9c5951fc27be0.zip
Merge branch 'master' into Basilisk-releasev2019.03.08
Diffstat (limited to 'toolkit/jetpack/sdk')
-rw-r--r--toolkit/jetpack/sdk/addon/bootstrap.js5
-rw-r--r--toolkit/jetpack/sdk/webextension.js43
2 files changed, 0 insertions, 48 deletions
diff --git a/toolkit/jetpack/sdk/addon/bootstrap.js b/toolkit/jetpack/sdk/addon/bootstrap.js
index 6c5827f1e..a6055bd10 100644
--- a/toolkit/jetpack/sdk/addon/bootstrap.js
+++ b/toolkit/jetpack/sdk/addon/bootstrap.js
@@ -134,11 +134,6 @@ 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});
}.bind(this)).catch(error => {
diff --git a/toolkit/jetpack/sdk/webextension.js b/toolkit/jetpack/sdk/webextension.js
deleted file mode 100644
index d1c4385e2..000000000
--- a/toolkit/jetpack/sdk/webextension.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-module.metadata = {
- "stability": "experimental"
-};
-
-let webExtension;
-let waitForWebExtensionAPI;
-
-module.exports = {
- initFromBootstrapAddonParam(data) {
- if (webExtension) {
- throw new Error("'sdk/webextension' module has been already initialized");
- }
-
- webExtension = data.webExtension;
- },
-
- startup() {
- if (!webExtension) {
- return Promise.reject(new Error(
- "'sdk/webextension' module is currently disabled. " +
- "('hasEmbeddedWebExtension' option is missing or set to false)"
- ));
- }
-
- // NOTE: calling `startup` more than once raises an "Embedded Extension already started"
- // error, but given that SDK addons are going to have access to the startup method through
- // an SDK module that can be required in any part of the addon, it will be nicer if any
- // additional startup calls return the startup promise instead of raising an exception,
- // so that the SDK addon can access the API object in the other addon modules without the
- // need to manually pass this promise around.
- if (!waitForWebExtensionAPI) {
- waitForWebExtensionAPI = webExtension.startup();
- }
-
- return waitForWebExtensionAPI;
- }
-};