Bug 1013510 - Uplift Add-on SDK to Firefox r=me

Brli · May 21, 2014 · 8fe5289 · 8fe5289
1 parent 76cc54b
commit 8fe5289
Show file tree

Hide file tree

Showing 30 changed files with 945 additions and 698 deletions.
diff --git a/addon-sdk/source/app-extension/install.rdf b/addon-sdk/source/app-extension/install.rdf
@@ -27,6 +27,7 @@
     <em:creator>Mozilla Corporation</em:creator>
     <em:homepageURL></em:homepageURL>
     <em:optionsType></em:optionsType>
+    <em:optionsURL></em:optionsURL>
     <em:updateURL></em:updateURL>
   </Description>
 </RDF>
diff --git a/addon-sdk/source/lib/sdk/addon/runner.js b/addon-sdk/source/lib/sdk/addon/runner.js
@@ -12,7 +12,7 @@ const { once } = require('../system/events');
 const { exit, env, staticArgs } = require('../system');
 const { when: unload } = require('../system/unload');
 const { loadReason } = require('../self');
-const { rootURI } = require("@loader/options");
+const { rootURI, metadata: { preferences } } = require("@loader/options");
 const globals = require('../system/globals');
 const xulApp = require('../system/xul-app');
 const appShellService = Cc['@mozilla.org/appshell/appShellService;1'].
@@ -129,20 +129,40 @@ function run(options) {
     catch(error) {
       console.exception(error);
     }
-    // Initialize inline options localization, without preventing addon to be
-    // run in case of error
-    try {
-      require('../l10n/prefs');
-    }
-    catch(error) {
-      console.exception(error);
-    }
 
-    // TODO: When bug 564675 is implemented this will no longer be needed
-    // Always set the default prefs, because they disappear on restart
-    if (options.prefsURI) {
-      // Only set if `prefsURI` specified
-      setDefaultPrefs(options.prefsURI);
+    // native-options does stuff directly with preferences key from package.json
+    if (preferences && preferences.length > 0) {
+      try {
+        require('../preferences/native-options').enable(preferences);
+      } 
+      catch (error) {
+        console.exception(error); 
+      }
+    } 
+    else {
+      // keeping support for addons packaged with older SDK versions, 
+      // when cfx didn't include the 'preferences' key in @loader/options
+
+      // Initialize inline options localization, without preventing addon to be
+      // run in case of error
+      try {
+        require('../l10n/prefs').enable();
+      }
+      catch(error) {
+        console.exception(error);
+      }
+
+      // TODO: When bug 564675 is implemented this will no longer be needed
+      // Always set the default prefs, because they disappear on restart
+      if (options.prefsURI) {
+        // Only set if `prefsURI` specified
+        try {
+          setDefaultPrefs(options.prefsURI);
+        } 
+        catch (err) {
+          // cfx bootstrap always passes prefsURI, even in addons without prefs
+        }
+      }
     }
 
     // this is where the addon's main.js finally run.

diff --git a/addon-sdk/source/lib/sdk/event/target.js b/addon-sdk/source/lib/sdk/event/target.js
@@ -9,7 +9,7 @@ module.metadata = {
 };
 
 const { on, once, off, setListeners } = require('./core');
-const { method, chainable } = require('../lang/functional');
+const { method, chainable } = require('../lang/functional/core');
 const { Class } = require('../core/heritage');
 
 /**

diff --git a/addon-sdk/source/lib/sdk/l10n/prefs.js b/addon-sdk/source/lib/sdk/l10n/prefs.js
@@ -5,13 +5,22 @@
 
 const { on } = require("../system/events");
 const core = require("./core");
-const { id: jetpackId} = require('../self');
+const { id: jetpackId } = require('../self');
 
 const OPTIONS_DISPLAYED = "addon-options-displayed";
 
+function enable() {
+  on(OPTIONS_DISPLAYED, onOptionsDisplayed);  
+}
+exports.enable = enable;
+
 function onOptionsDisplayed({ subject: document, data: addonId }) {
   if (addonId !== jetpackId)
     return;
+  localizeInlineOptions(document);
+}
+
+function localizeInlineOptions(document) {
   let query = 'setting[data-jetpack-id="' + jetpackId + '"][pref-name], ' +
               'button[data-jetpack-id="' + jetpackId + '"][pref-name]';
   let nodes = document.querySelectorAll(query);
@@ -39,4 +48,4 @@ function onOptionsDisplayed({ subject: document, data: addonId }) {
     }
   }
 }
-on(OPTIONS_DISPLAYED, onOptionsDisplayed);
+exports.localizeInlineOptions = localizeInlineOptions;