[Pkg-mozext-commits] [requestpolicy] 196/280: don't use loadSubScriptWithOptions for now

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository requestpolicy.

commit a59d7b3245df6afd12ad6b4c803bdf6a8cb817ec
Author: Martin Kimmerle <dev at 256k.de>
Date:   Sat Jan 31 16:19:40 2015 +0100

    don't use loadSubScriptWithOptions for now
    
    The `loadSubScriptWithOptions()` function of
    `mozIJSSubScriptLoader` has been used for some testing, but
    is not needed. As that function requires Gecko 28, this
    commit reverts to the usage of `loadSubScript`.
    
    RP currently requires at least Gecko 16 (Firefox 16).
---
 src/content/lib/policy-manager.jsm    |  5 ++---
 src/content/lib/request-processor.jsm | 10 ++++------
 src/content/lib/utils/xul.jsm         |  4 ++--
 src/content/main/pref-manager.jsm     |  4 ++--
 src/content/main/window-manager.jsm   | 20 ++++++++++----------
 src/content/ui/frame.js               |  8 ++++----
 6 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/src/content/lib/policy-manager.jsm b/src/content/lib/policy-manager.jsm
index 3dcf0d3..0035a41 100644
--- a/src/content/lib/policy-manager.jsm
+++ b/src/content/lib/policy-manager.jsm
@@ -348,6 +348,5 @@ let PolicyManager = (function(self) {
 }(PolicyManager || {}));
 
 
-Services.scriptloader.loadSubScriptWithOptions(
-    "chrome://requestpolicy/content/lib/policy-manager.alias-functions.js",
-    {/*ignoreCache: true*/});
+Services.scriptloader.loadSubScript(
+    "chrome://requestpolicy/content/lib/policy-manager.alias-functions.js");
diff --git a/src/content/lib/request-processor.jsm b/src/content/lib/request-processor.jsm
index c33a1a8..03d832a 100644
--- a/src/content/lib/request-processor.jsm
+++ b/src/content/lib/request-processor.jsm
@@ -1083,9 +1083,7 @@ let RequestProcessor = (function(self) {
 }(RequestProcessor || {}));
 
 
-Services.scriptloader.loadSubScriptWithOptions(
-    'chrome://requestpolicy/content/lib/request-processor.redirects.js',
-    {/*ignoreCache: true*/});
-Services.scriptloader.loadSubScriptWithOptions(
-    'chrome://requestpolicy/content/lib/request-processor.compat.js',
-    {/*ignoreCache: true*/});
+Services.scriptloader.loadSubScript(
+    'chrome://requestpolicy/content/lib/request-processor.redirects.js');
+Services.scriptloader.loadSubScript(
+    'chrome://requestpolicy/content/lib/request-processor.compat.js');
diff --git a/src/content/lib/utils/xul.jsm b/src/content/lib/utils/xul.jsm
index 67993cc..877e98a 100644
--- a/src/content/lib/utils/xul.jsm
+++ b/src/content/lib/utils/xul.jsm
@@ -46,9 +46,9 @@ let xulTreesScope = {
   "appID": Services.appinfo.ID
 };
 
-Services.scriptloader.loadSubScriptWithOptions(
+Services.scriptloader.loadSubScript(
     'chrome://requestpolicy/content/ui/xul-trees.js',
-    {target: xulTreesScope/*, ignoreCache: true*/});
+    xulTreesScope);
 
 
 function getParentElement(doc, element) {
diff --git a/src/content/main/pref-manager.jsm b/src/content/main/pref-manager.jsm
index 49a548e..74cb485 100644
--- a/src/content/main/pref-manager.jsm
+++ b/src/content/main/pref-manager.jsm
@@ -84,9 +84,9 @@ let PrefManager = (function() {
     // to handle their default preferences manually, see Mozilla Bug 564675:
     // https://bugzilla.mozilla.org/show_bug.cgi?id=564675
     // The scope of that script doesn't need to be remembered.
-    Services.scriptloader.loadSubScriptWithOptions(
+    Services.scriptloader.loadSubScript(
         "chrome://requestpolicy/content/main/default-pref-handler.js",
-        {target: {}/*, ignoreCache: true*/});
+        {});
 
 
     // ================================
diff --git a/src/content/main/window-manager.jsm b/src/content/main/window-manager.jsm
index 86ff46e..4be3623 100644
--- a/src/content/main/window-manager.jsm
+++ b/src/content/main/window-manager.jsm
@@ -44,9 +44,9 @@ let rpWindowManager = (function(self) {
   ], globalScope);
 
   // import the WindowListener
-  Services.scriptloader.loadSubScriptWithOptions(
+  Services.scriptloader.loadSubScript(
       "chrome://requestpolicy/content/main/window-manager.listener.js",
-      {target: globalScope/*, ignoreCache: true*/});
+      globalScope);
 
   let styleSheets = [
     "chrome://requestpolicy/skin/requestpolicy.css",
@@ -80,15 +80,15 @@ let rpWindowManager = (function(self) {
     // # 3 : load the overlay's and menu's javascript
     // ----------------------------------------------
     try {
-      Services.scriptloader.loadSubScriptWithOptions(
+      Services.scriptloader.loadSubScript(
           "chrome://requestpolicy/content/ui/overlay.js",
-          {target: window/*, ignoreCache: true*/});
-      Services.scriptloader.loadSubScriptWithOptions(
+          window);
+      Services.scriptloader.loadSubScript(
           "chrome://requestpolicy/content/ui/menu.js",
-          {target: window/*, ignoreCache: true*/});
-      Services.scriptloader.loadSubScriptWithOptions(
+          window);
+      Services.scriptloader.loadSubScript(
           "chrome://requestpolicy/content/ui/classicmenu.js",
-          {target: window/*, ignoreCache: true*/});
+          window);
     } catch (e) {
       Logger.warning(Logger.TYPE_ERROR,
                      "Error loading subscripts for window: " + e, e);
@@ -228,6 +228,6 @@ let rpWindowManager = (function(self) {
 
 
 // extend rpWindowManager
-Services.scriptloader.loadSubScriptWithOptions(
+Services.scriptloader.loadSubScript(
     "chrome://requestpolicy/content/main/window-manager-toolbarbutton.js",
-    {target: globalScope/*, ignoreCache: true*/});
+    globalScope);
diff --git a/src/content/ui/frame.js b/src/content/ui/frame.js
index 66217a7..4ddc90e 100644
--- a/src/content/ui/frame.js
+++ b/src/content/ui/frame.js
@@ -76,12 +76,12 @@ Components.utils.import("resource://gre/modules/devtools/Console.jsm");
   };
 
   function loadSubScripts() {
-    Services.scriptloader.loadSubScriptWithOptions(
+    Services.scriptloader.loadSubScript(
         'chrome://requestpolicy/content/ui/frame.blocked-content.js',
-        {target: framescriptScope/*, ignoreCache: true*/});
-    Services.scriptloader.loadSubScriptWithOptions(
+        framescriptScope);
+    Services.scriptloader.loadSubScript(
         'chrome://requestpolicy/content/ui/frame.dom-content-loaded.js',
-        {target: framescriptScope/*, ignoreCache: true*/});
+        framescriptScope);
   }
   framescriptEnv.addStartupFunction(Environment.LEVELS.ESSENTIAL,
                                     loadSubScripts);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git