[Pkg-mozext-commits] [requestpolicy] 92/280: [refact] use importModule() in Window environment
David Prévot
taffit at moszumanska.debian.org
Sat May 2 20:30:04 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository requestpolicy.
commit cb6bd395681a48a540e55fad67a871aa329ea43b
Author: Martin Kimmerle <dev at 256k.de>
Date: Thu Jan 1 08:02:40 2015 +0100
[refact] use importModule() in Window environment
---
src/content/lib/logger.jsm | 4 +-
src/content/ui/classicmenu.js | 15 +++---
src/content/ui/frame.dom-content-loaded.js | 16 ++++--
src/content/ui/menu.js | 80 ++++++++++++++----------------
src/content/ui/overlay.js | 35 +++++++------
src/content/ui/request-log.filtering.js | 16 +++---
src/content/ui/request-log.interface.js | 21 ++++----
src/content/ui/request-log.js | 15 +++---
src/content/ui/request-log.tree-view.js | 12 +++--
9 files changed, 112 insertions(+), 102 deletions(-)
diff --git a/src/content/lib/logger.jsm b/src/content/lib/logger.jsm
index d517230..f7e5f71 100644
--- a/src/content/lib/logger.jsm
+++ b/src/content/lib/logger.jsm
@@ -111,8 +111,8 @@ let Logger = (function() {
if (!ScriptLoader) {
// try to import the ScriptLoader
try {
- // We can't import the ScriptLoader when the Logger is loaded, because the
- // Logger gets imported by the ScriptLoader itself on startup.
+ // We can't import the ScriptLoader when the Logger is loaded, because
+ // the Logger gets imported by the ScriptLoader itself on startup.
let mod = {};
Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
ScriptLoader = mod.ScriptLoader;
diff --git a/src/content/ui/classicmenu.js b/src/content/ui/classicmenu.js
index 984f7bf..8d88be9 100644
--- a/src/content/ui/classicmenu.js
+++ b/src/content/ui/classicmenu.js
@@ -32,13 +32,14 @@ requestpolicy.classicmenu = (function() {
const Cu = Components.utils;
- let mod = {};
- Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
- ScriptLoader.importModules([
- "prefs",
- "utils/strings"
- ], mod);
- let rpPrefBranch = mod.rpPrefBranch, StringUtils = mod.StringUtils;
+ let ScriptLoader;
+ {
+ let mod = {};
+ Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
+ ScriptLoader = mod.ScriptLoader;
+ }
+ let {rpPrefBranch} = ScriptLoader.importModule("prefs");
+ let {StringUtils} = ScriptLoader.importModule("utils/strings");
/**
diff --git a/src/content/ui/frame.dom-content-loaded.js b/src/content/ui/frame.dom-content-loaded.js
index e442d3a..f947a00 100644
--- a/src/content/ui/frame.dom-content-loaded.js
+++ b/src/content/ui/frame.dom-content-loaded.js
@@ -26,12 +26,18 @@ var MMID = "requestpolicy at requestpolicy.com";
let ManagerForDOMContentLoaded = (function() {
let self = {};
- let mod = {};
const Ci = Components.interfaces;
const Cc = Components.classes;
const Cu = Components.utils;
- Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
- mod.ScriptLoader.importModules(["utils/domains", "logger"], mod);
+
+ let ScriptLoader;
+ {
+ let mod = {};
+ Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
+ ScriptLoader = mod.ScriptLoader;
+ }
+ let {DomainUtil} = ScriptLoader.importModule("utils/domains");
+ let {Logger} = ScriptLoader.importModule("logger");
function htmlAnchorTagClicked(event) {
@@ -144,10 +150,10 @@ let ManagerForDOMContentLoaded = (function() {
// The dest may be empty if the origin is what should be refreshed. This
// will be handled by DomainUtil.determineRedirectUri().
- let {delay, destURI} = mod.DomainUtil.parseRefresh(metaTag.content);
+ let {delay, destURI} = DomainUtil.parseRefresh(metaTag.content);
// If destURI isn't a valid uri, assume it's a relative uri.
- if (!mod.DomainUtil.isValidUri(destURI)) {
+ if (!DomainUtil.isValidUri(destURI)) {
originalDestURI = destURI;
destURI = document.documentURIObject.resolve(destURI);
}
diff --git a/src/content/ui/menu.js b/src/content/ui/menu.js
index 7305708..0f28914 100644
--- a/src/content/ui/menu.js
+++ b/src/content/ui/menu.js
@@ -29,30 +29,26 @@ requestpolicy.menu = (function() {
const Cu = Components.utils;
- let mod = {};
- Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
- ScriptLoader.importModules([
- "logger",
- "prefs",
- "request-processor",
- "policy-manager",
- "utils/domains",
- "ruleset",
- "gui-location",
- "utils/strings",
- "utils/dom",
-
- "requestpolicy-service",
- "constants"
- ], mod);
- let Logger = mod.Logger, rpPrefBranch = mod.rpPrefBranch, Prefs = mod.Prefs,
- RequestProcessor = mod.RequestProcessor,
- PolicyManager = mod.PolicyManager, DomainUtil = mod.DomainUtil,
- Ruleset = mod.Ruleset, GUILocation = mod.GUILocation,
- GUIOrigin = mod.GUIOrigin, GUIDestination = mod.GUIDestination,
- GUILocationProperties = mod.GUILocationProperties,
- StringUtils = mod.StringUtils, DOMUtils = mod.DOMUtils,
- rpService = mod.rpService;
+ let ScriptLoader;
+ {
+ let mod = {};
+ Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
+ ScriptLoader = mod.ScriptLoader;
+ }
+ // iMod: Alias for ScriptLoader.importModule
+ let iMod = ScriptLoader.importModule;
+ let {Logger} = iMod("logger");
+ let {rpPrefBranch, Prefs} = iMod("prefs");
+ let {RequestProcessor} = iMod("request-processor");
+ let {PolicyManager} = iMod("policy-manager");
+ let {DomainUtil} = iMod("utils/domains");
+ let {Ruleset} = iMod("ruleset");
+ let {GUIOrigin, GUIDestination,
+ GUILocation, GUILocationProperties} = iMod("gui-location");
+ let {StringUtils} = iMod("utils/strings");
+ let {DOMUtils} = iMod("utils/dom");
+ let {rpService} = iMod("requestpolicy-service");
+ let {RULE_ACTION_ALLOW, RULE_ACTION_DENY} = iMod("constants");
Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
@@ -382,13 +378,13 @@ requestpolicy.menu = (function() {
};
//if (Prefs.isDefaultAllow()) {
if (self._isCurrentlySelectedDestAllowed ||
- (!PolicyManager.ruleExists(mod.RULE_ACTION_DENY, ruleData) &&
- !PolicyManager.ruleExists(mod.RULE_ACTION_DENY, destOnlyRuleData))) {
+ (!PolicyManager.ruleExists(RULE_ACTION_DENY, ruleData) &&
+ !PolicyManager.ruleExists(RULE_ACTION_DENY, destOnlyRuleData))) {
// show "Block requests" if the destination was allowed
// OR if there's no blocking rule (i.e. the request was blocked "by default")
// -- this enables support for blacklisting.
- if (!PolicyManager.ruleExists(mod.RULE_ACTION_ALLOW, ruleData) &&
- !PolicyManager.ruleExists(mod.RULE_ACTION_DENY, ruleData)) {
+ if (!PolicyManager.ruleExists(RULE_ACTION_ALLOW, ruleData) &&
+ !PolicyManager.ruleExists(RULE_ACTION_DENY, ruleData)) {
if (!self._privateBrowsingEnabled) {
var item = self._addMenuItemDenyOriginToDest(
self._addRulesList, ruleData);
@@ -397,8 +393,8 @@ requestpolicy.menu = (function() {
self._addRulesList, ruleData);
}
- if (!PolicyManager.ruleExists(mod.RULE_ACTION_ALLOW, destOnlyRuleData) &&
- !PolicyManager.ruleExists(mod.RULE_ACTION_DENY, destOnlyRuleData)) {
+ if (!PolicyManager.ruleExists(RULE_ACTION_ALLOW, destOnlyRuleData) &&
+ !PolicyManager.ruleExists(RULE_ACTION_DENY, destOnlyRuleData)) {
if (!self._privateBrowsingEnabled) {
var item = self._addMenuItemDenyDest(
self._addRulesList, destOnlyRuleData);
@@ -408,13 +404,13 @@ requestpolicy.menu = (function() {
}
}
if (self._isCurrentlySelectedDestBlocked ||
- (!PolicyManager.ruleExists(mod.RULE_ACTION_ALLOW, ruleData) &&
- !PolicyManager.ruleExists(mod.RULE_ACTION_ALLOW, destOnlyRuleData))) {
+ (!PolicyManager.ruleExists(RULE_ACTION_ALLOW, ruleData) &&
+ !PolicyManager.ruleExists(RULE_ACTION_ALLOW, destOnlyRuleData))) {
// show "Allow requests" if the destination was blocked
// OR if there's no allow-rule (i.e. the request was allowed "by default")
// -- this enables support for whitelisting.
- if (!PolicyManager.ruleExists(mod.RULE_ACTION_ALLOW, ruleData) &&
- !PolicyManager.ruleExists(mod.RULE_ACTION_DENY, ruleData)) {
+ if (!PolicyManager.ruleExists(RULE_ACTION_ALLOW, ruleData) &&
+ !PolicyManager.ruleExists(RULE_ACTION_DENY, ruleData)) {
if (!self._privateBrowsingEnabled) {
var item = self._addMenuItemAllowOriginToDest(
self._addRulesList, ruleData);
@@ -423,8 +419,8 @@ requestpolicy.menu = (function() {
self._addRulesList, ruleData);
}
- if (!PolicyManager.ruleExists(mod.RULE_ACTION_ALLOW, destOnlyRuleData) &&
- !PolicyManager.ruleExists(mod.RULE_ACTION_DENY, destOnlyRuleData)) {
+ if (!PolicyManager.ruleExists(RULE_ACTION_ALLOW, destOnlyRuleData) &&
+ !PolicyManager.ruleExists(RULE_ACTION_DENY, destOnlyRuleData)) {
if (!self._privateBrowsingEnabled) {
var item = self._addMenuItemAllowDest(
self._addRulesList, destOnlyRuleData);
@@ -672,7 +668,7 @@ requestpolicy.menu = (function() {
var result = [];
for (var destBase in requests) {
var properties = new GUILocationProperties();
- properties.accumulate(requests[destBase], mod.RULE_ACTION_DENY);
+ properties.accumulate(requests[destBase], RULE_ACTION_DENY);
result.push(new GUIDestination(destBase, properties));
}
return result;
@@ -695,7 +691,7 @@ requestpolicy.menu = (function() {
}
var properties = new GUILocationProperties();
- properties.accumulate(requests[destBase], mod.RULE_ACTION_ALLOW);
+ properties.accumulate(requests[destBase], RULE_ACTION_ALLOW);
result.push(new GUIDestination(destBase, properties));
}
return result;
@@ -1188,8 +1184,8 @@ requestpolicy.menu = (function() {
'h': destHost
}
};
- if (!PolicyManager.ruleExists(mod.RULE_ACTION_ALLOW, ruleData) &&
- !PolicyManager.ruleExists(mod.RULE_ACTION_DENY, ruleData)) {
+ if (!PolicyManager.ruleExists(RULE_ACTION_ALLOW, ruleData) &&
+ !PolicyManager.ruleExists(RULE_ACTION_DENY, ruleData)) {
if (!self._privateBrowsingEnabled) {
var item = self._addMenuItemAllowOriginToDest(list, ruleData);
}
@@ -1201,8 +1197,8 @@ requestpolicy.menu = (function() {
'h': destHost
}
};
- if (!PolicyManager.ruleExists(mod.RULE_ACTION_ALLOW, destOnlyRuleData) &&
- !PolicyManager.ruleExists(mod.RULE_ACTION_DENY, destOnlyRuleData)) {
+ if (!PolicyManager.ruleExists(RULE_ACTION_ALLOW, destOnlyRuleData) &&
+ !PolicyManager.ruleExists(RULE_ACTION_DENY, destOnlyRuleData)) {
if (!self._privateBrowsingEnabled) {
var item = self._addMenuItemAllowDest(list, destOnlyRuleData);
}
diff --git a/src/content/ui/overlay.js b/src/content/ui/overlay.js
index 81c6171..3234997 100644
--- a/src/content/ui/overlay.js
+++ b/src/content/ui/overlay.js
@@ -34,24 +34,23 @@ requestpolicy.overlay = (function() {
Cu.import("resource://gre/modules/Services.jsm");
- let mod = {};
- Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
- mod.ScriptLoader.importModules([
- "constants",
- "logger",
- "prefs",
- "request-processor",
- "utils/domains",
- "utils/strings",
- "utils/dom",
- "requestpolicy-service",
- "policy-manager"
- ], mod);
- let MMID = mod.MMID, Logger = mod.Logger, rpPrefBranch = mod.rpPrefBranch,
- Prefs = mod.Prefs, RequestProcessor = mod.RequestProcessor,
- DomainUtil = mod.DomainUtil, StringUtils = mod.StringUtils,
- DOMUtils = mod.DOMUtils,
- rpService = mod.rpService, PolicyManager = mod.PolicyManager;
+ let ScriptLoader;
+ {
+ let mod = {};
+ Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
+ ScriptLoader = mod.ScriptLoader;
+ }
+ // iMod: Alias for ScriptLoader.importModule
+ let iMod = ScriptLoader.importModule;
+ let {Logger} = iMod("logger");
+ let {rpPrefBranch, Prefs} = iMod("prefs");
+ let {RequestProcessor} = iMod("request-processor");
+ let {PolicyManager} = iMod("policy-manager");
+ let {DomainUtil} = iMod("utils/domains");
+ let {StringUtils} = iMod("utils/strings");
+ let {DOMUtils} = iMod("utils/dom");
+ let {rpService} = iMod("requestpolicy-service");
+ let {MMID} = iMod("constants");
//let _extensionConflictInfoUri = "http://www.requestpolicy.com/conflict?ext=";
diff --git a/src/content/ui/request-log.filtering.js b/src/content/ui/request-log.filtering.js
index 4aab9d8..c12c022 100644
--- a/src/content/ui/request-log.filtering.js
+++ b/src/content/ui/request-log.filtering.js
@@ -28,13 +28,15 @@ window.requestpolicy.requestLog = (function (self) {
const Cc = Components.classes;
const Cu = Components.utils;
- let mod = {};
- Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
- Cu.import("resource://gre/modules/Services.jsm", mod);
- mod.ScriptLoader.importModules([
- "utils"
- ], mod);
- let Utils = mod.Utils;
+ let ScriptLoader, Services;
+ {
+ let mod = {};
+ Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
+ Cu.import("resource://gre/modules/Services.jsm", mod);
+ ScriptLoader = mod.ScriptLoader;
+ Services = mod.Services;
+ }
+ let {Utils} = ScriptLoader.importModule("utils");
let filterText = null;
diff --git a/src/content/ui/request-log.interface.js b/src/content/ui/request-log.interface.js
index 9af8f19..1a6ef55 100644
--- a/src/content/ui/request-log.interface.js
+++ b/src/content/ui/request-log.interface.js
@@ -29,16 +29,17 @@ window.requestpolicy.requestLog = (function (self) {
const Cc = Components.classes;
const Cu = Components.utils;
- let mod = {};
- Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
- Cu.import("resource://gre/modules/Services.jsm", mod);
- mod.ScriptLoader.importModules([
- "utils/strings",
- "utils/domains",
- "utils"
- ], mod);
- let Services = mod.Services, StringUtils = mod.StringUtils,
- DomainUtil = mod.DomainUtil, Utils = mod.Utils;
+ let ScriptLoader, Services;
+ {
+ let mod = {};
+ Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
+ Cu.import("resource://gre/modules/Services.jsm", mod);
+ ScriptLoader = mod.ScriptLoader;
+ Services = mod.Services;
+ }
+ let {DomainUtil} = ScriptLoader.importModule("utils/domains");
+ let {StringUtils} = ScriptLoader.importModule("utils/strings");
+ let {Utils} = ScriptLoader.importModule("utils");
diff --git a/src/content/ui/request-log.js b/src/content/ui/request-log.js
index 8ab467f..c4745fb 100644
--- a/src/content/ui/request-log.js
+++ b/src/content/ui/request-log.js
@@ -29,13 +29,14 @@ window.requestpolicy.requestLog = (function (self) {
const Cc = Components.classes;
const Cu = Components.utils;
- let mod = {};
- Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
- mod.ScriptLoader.importModules([
- "utils/strings",
- "utils"
- ], mod);
- let StringUtils = mod.StringUtils, Utils = mod.Utils;
+ let ScriptLoader;
+ {
+ let mod = {};
+ Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
+ ScriptLoader = mod.ScriptLoader;
+ }
+ let {StringUtils} = ScriptLoader.importModule("utils/strings");
+ let {Utils} = ScriptLoader.importModule("utils");
self.isEmptyMessageDisplayed = true;
diff --git a/src/content/ui/request-log.tree-view.js b/src/content/ui/request-log.tree-view.js
index 15810fe..4788d9f 100644
--- a/src/content/ui/request-log.tree-view.js
+++ b/src/content/ui/request-log.tree-view.js
@@ -29,10 +29,14 @@ window.requestpolicy.requestLog = (function (self) {
const Cc = Components.classes;
const Cu = Components.utils;
- let mod = {};
- Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
- mod.ScriptLoader.importModules(["utils/strings"], mod);
- let StringUtils = mod.StringUtils;
+
+ let ScriptLoader;
+ {
+ let mod = {};
+ Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
+ ScriptLoader = mod.ScriptLoader;
+ }
+ let {StringUtils} = ScriptLoader.importModule("utils/strings");
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git
More information about the Pkg-mozext-commits
mailing list