summaryrefslogtreecommitdiffstats
path: root/toolkit/jetpack
diff options
context:
space:
mode:
Diffstat (limited to 'toolkit/jetpack')
-rw-r--r--toolkit/jetpack/dev/volcan.js2
-rw-r--r--toolkit/jetpack/moz.build189
-rw-r--r--toolkit/jetpack/sdk/lang/weak-set.js4
-rw-r--r--toolkit/jetpack/sdk/ui/buttons.js2
4 files changed, 98 insertions, 99 deletions
diff --git a/toolkit/jetpack/dev/volcan.js b/toolkit/jetpack/dev/volcan.js
index 6a68ed12d..7ec208eec 100644
--- a/toolkit/jetpack/dev/volcan.js
+++ b/toolkit/jetpack/dev/volcan.js
@@ -139,7 +139,7 @@ var Client = Class({
.then(this.onReady.bind(this, this.root), this.onFail);
} else {
var actor = this.get(packet.from) || this.root;
- var event = actor.events[packet.type];
+ event = actor.events[packet.type];
if (event) {
var message = new MessageEvent(packet.type, {
data: event.read(packet)
diff --git a/toolkit/jetpack/moz.build b/toolkit/jetpack/moz.build
index 2e5dbe5e8..22be010d6 100644
--- a/toolkit/jetpack/moz.build
+++ b/toolkit/jetpack/moz.build
@@ -12,116 +12,115 @@ EXTRA_JS_MODULES.sdk.system += [
'modules/system/Startup.js',
]
-if CONFIG['MOZ_WIDGET_TOOLKIT'] != "gonk":
- EXTRA_JS_MODULES.commonjs.method.test += [
- 'method/test/browser.js',
- 'method/test/common.js',
- ]
+EXTRA_JS_MODULES.commonjs.method.test += [
+ 'method/test/browser.js',
+ 'method/test/common.js',
+]
- EXTRA_JS_MODULES.commonjs.sdk.deprecated += [
- 'sdk/deprecated/api-utils.js',
- 'sdk/deprecated/sync-worker.js',
- 'sdk/deprecated/unit-test-finder.js',
- 'sdk/deprecated/unit-test.js',
- 'sdk/deprecated/window-utils.js',
- ]
+EXTRA_JS_MODULES.commonjs.sdk.deprecated += [
+ 'sdk/deprecated/api-utils.js',
+ 'sdk/deprecated/sync-worker.js',
+ 'sdk/deprecated/unit-test-finder.js',
+ 'sdk/deprecated/unit-test.js',
+ 'sdk/deprecated/window-utils.js',
+]
- EXTRA_JS_MODULES.commonjs.sdk.frame += [
- 'sdk/frame/hidden-frame.js',
- 'sdk/frame/utils.js',
- ]
+EXTRA_JS_MODULES.commonjs.sdk.frame += [
+ 'sdk/frame/hidden-frame.js',
+ 'sdk/frame/utils.js',
+]
- EXTRA_JS_MODULES.commonjs.sdk.panel += [
- 'sdk/panel/events.js',
- 'sdk/panel/utils.js',
- ]
+EXTRA_JS_MODULES.commonjs.sdk.panel += [
+ 'sdk/panel/events.js',
+ 'sdk/panel/utils.js',
+]
- EXTRA_JS_MODULES.commonjs.sdk.places += [
- 'sdk/places/bookmarks.js',
- 'sdk/places/contract.js',
- 'sdk/places/events.js',
- 'sdk/places/favicon.js',
- 'sdk/places/history.js',
- 'sdk/places/utils.js',
- ]
+EXTRA_JS_MODULES.commonjs.sdk.places += [
+ 'sdk/places/bookmarks.js',
+ 'sdk/places/contract.js',
+ 'sdk/places/events.js',
+ 'sdk/places/favicon.js',
+ 'sdk/places/history.js',
+ 'sdk/places/utils.js',
+]
- EXTRA_JS_MODULES.commonjs.sdk.places.host += [
- 'sdk/places/host/host-bookmarks.js',
- 'sdk/places/host/host-query.js',
- 'sdk/places/host/host-tags.js',
- ]
+EXTRA_JS_MODULES.commonjs.sdk.places.host += [
+ 'sdk/places/host/host-bookmarks.js',
+ 'sdk/places/host/host-query.js',
+ 'sdk/places/host/host-tags.js',
+]
- EXTRA_JS_MODULES.commonjs.sdk.tabs += [
- 'sdk/tabs/common.js',
- 'sdk/tabs/events.js',
- 'sdk/tabs/helpers.js',
- 'sdk/tabs/namespace.js',
- 'sdk/tabs/observer.js',
- 'sdk/tabs/tab-fennec.js',
- 'sdk/tabs/tab-firefox.js',
- 'sdk/tabs/tab.js',
- 'sdk/tabs/tabs-firefox.js',
- 'sdk/tabs/utils.js',
- 'sdk/tabs/worker.js',
- ]
+EXTRA_JS_MODULES.commonjs.sdk.tabs += [
+ 'sdk/tabs/common.js',
+ 'sdk/tabs/events.js',
+ 'sdk/tabs/helpers.js',
+ 'sdk/tabs/namespace.js',
+ 'sdk/tabs/observer.js',
+ 'sdk/tabs/tab-fennec.js',
+ 'sdk/tabs/tab-firefox.js',
+ 'sdk/tabs/tab.js',
+ 'sdk/tabs/tabs-firefox.js',
+ 'sdk/tabs/utils.js',
+ 'sdk/tabs/worker.js',
+]
- EXTRA_JS_MODULES.commonjs.sdk.test += [
- 'sdk/test/assert.js',
- 'sdk/test/harness.js',
- 'sdk/test/httpd.js',
- 'sdk/test/loader.js',
- 'sdk/test/memory.js',
- 'sdk/test/options.js',
- 'sdk/test/runner.js',
- 'sdk/test/utils.js',
- ]
+EXTRA_JS_MODULES.commonjs.sdk.test += [
+ 'sdk/test/assert.js',
+ 'sdk/test/harness.js',
+ 'sdk/test/httpd.js',
+ 'sdk/test/loader.js',
+ 'sdk/test/memory.js',
+ 'sdk/test/options.js',
+ 'sdk/test/runner.js',
+ 'sdk/test/utils.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.ui += [
+ 'sdk/ui/component.js',
+ 'sdk/ui/frame.js',
+ 'sdk/ui/id.js',
+ 'sdk/ui/sidebar.js',
+ 'sdk/ui/state.js',
+ 'sdk/ui/toolbar.js',
+]
+if CONFIG['MC_PALEMOON']:
EXTRA_JS_MODULES.commonjs.sdk.ui += [
- 'sdk/ui/component.js',
- 'sdk/ui/frame.js',
- 'sdk/ui/id.js',
- 'sdk/ui/sidebar.js',
- 'sdk/ui/state.js',
- 'sdk/ui/toolbar.js',
+ 'sdk/ui/buttons.js',
]
- if CONFIG['MC_PALEMOON']:
- EXTRA_JS_MODULES.commonjs.sdk.ui += [
- 'sdk/ui/buttons.js',
- ]
-
- EXTRA_JS_MODULES.commonjs.sdk.ui.button += [
- 'sdk/ui/button/action.js',
- 'sdk/ui/button/contract.js',
- 'sdk/ui/button/toggle.js',
- ]
+EXTRA_JS_MODULES.commonjs.sdk.ui.button += [
+ 'sdk/ui/button/action.js',
+ 'sdk/ui/button/contract.js',
+ 'sdk/ui/button/toggle.js',
+]
- EXTRA_PP_JS_MODULES.commonjs.sdk.ui.button += [
- 'sdk/ui/button/view.js',
- ]
+EXTRA_PP_JS_MODULES.commonjs.sdk.ui.button += [
+ 'sdk/ui/button/view.js',
+]
- EXTRA_JS_MODULES.commonjs.sdk.ui.sidebar += [
- 'sdk/ui/sidebar/actions.js',
- 'sdk/ui/sidebar/contract.js',
- 'sdk/ui/sidebar/namespace.js',
- 'sdk/ui/sidebar/utils.js',
- 'sdk/ui/sidebar/view.js',
- ]
+EXTRA_JS_MODULES.commonjs.sdk.ui.sidebar += [
+ 'sdk/ui/sidebar/actions.js',
+ 'sdk/ui/sidebar/contract.js',
+ 'sdk/ui/sidebar/namespace.js',
+ 'sdk/ui/sidebar/utils.js',
+ 'sdk/ui/sidebar/view.js',
+]
- EXTRA_JS_MODULES.commonjs.sdk.window += [
- 'sdk/window/browser.js',
- 'sdk/window/events.js',
- 'sdk/window/helpers.js',
- 'sdk/window/namespace.js',
- 'sdk/window/utils.js',
- ]
+EXTRA_JS_MODULES.commonjs.sdk.window += [
+ 'sdk/window/browser.js',
+ 'sdk/window/events.js',
+ 'sdk/window/helpers.js',
+ 'sdk/window/namespace.js',
+ 'sdk/window/utils.js',
+]
- EXTRA_JS_MODULES.commonjs.sdk.windows += [
- 'sdk/windows/fennec.js',
- 'sdk/windows/firefox.js',
- 'sdk/windows/observer.js',
- 'sdk/windows/tabs-fennec.js',
- ]
+EXTRA_JS_MODULES.commonjs.sdk.windows += [
+ 'sdk/windows/fennec.js',
+ 'sdk/windows/firefox.js',
+ 'sdk/windows/observer.js',
+ 'sdk/windows/tabs-fennec.js',
+]
EXTRA_JS_MODULES.commonjs += [
'index.js',
diff --git a/toolkit/jetpack/sdk/lang/weak-set.js b/toolkit/jetpack/sdk/lang/weak-set.js
index 8972602a5..0b81a395b 100644
--- a/toolkit/jetpack/sdk/lang/weak-set.js
+++ b/toolkit/jetpack/sdk/lang/weak-set.js
@@ -2,12 +2,12 @@
* 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"
};
-"use strict";
-
const { Cu } = require("chrome");
function makeGetterFor(Type) {
diff --git a/toolkit/jetpack/sdk/ui/buttons.js b/toolkit/jetpack/sdk/ui/buttons.js
index 66e0fd742..6aaed3865 100644
--- a/toolkit/jetpack/sdk/ui/buttons.js
+++ b/toolkit/jetpack/sdk/ui/buttons.js
@@ -50,7 +50,7 @@ function insertButton(aWindow, id, onBuild) {
let toolbar = toolbarId != "" && doc.getElementById(toolbarId);
if (toolbar) {
- let nextItem = doc.getElementById(nextItemId);
+ let nextItem = nextItemId != "" && doc.getElementById(nextItemId);
// If nextItem not in toolbar then retrieve it by reading currentset attribute
if (!(nextItem && nextItem.parentNode && nextItem.parentNode.id == toolbarId)) {
nextItem = null;
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-12 18:17:38 +0000