diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-14 10:50:01 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-14 10:50:01 +0200 |
| commit | e9dd029f5d00590e1a53e63b0ab805110a10b54c (patch) | |
| tree | 1126ca5dda925a62be3dc12c99c90e953d08afcf /toolkit/jetpack/sdk | |
| parent | 9d6a7ae25d7f5da855a8f8df884de483b4e2a538 (diff) | |
| parent | 36b8fd734f590eb726ca2e50f8d1ff9cc968b8e1 (diff) | |
| download | UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.tar UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.tar.gz UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.tar.lz UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.tar.xz UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.zip | |
Merge branch 'master' into Basilisk-release
Diffstat (limited to 'toolkit/jetpack/sdk')
| -rw-r--r-- | toolkit/jetpack/sdk/lang/weak-set.js | 4 | ||||
| -rw-r--r-- | toolkit/jetpack/sdk/ui/buttons.js | 2 |
2 files changed, 3 insertions, 3 deletions
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; |