Bug 1263140 - fix notified button name in SDK native-options module. r=mossop draft
authorLuca Greco <lgreco@mozilla.com>
Fri, 08 Apr 2016 14:00:52 +0200
changeset 348958 b8cad96f7347bdf8f2f2758796d99450039aae5e
parent 348900 5ae810198a9c8c7f4e75cd0881bfc8d1295cbc8d
child 517990 1eec772bab7d487fde84a5378e48ce83c3fcf661
push id14977
push userluca.greco@alcacoop.it
push dateFri, 08 Apr 2016 17:14:19 +0000
reviewersmossop
bugs1263140
milestone48.0a1
Bug 1263140 - fix notified button name in SDK native-options module. r=mossop MozReview-Commit-ID: DS6hX5SemJA
addon-sdk/source/lib/sdk/preferences/native-options.js
addon-sdk/source/test/addons/simple-prefs/package.json
--- 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"
 }