[Pkg-mozext-commits] [requestpolicy] 154/280: [refact] coding style of importing ScriptLoader
David Prévot
taffit at moszumanska.debian.org
Sat May 2 20:30:15 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 6cd8a322a1dfe80de658020fe3af4c9e3c4180ca
Author: Martin Kimmerle <dev at 256k.de>
Date: Sun Jan 18 19:27:32 2015 +0100
[refact] coding style of importing ScriptLoader
---
src/content/ui/classicmenu.js | 7 +++----
src/content/ui/menu.js | 7 +++----
src/content/ui/overlay.js | 10 ++++------
src/content/ui/request-log.filtering.js | 8 +++-----
src/content/ui/request-log.interface.js | 8 +++-----
src/content/ui/request-log.js | 7 +++----
src/content/ui/request-log.tree-view.js | 7 +++----
7 files changed, 22 insertions(+), 32 deletions(-)
diff --git a/src/content/ui/classicmenu.js b/src/content/ui/classicmenu.js
index a6cc59d..0915048 100644
--- a/src/content/ui/classicmenu.js
+++ b/src/content/ui/classicmenu.js
@@ -32,12 +32,11 @@ requestpolicy.classicmenu = (function() {
const Cu = Components.utils;
- let ScriptLoader;
- {
+ let {ScriptLoader} = (function() {
let mod = {};
Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
- ScriptLoader = mod.ScriptLoader;
- }
+ return mod;
+ }());
let {rpPrefBranch} = ScriptLoader.importModule("lib/prefs");
let {StringUtils} = ScriptLoader.importModule("lib/utils/strings");
diff --git a/src/content/ui/menu.js b/src/content/ui/menu.js
index 4feaae3..7122152 100644
--- a/src/content/ui/menu.js
+++ b/src/content/ui/menu.js
@@ -29,12 +29,11 @@ requestpolicy.menu = (function() {
const Cu = Components.utils;
- let ScriptLoader;
- {
+ let {ScriptLoader} = (function() {
let mod = {};
Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
- ScriptLoader = mod.ScriptLoader;
- }
+ return mod;
+ }());
// iMod: Alias for ScriptLoader.importModule
let iMod = ScriptLoader.importModule;
let {Logger} = iMod("lib/logger");
diff --git a/src/content/ui/overlay.js b/src/content/ui/overlay.js
index 3b162a4..e5586a4 100644
--- a/src/content/ui/overlay.js
+++ b/src/content/ui/overlay.js
@@ -32,14 +32,12 @@ requestpolicy.overlay = (function() {
const Cc = Components.classes;
const Cu = Components.utils;
- Cu.import("resource://gre/modules/Services.jsm");
-
- let ScriptLoader;
- {
+ let {ScriptLoader} = (function() {
let mod = {};
Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
- ScriptLoader = mod.ScriptLoader;
- }
+ return mod;
+ }());
+
// iMod: Alias for ScriptLoader.importModule
let iMod = ScriptLoader.importModule;
let {Environment} = iMod("lib/environment");
diff --git a/src/content/ui/request-log.filtering.js b/src/content/ui/request-log.filtering.js
index 30fb09c..2908378 100644
--- a/src/content/ui/request-log.filtering.js
+++ b/src/content/ui/request-log.filtering.js
@@ -28,14 +28,12 @@ window.requestpolicy.requestLog = (function (self) {
const Cc = Components.classes;
const Cu = Components.utils;
- let ScriptLoader, Services;
- {
+ let {ScriptLoader, Services} = (function() {
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;
- }
+ return mod;
+ }());
let {WindowUtils} = ScriptLoader.importModule("lib/utils/windows");
let filterText = null;
diff --git a/src/content/ui/request-log.interface.js b/src/content/ui/request-log.interface.js
index 8c8fd03..941346b 100644
--- a/src/content/ui/request-log.interface.js
+++ b/src/content/ui/request-log.interface.js
@@ -29,14 +29,12 @@ window.requestpolicy.requestLog = (function (self) {
const Cc = Components.classes;
const Cu = Components.utils;
- let ScriptLoader, Services;
- {
+ let {ScriptLoader, Services} = (function() {
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;
- }
+ return mod;
+ }());
let {DomainUtil} = ScriptLoader.importModule("lib/utils/domains");
let {StringUtils} = ScriptLoader.importModule("lib/utils/strings");
let {Utils} = ScriptLoader.importModule("lib/utils");
diff --git a/src/content/ui/request-log.js b/src/content/ui/request-log.js
index fb66f24..52a1bc4 100644
--- a/src/content/ui/request-log.js
+++ b/src/content/ui/request-log.js
@@ -29,12 +29,11 @@ window.requestpolicy.requestLog = (function (self) {
const Cc = Components.classes;
const Cu = Components.utils;
- let ScriptLoader;
- {
+ let {ScriptLoader} = (function() {
let mod = {};
Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
- ScriptLoader = mod.ScriptLoader;
- }
+ return mod;
+ }());
let {StringUtils} = ScriptLoader.importModule("lib/utils/strings");
let {WindowUtils} = ScriptLoader.importModule("lib/utils/windows");
diff --git a/src/content/ui/request-log.tree-view.js b/src/content/ui/request-log.tree-view.js
index 2f639cc..6f87f0d 100644
--- a/src/content/ui/request-log.tree-view.js
+++ b/src/content/ui/request-log.tree-view.js
@@ -30,12 +30,11 @@ window.requestpolicy.requestLog = (function (self) {
const Cu = Components.utils;
- let ScriptLoader;
- {
+ let {ScriptLoader} = (function() {
let mod = {};
Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
- ScriptLoader = mod.ScriptLoader;
- }
+ return mod;
+ }());
let {StringUtils} = ScriptLoader.importModule("lib/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