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

Firefox: add basic blocking + some fixes

This commit is contained in:
Deathamns 2014-12-07 20:51:49 +01:00
parent 3c76c61f61
commit 0f771e94d1
5 changed files with 159 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
platform/firefox/chrome.manifest
View File

@ -8,6 +8,7 @@ locale ublock el ./locale/el/
locale ublock es ./locale/es/
locale ublock et ./locale/et/
locale ublock fi ./locale/fi/
locale ublock fil ./locale/fil/
locale ublock fr ./locale/fr/
locale ublock he ./locale/he/
locale ublock hi ./locale/hi/

12
platform/firefox/frameScript.js
View File

@ -24,7 +24,7 @@ let _removeMessageListener = function(id) {
delete listeners[id];
};
addMessageListener('µBlock:broadcast', function(msg) {
addMessageListener(appName + ':broadcast', function(msg) {
for (let id in listeners) {
listeners[id](msg);
}
@ -63,7 +63,12 @@ let observer = {
lss(contentBaseURI + 'vapi-client.js', win);
lss(contentBaseURI + 'contentscript-start.js', win);
if (win.document.readyState === 'loading') {
let readyState = win.document.readyState;
if (readyState === "interactive" || readyState === "complete") {
lss(contentBaseURI + 'contentscript-end.js', win);
}
else {
let docReady = function(e) {
this.removeEventListener(e.type, docReady, true);
lss(contentBaseURI + 'contentscript-end.js', win);
@ -71,9 +76,6 @@ let observer = {
win.document.addEventListener('DOMContentLoaded', docReady, true);
}
else {
lss(contentBaseURI + 'contentscript-end.js', win);
}
}
};

156
platform/firefox/vapi-background.js
View File

@ -19,7 +19,7 @@
Home: https://github.com/gorhill/uBlock
*/
/* global Services */
/* global Services, XPCOMUtils */
// For background page
@ -34,6 +34,7 @@
const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
Cu['import']('resource://gre/modules/Services.jsm');
Cu['import']('resource://gre/modules/XPCOMUtils.jsm');
/******************************************************************************/
@ -45,11 +46,18 @@ vAPI.firefox = true;
vAPI.app = {
name: 'µBlock',
cleanName: 'ublock',
version: '0.7.2.0'
};
/******************************************************************************/
vAPI.app.restart = function() {
};
/******************************************************************************/
var SQLite = {
open: function() {
var path = Services.dirsvc.get('ProfD', Ci.nsIFile);
@ -63,7 +71,7 @@ var SQLite = {
throw Error('Should be a directory...');
}
path.append('uBlock.sqlite');
path.append(vAPI.app.cleanName + '.sqlite');
this.db = Services.storage.openDatabase(path);
this.db.executeSimpleSQL(
'CREATE TABLE IF NOT EXISTS settings' +
@ -229,7 +237,6 @@ var windowWatcher = {
vAPI.tabs.onClosed(vAPI.tabs.getTabId(e.target));
},
onTabSelect: function(e) {
console.log(vAPI.tabs.getTabId(e.target));
// vAPI.setIcon();
},
onLoad: function(e) {
@ -243,7 +250,7 @@ var windowWatcher = {
return;
}
if (!this.gBrowser || this.gBrowser.tabContainer) {
if (!this.gBrowser || !this.gBrowser.tabContainer) {
return;
}
@ -513,9 +520,15 @@ vAPI.tabs.close = function(tabIds) {
/******************************************************************************/
vAPI.setIcon = function() {
};
/******************************************************************************/
vAPI.messaging = {
gmm: Cc['@mozilla.org/globalmessagemanager;1'].getService(Ci.nsIMessageListenerManager),
frameScript: 'chrome://ublock/content/frameScript.js',
frameScript: 'chrome://' + vAPI.app.cleanName + '/content/frameScript.js',
listeners: {},
defaultHandler: null,
NOOPFUNC: function(){},
@ -598,14 +611,17 @@ vAPI.messaging.setup = function(defaultHandler) {
}
this.defaultHandler = defaultHandler;
this.gmm.addMessageListener(vAPI.app.name + ':background', this.onMessage);
this.gmm.addMessageListener(
vAPI.app.cleanName + ':background',
this.onMessage
);
};
/******************************************************************************/
vAPI.messaging.broadcast = function(message) {
this.gmm.broadcastAsyncMessage(
vAPI.app.name + ':broadcast',
vAPI.app.cleanName + ':broadcast',
JSON.stringify({broadcast: true, msg: message})
);
};
@ -614,7 +630,7 @@ vAPI.messaging.broadcast = function(message) {
vAPI.messaging.unload = function() {
this.gmm.removeMessageListener(
vAPI.app.name + ':background',
vAPI.app.cleanName + ':background',
this.onMessage
);
this.gmm.removeDelayedFrameScript(this.frameScript);
@ -628,15 +644,137 @@ vAPI.lastError = function() {
/******************************************************************************/
var conentPolicy = {
classDescription: vAPI.app.name + ' ContentPolicy',
classID: Components.ID('{e6d173c8-8dbf-4189-a6fd-189e8acffd27}'),
contractID: '@' + vAPI.app.cleanName + '/content-policy;1',
ACCEPT: Ci.nsIContentPolicy.ACCEPT,
REJECT: Ci.nsIContentPolicy.REJECT_REQUEST,
types: {
7: 'sub_frame',
4: 'stylesheet',
2: 'script',
3: 'image',
5: 'object',
11: 'xmlhttprequest'
},
get registrar() {
return Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
},
get catManager() {
return Cc['@mozilla.org/categorymanager;1']
.getService(Ci.nsICategoryManager);
},
QueryInterface: XPCOMUtils.generateQI([
Ci.nsIFactory,
Ci.nsIContentPolicy,
Ci.nsISupportsWeakReference
]),
createInstance: function(outer, iid) {
if (outer) {
throw Components.results.NS_ERROR_NO_AGGREGATION;
}
return this.QueryInterface(iid);
},
shouldLoad: function(type, location, origin, context) {
if (type === 6 || !context || !/^https?$/.test(location.scheme)) {
return this.ACCEPT;
}
var win = (context.ownerDocument || context).defaultView;
if (!win) {
return this.ACCEPT;
}
var block = vAPI.net.onBeforeRequest;
type = this.types[type] || 'other';
if (block.types.indexOf(type) === -1) {
return this.ACCEPT;
}
var browser = win.top.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIWebNavigation)
.QueryInterface(Ci.nsIDocShell)
.chromeEventHandler;
if (!browser) {
return this.ACCEPT;
}
block = block.callback({
url: location.spec,
type: type,
tabId: vAPI.tabs.getTabId(browser),
frameId: win === win.top ? 0 : 1,
parentFrameId: win === win.top ? -1 : 0
});
if (block && typeof block === 'object') {
if (block.cancel === true) {
return this.REJECT;
}
else if (block.redirectURL) {
location.spec = block.redirectURL;
return this.REJECT;
}
}
return this.ACCEPT;
},/*
shouldProcess: function() {
return this.ACCEPT;
}*/
};
/******************************************************************************/
vAPI.net = {};
/******************************************************************************/
vAPI.net.registerListeners = function() {
conentPolicy.registrar.registerFactory(
conentPolicy.classID,
conentPolicy.classDescription,
conentPolicy.contractID,
conentPolicy
);
conentPolicy.catManager.addCategoryEntry(
'content-policy',
conentPolicy.contractID,
conentPolicy.contractID,
false,
true
);
};
/******************************************************************************/
vAPI.net.unregisterListeners = function() {
conentPolicy.registrar.unregisterFactory(conentPolicy.classID, conentPolicy);
conentPolicy.catManager.deleteCategoryEntry(
'content-policy',
conentPolicy.contractID,
false
);
};
/******************************************************************************/
// clean up when the extension is disabled
window.addEventListener('unload', function() {
SQLite.close();
windowWatcher.unregister();
vAPI.messaging.unload();
vAPI.net.unregisterListeners();
// close extension tabs
var extURI, win, tab, host = 'ublock';
var extURI, win, tab, host = vAPI.app.cleanName;
for (win of vAPI.tabs.getWindows()) {
for (tab of win.gBrowser.tabs) {

3
platform/firefox/vapi-client.js
View File

@ -84,7 +84,6 @@ vAPI.messaging = {
listeners: {},
requestId: 1,
connectorId: uniqueId(),
bgMessageName: 'µBlock:background',
setup: function() {
this.connector = function(msg) {
@ -125,7 +124,7 @@ vAPI.messaging = {
vAPI.messaging.listeners[message.requestId] = callback;
}
sendAsyncMessage(vAPI.messaging.bgMessageName, message);
sendAsyncMessage('ublock:background', message);
},
close: function() {
delete vAPI.messaging.channels[this.portName];

4
platform/safari/vapi-background.js
View File

@ -610,7 +610,9 @@ safari.application.addEventListener('beforeNavigate', function(e) {
/******************************************************************************/
vAPI.net = {}
vAPI.net = {};
/******************************************************************************/
vAPI.net.registerListeners = function() {
var onBeforeRequest = this.onBeforeRequest;