Bug 1263140 - fix notified button name in SDK native-options module. r=mossop
MozReview-Commit-ID: DS6hX5SemJA
--- a/addon-sdk/source/lib/sdk/preferences/native-options.js
+++ b/addon-sdk/source/lib/sdk/preferences/native-options.js
@@ -128,19 +128,19 @@ function setDefaults(preferences, prefer
}
exports.setDefaults = setDefaults;
// dynamically injects inline options into about:addons page at runtime
// NOTE: on Firefox Desktop the about:addons page is a xul page document,
// on Firefox for Android the about:addons page is an xhtml page, to support both
// the XUL xml namespace have to be enforced.
function injectOptions({ preferences, preferencesBranch, document, parent, id }) {
- for (let { name, type, hidden, title, description, label, options, on, off } of preferences) {
+ preferences.forEach(({name, type, hidden, title, description, label, options, on, off}) => {
if (hidden) {
- continue;
+ return;
}
let setting = document.createElementNS(XUL_NS, 'setting');
setting.setAttribute('pref-name', name);
setting.setAttribute('data-jetpack-id', id);
setting.setAttribute('pref', 'extensions.' + preferencesBranch + '.' + name);
setting.setAttribute('type', type);
setting.setAttribute('title', title);
@@ -183,11 +183,11 @@ function injectOptions({ preferences, pr
radio.setAttribute('value', value);
radio.setAttribute('label', label);
radiogroup.appendChild(radio);
}
setting.appendChild(radiogroup);
}
parent.appendChild(setting);
- }
+ });
}
exports.injectOptions = injectOptions;
--- a/addon-sdk/source/test/addons/simple-prefs/package.json
+++ b/addon-sdk/source/test/addons/simple-prefs/package.json
@@ -10,23 +10,23 @@
{
"description": "How many of them we have.",
"name": "myInteger",
"type": "integer",
"value": 8,
"title": "my-int"
},
{
+ "name": "sayHello",
+ "type": "control",
+ "label": "Click me!",
+ "title": "hello"
+ },
+ {
"name": "myHiddenInt",
"type": "integer",
"hidden": true,
"value": 5,
"title": "hidden-int"
- },
- {
- "name": "sayHello",
- "type": "control",
- "label": "Click me!",
- "title": "hello"
}],
"main": "./lib/main.js",
"version": "0.0.1"
}