[Pkg-mozext-commits] [requestpolicy] 22/50: [fix] Console.jsm: import via RPService2
David Prévot
taffit at moszumanska.debian.org
Mon Jun 27 12:50:31 UTC 2016
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository requestpolicy.
commit fdd5916078813c4b85ed1c6e7e106cb1234ef6b8
Author: Martin Kimmerle <dev at 256k.de>
Date: Thu Apr 21 15:57:55 2016 +0200
[fix] Console.jsm: import via RPService2
---
src/content/lib/classes/keyboard-shortcut.jsm | 3 +-
src/content/lib/environment.jsm | 2 +-
src/content/lib/environment.process.js | 3 +-
src/content/lib/script-loader.jsm | 7 ++-
src/content/lib/utils.jsm | 2 +-
src/content/lib/utils/info.jsm | 9 +---
src/content/main/about-uri.jsm | 4 +-
src/content/main/pref-manager.jsm | 2 +-
src/content/main/rp-service-2.jsm | 67 +++++++++++++++++++++++++++
src/content/ui/frame.js | 2 +-
src/content/ui/menu.js | 2 +-
11 files changed, 84 insertions(+), 19 deletions(-)
diff --git a/src/content/lib/classes/keyboard-shortcut.jsm b/src/content/lib/classes/keyboard-shortcut.jsm
index e82b931..ace2b5b 100644
--- a/src/content/lib/classes/keyboard-shortcut.jsm
+++ b/src/content/lib/classes/keyboard-shortcut.jsm
@@ -26,10 +26,9 @@ const {utils: Cu} = Components;
/* exported KeyboardShortcut */
this.EXPORTED_SYMBOLS = ["KeyboardShortcut"];
-let {console} = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
-
let {ScriptLoader: {importModule}} = Cu.import(
"chrome://rpcontinued/content/lib/script-loader.jsm", {});
+let {RPService2: {console}} = importModule("main/rp-service-2");
let {Windows} = importModule("models/windows");
let {Prefs} = importModule("models/prefs");
let {XULUtils} = importModule("lib/utils/xul");
diff --git a/src/content/lib/environment.jsm b/src/content/lib/environment.jsm
index c200bce..1c07c9b 100644
--- a/src/content/lib/environment.jsm
+++ b/src/content/lib/environment.jsm
@@ -35,10 +35,10 @@ let globalScope = this;
let {XPCOMUtils} = Cu.import("resource://gre/modules/XPCOMUtils.jsm", {});
let {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
-let {console} = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
let {ScriptLoader} = Cu.import(
"chrome://rpcontinued/content/lib/script-loader.jsm", {});
+let {RPService2: {console}} = ScriptLoader.importModule("main/rp-service-2");
ScriptLoader.defineLazyModuleGetters({
/* global ManagerForEventListeners */
diff --git a/src/content/lib/environment.process.js b/src/content/lib/environment.process.js
index ff795f7..49e9019 100644
--- a/src/content/lib/environment.process.js
+++ b/src/content/lib/environment.process.js
@@ -27,10 +27,9 @@ const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
/* exported ProcessEnvironment */
/* global Environment */
-let {console} = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
-
let {ScriptLoader} = Cu.import(
"chrome://rpcontinued/content/lib/script-loader.jsm");
+let {RPService2: {console}} = ScriptLoader.importModule("main/rp-service-2");
let {C} = ScriptLoader.importModule("lib/utils/constants");
//==============================================================================
diff --git a/src/content/lib/script-loader.jsm b/src/content/lib/script-loader.jsm
index 01fe6f1..d83d3e4 100644
--- a/src/content/lib/script-loader.jsm
+++ b/src/content/lib/script-loader.jsm
@@ -34,7 +34,6 @@ this.EXPORTED_SYMBOLS = ["ScriptLoader"];
// Doing so would be a bad practice, and might produce import() loops
// when the module to be imported wants to import ScriptLoader.
let {XPCOMUtils} = Cu.import("resource://gre/modules/XPCOMUtils.jsm", {});
-let {console} = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
let {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
//==============================================================================
@@ -60,6 +59,12 @@ function logSevereError(aMessage, aError) {
Cu.reportError(aError);
}
+// FIXME: Integrate ScriptLoader into RPService2, and use Console.jsm then.
+let console = {
+ debug: Services.console.logStringMessage,
+ error: Services.console.logStringMessage
+}
+
//==============================================================================
// ScriptLoader
//==============================================================================
diff --git a/src/content/lib/utils.jsm b/src/content/lib/utils.jsm
index e063cb7..bdaebfb 100644
--- a/src/content/lib/utils.jsm
+++ b/src/content/lib/utils.jsm
@@ -28,10 +28,10 @@ const {interfaces: Ci, utils: Cu} = Components;
this.EXPORTED_SYMBOLS = ["Utils"];
let {XPCOMUtils} = Cu.import("resource://gre/modules/XPCOMUtils.jsm", {});
-//let {console} = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
let {ScriptLoader: {importModule}} = Cu.import(
"chrome://rpcontinued/content/lib/script-loader.jsm", {});
+//let {RPService2: {console}} = importModule("main/rp-service-2");
let {Environment, ProcessEnvironment} = importModule("lib/environment");
let {Logger} = importModule("lib/logger");
diff --git a/src/content/lib/utils/info.jsm b/src/content/lib/utils/info.jsm
index cec9efd..fd3e049 100644
--- a/src/content/lib/utils/info.jsm
+++ b/src/content/lib/utils/info.jsm
@@ -89,17 +89,12 @@ var Info = (function() {
}
}
- let {ID: appID, name: appName, platformVersion} = Services.appinfo;
+ // FIXME: Move to RPService2.info.
+ let {ID: appID, platformVersion} = Services.appinfo;
self.isFirefox = appID === C.FIREFOX_ID;
self.isSeamonkey = appID === C.SEAMONKEY_ID;
- self.isGecko = appName !== "Pale Moon";
self.isAustralis = self.isFirefox &&
Services.vc.compare(platformVersion, "29") >= 0;
- self.isGeckoVersionAtLeast = function(aMinVersion) {
- return self.isGecko &&
- Services.vc.compare(platformVersion, aMinVersion) >= 0;
- };
-
return self;
}());
diff --git a/src/content/main/about-uri.jsm b/src/content/main/about-uri.jsm
index 3529a7e..8f9facb 100644
--- a/src/content/main/about-uri.jsm
+++ b/src/content/main/about-uri.jsm
@@ -32,9 +32,9 @@ let {XPCOMUtils} = Cu.import("resource://gre/modules/XPCOMUtils.jsm", {});
let {ScriptLoader: {importModule}} = Cu.import(
"chrome://rpcontinued/content/lib/script-loader.jsm", {});
+let {RPService2} = importModule("main/rp-service-2");
let {Environment, ProcessEnvironment} = importModule("lib/environment");
let {Utils} = importModule("lib/utils");
-let {Info} = importModule("lib/utils/info");
//==============================================================================
// utilities, constants
@@ -87,7 +87,7 @@ var AboutRequestPolicy = (function() {
self.newChannel = function(aURI, aLoadInfo) {
let uri = getURI(aURI);
let channel;
- if (Info.isGeckoVersionAtLeast("48.0a1")) {
+ if (RPService2.info.isGeckoVersionAtLeast("48.0a1")) {
// newChannelFromURIWithLoadInfo is available since Gecko 48.
channel = Services.io.newChannelFromURIWithLoadInfo(uri, aLoadInfo);
} else {
diff --git a/src/content/main/pref-manager.jsm b/src/content/main/pref-manager.jsm
index a06952d..df29a4c 100644
--- a/src/content/main/pref-manager.jsm
+++ b/src/content/main/pref-manager.jsm
@@ -28,10 +28,10 @@ const {utils: Cu} = Components;
this.EXPORTED_SYMBOLS = ["PrefManager"];
let {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
-let {console} = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
let {ScriptLoader: {importModule}} = Cu.import(
"chrome://rpcontinued/content/lib/script-loader.jsm", {});
+let {RPService2: {console}} = importModule("main/rp-service-2");
let {C} = importModule("lib/utils/constants");
let {Environment, ProcessEnvironment} = importModule("lib/environment");
diff --git a/src/content/main/rp-service-2.jsm b/src/content/main/rp-service-2.jsm
new file mode 100644
index 0000000..8762353
--- /dev/null
+++ b/src/content/main/rp-service-2.jsm
@@ -0,0 +1,67 @@
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ *
+ * RequestPolicy - A Firefox extension for control over cross-site requests.
+ * Copyright (c) 2008-2012 Justin Samuel
+ * Copyright (c) 2014-2016 Martin Kimmerle
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LICENSE BLOCK *****
+ */
+
+/* global Components */
+const {utils: Cu} = Components;
+
+/* exported rpService */
+this.EXPORTED_SYMBOLS = ["RPService2"];
+
+// NOTICE: This file should NOT import any of RP's modules when it is loaded!
+// This module will be the new "root module", being the only module
+// imported by bootstrap.js.
+let {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
+let {XPCOMUtils} = Cu.import("resource://gre/modules/XPCOMUtils.jsm", {});
+
+//==============================================================================
+// RPService2
+//==============================================================================
+
+var RPService2 = (function() {
+ let self = {};
+
+ XPCOMUtils.defineLazyGetter(self, "console", function() {
+ if (self.info.isGeckoVersionAtLeast("44")) {
+ return Cu.import("resource://gre/modules/Console.jsm", {}).console;
+ } else {
+ return Cu.import("resource://gre/modules/devtools/Console.jsm", {}).
+ console;
+ }
+ });
+
+ return self;
+}());
+
+RPService2.info = (function() {
+ let self = {};
+
+ let {name: appName, platformVersion} = Services.appinfo;
+ self.isGecko = appName !== "Pale Moon";
+
+ self.isGeckoVersionAtLeast = function(aMinVersion) {
+ return self.isGecko &&
+ Services.vc.compare(platformVersion, aMinVersion) >= 0;
+ };
+
+ return self;
+}());
diff --git a/src/content/ui/frame.js b/src/content/ui/frame.js
index 2d3856a..0f18af7 100644
--- a/src/content/ui/frame.js
+++ b/src/content/ui/frame.js
@@ -25,10 +25,10 @@
const {utils: Cu} = Components;
let {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
- //let {console} = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
let {ScriptLoader: {importModule}} = Cu.import(
"chrome://rpcontinued/content/lib/script-loader.jsm", {});
+ //let {RPService2: {console}} = importModule("main/rp-service-2");
let {C} = importModule("lib/utils/constants");
let {Environment, FrameScriptEnvironment} = importModule("lib/environment");
let {FramescriptToOverlayCommunication} = importModule(
diff --git a/src/content/ui/menu.js b/src/content/ui/menu.js
index d1b8b3a..2d4feaf 100644
--- a/src/content/ui/menu.js
+++ b/src/content/ui/menu.js
@@ -28,11 +28,11 @@ window.rpcontinued.menu = (function() {
const {utils: Cu} = Components;
let {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
- let {console} = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
let {ScriptLoader: {importModule}} = Cu.import(
"chrome://rpcontinued/content/lib/script-loader.jsm", {});
+ let {RPService2: {console}} = importModule("main/rp-service-2");
let {Environment} = importModule("lib/environment");
let {Logger} = importModule("lib/logger");
let {Prefs} = importModule("models/prefs");
--
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