CodeMirror/uMatrix
1
0
Fork 0
mirror of https://github.com/gorhill/uMatrix.git synced 2024-06-26 18:10:39 +12:00
Code Issues Releases Wiki Activity

Firefox: simplify vAPI.app.restart

Browse source
This commit is contained in:
Deathamns 2015-01-04 13:58:17 +01:00 committed by gorhill
parent 6571a0700f
commit f570bc7f48
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
platform/firefox/frameModule.js
View file

@ -19,20 +19,17 @@
Home: https://github.com/gorhill/uBlock
*/
/* global Services, Components, XPCOMUtils, __URI__ */
'use strict';
/******************************************************************************/
this.EXPORTED_SYMBOLS = ['contentObserver'];
const {interfaces: Ci, utils: Cu} = Components;
const appName = __URI__.match(/:\/\/([^\/]+)/)[1];
const {interfaces: Ci, utils: Cu} = this.Components;
const appName = this.__URI__.match(/:\/\/([^\/]+)/)[1];
Cu['import']('resource://gre/modules/Services.jsm');
Cu['import']('resource://gre/modules/XPCOMUtils.jsm');
// Cu['import']('resource://gre/modules/devtools/Console.jsm');
Cu.import('resource://gre/modules/Services.jsm');
Cu.import('resource://gre/modules/devtools/Console.jsm');
/******************************************************************************/
@ -66,12 +63,16 @@ const contentObserver = {
.getService(Ci.nsICategoryManager);
},
QueryInterface: XPCOMUtils.generateQI([
Ci.nsIFactory,
Ci.nsIObserver,
Ci.nsIContentPolicy,
Ci.nsISupportsWeakReference
]),
QueryInterface: (function() {
let {XPCOMUtils} = Cu['import']('resource://gre/modules/XPCOMUtils.jsm', {});
return XPCOMUtils.generateQI([
Ci.nsIFactory,
Ci.nsIObserver,
Ci.nsIContentPolicy,
Ci.nsISupportsWeakReference
]);
})(),
createInstance: function(outer, iid) {
if ( outer ) {
@ -117,7 +118,7 @@ const contentObserver = {
return this.ACCEPT;
}
let opener;
var opener;
if ( location.scheme !== 'http' && location.scheme !== 'https' ) {
if ( type !== this.MAIN_FRAME ) {
@ -208,6 +209,7 @@ const contentObserver = {
this.initContentScripts(win);
}
// What about data: and about:blank?
return;
}