Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix #2506

This commit is contained in:
gorhill 2017-04-02 16:23:13 -04:00
parent f6563be542
commit 43e6a7599d
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
platform/firefox/bootstrap.js vendored
View File

@ -1,7 +1,7 @@
/******************************************************************************* /*******************************************************************************
µBlock - a browser extension to block requests. uBlock Origin - a browser extension to block requests.
Copyright (C) 2014 The µBlock authors Copyright (C) 2014-2017 The uBlock Origin authors
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@ -26,7 +26,7 @@
/******************************************************************************/ /******************************************************************************/
const {classes: Cc, interfaces: Ci} = Components; const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
// Accessing the context of the background page: // Accessing the context of the background page:
// var win = Services.appShell.hiddenDOMWindow.document.querySelector('iframe[src*=ublock0]').contentWindow; // var win = Services.appShell.hiddenDOMWindow.document.querySelector('iframe[src*=ublock0]').contentWindow;
@ -85,7 +85,7 @@ function getWindowlessBrowserFrame(appShell) {
windowlessBrowser = appShell.createWindowlessBrowser(true); windowlessBrowser = appShell.createWindowlessBrowser(true);
windowlessBrowser.QueryInterface(Ci.nsIInterfaceRequestor); windowlessBrowser.QueryInterface(Ci.nsIInterfaceRequestor);
let webProgress = windowlessBrowser.getInterface(Ci.nsIWebProgress); let webProgress = windowlessBrowser.getInterface(Ci.nsIWebProgress);
let XPCOMUtils = Components.utils.import('resource://gre/modules/XPCOMUtils.jsm', null).XPCOMUtils; let XPCOMUtils = Cu.import('resource://gre/modules/XPCOMUtils.jsm', null).XPCOMUtils;
windowlessBrowserPL = { windowlessBrowserPL = {
QueryInterface: XPCOMUtils.generateQI([ QueryInterface: XPCOMUtils.generateQI([
Ci.nsIWebProgressListener, Ci.nsIWebProgressListener,
@ -133,7 +133,8 @@ function waitForHiddenWindow() {
// window for the actual background page (windowless browsers are // window for the actual background page (windowless browsers are
// also what the webextension implementation in Firefox uses for // also what the webextension implementation in Firefox uses for
// background pages). // background pages).
if ( appShell.createWindowlessBrowser ) { let { Services } = Cu.import('resource://gre/modules/Services.jsm', null);
if ( Services.vc.compare(Services.appinfo.platformVersion, '27') >= 0 ) {
getWindowlessBrowserFrame(appShell); getWindowlessBrowserFrame(appShell);
} else { } else {
createBgProcess(hiddenDoc); createBgProcess(hiddenDoc);
@ -242,8 +243,9 @@ function uninstall(aData, aReason) {
// To cleanup vAPI.localStorage in vapi-common.js // To cleanup vAPI.localStorage in vapi-common.js
// As I get more familiar with FF API, will find out whetehr there was // As I get more familiar with FF API, will find out whetehr there was
// a better way to do this. // a better way to do this.
Components.utils.import('resource://gre/modules/Services.jsm', null) Cu.import('resource://gre/modules/Services.jsm', null)
.Services.prefs.getBranch('extensions.' + hostName + '.').deleteBranch(''); .Services.prefs.getBranch('extensions.' + hostName + '.')
.deleteBranch('');
} }
/******************************************************************************/ /******************************************************************************/

2
platform/firefox/install.rdf
View File

@ -20,7 +20,7 @@
<em:targetApplication> <em:targetApplication>
<Description> <Description>
<em:id>{{ec8030f7-c20a-464f-9b0e-13a3a9e97384}}</em:id> <em:id>{{ec8030f7-c20a-464f-9b0e-13a3a9e97384}}</em:id>
<em:minVersion>27.0</em:minVersion> <em:minVersion>24.0</em:minVersion>
<em:maxVersion>*</em:maxVersion> <em:maxVersion>*</em:maxVersion>
</Description> </Description>
</em:targetApplication> </em:targetApplication>