summaryrefslogtreecommitdiffstats
path: root/toolkit/jetpack
diff options
context:
space:
mode:
authorNew Tobin Paradigm <email@mattatobin.com>2018-04-21 20:02:56 -0400
committerGitHub <noreply@github.com>2018-04-21 20:02:56 -0400
commit747b7a9cc4ee5e96ac42f19ed4a8a56a2f7d0103 (patch)
tree8d3d6f9a3fcddecc5395194ef2d9a0f61e0769b6 /toolkit/jetpack
parent0a744b1cfeecdd2487d9166792ac5234edc9ee6a (diff)
parent54db9d2005c9e0450c902805c7a94fbda12f46cb (diff)
downloadUXP-747b7a9cc4ee5e96ac42f19ed4a8a56a2f7d0103.tar
UXP-747b7a9cc4ee5e96ac42f19ed4a8a56a2f7d0103.tar.gz
UXP-747b7a9cc4ee5e96ac42f19ed4a8a56a2f7d0103.tar.lz
UXP-747b7a9cc4ee5e96ac42f19ed4a8a56a2f7d0103.tar.xz
UXP-747b7a9cc4ee5e96ac42f19ed4a8a56a2f7d0103.zip
Merge pull request #226 from JustOff/PR_PMkit_part3
Make Add-on SDK (Jetpack) work on Pale Moon || Part 3
Diffstat (limited to 'toolkit/jetpack')
-rw-r--r--toolkit/jetpack/sdk/panel.js1
-rw-r--r--toolkit/jetpack/sdk/ui/button/view.js4
2 files changed, 2 insertions, 3 deletions
diff --git a/toolkit/jetpack/sdk/panel.js b/toolkit/jetpack/sdk/panel.js
index 4b625799d..34cde2edd 100644
--- a/toolkit/jetpack/sdk/panel.js
+++ b/toolkit/jetpack/sdk/panel.js
@@ -8,6 +8,7 @@
module.metadata = {
"stability": "stable",
"engines": {
+ "Palemoon": "*",
"Firefox": "*",
"SeaMonkey": "*"
}
diff --git a/toolkit/jetpack/sdk/ui/button/view.js b/toolkit/jetpack/sdk/ui/button/view.js
index 552aab2f7..dcc3be59d 100644
--- a/toolkit/jetpack/sdk/ui/button/view.js
+++ b/toolkit/jetpack/sdk/ui/button/view.js
@@ -141,11 +141,11 @@ function create(options) {
CustomizableUI.createWidget({
#endif
id: id,
+ type: 'custom',
#ifdef MC_PALEMOON
onBuild: function(document, _id) {
#else
- type: 'custom',
removable: true,
defaultArea: AREA_NAVBAR,
allowedAreas: [ AREA_PANEL, AREA_NAVBAR ],
@@ -167,9 +167,7 @@ function create(options) {
node.setAttribute('id', this.id);
#endif
node.setAttribute('class', 'toolbarbutton-1 chromeclass-toolbar-additional badged-button');
-#ifndef MC_PALEMOON
node.setAttribute('type', type);
-#endif
node.setAttribute('label', label);
node.setAttribute('tooltiptext', label);
node.setAttribute('image', image);