Mirror
/
nuTensor
mirror of https://github.com/geekprojects/nuTensor.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

untangling fennec code

pull/2/head
gorhill 10 years ago
parent
4d8f908022
commit
4fffc97954
8 changed files with 28 additions and 164 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      platform/firefox/bootstrap.js
  2. 2
      platform/firefox/chrome.manifest
  3. 4
      platform/firefox/frameModule.js
  4. 6
      platform/firefox/frameScript.js
  5. 11
      platform/firefox/install.rdf
  6. 157
      platform/firefox/vapi-background.js
  7. 4
      platform/firefox/vapi-client.js
  8. 2
      platform/firefox/vapi-common.js

6
platform/firefox/bootstrap.js
View File

@ -16,7 +16,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see {http://www.gnu.org/licenses/}. along with this program. If not, see {http://www.gnu.org/licenses/}.
Home: https://github.com/gorhill/uBlock
Home: https://github.com/gorhill/uMatrix
*/ */
/* global APP_SHUTDOWN, APP_STARTUP */ /* global APP_SHUTDOWN, APP_STARTUP */
@ -27,11 +27,11 @@
/******************************************************************************/ /******************************************************************************/
// Accessing the context of the background page: // Accessing the context of the background page:
// var win = Services.appShell.hiddenDOMWindow.document.querySelector('iframe[src*=ublock]').contentWindow;
// var win = Services.appShell.hiddenDOMWindow.document.querySelector('iframe[src*=umatrix]').contentWindow;
let bgProcess; let bgProcess;
let version; let version;
const hostName = 'ublock0';
const hostName = 'umatrix';
const restartListener = { const restartListener = {
get messageManager() { get messageManager() {
return Components.classes['@mozilla.org/parentprocessmessagemanager;1'] return Components.classes['@mozilla.org/parentprocessmessagemanager;1']

2
platform/firefox/chrome.manifest
View File

@ -1 +1 @@
content ublock0 ./
content umatrix ./

4
platform/firefox/frameModule.js
View File

@ -16,7 +16,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see {http://www.gnu.org/licenses/}. along with this program. If not, see {http://www.gnu.org/licenses/}.
Home: https://github.com/gorhill/uBlock
Home: https://github.com/gorhill/uMatrix
*/ */
'use strict'; 'use strict';
@ -49,7 +49,7 @@ const getMessageManager = function(win) {
const contentObserver = { const contentObserver = {
classDescription: 'content-policy for ' + hostName, classDescription: 'content-policy for ' + hostName,
classID: Components.ID('{7afbd130-cbaf-46c2-b944-f5d24305f484}'),
classID: Components.ID('{d8baca19-b666-4c09-84b1-a36d9a0bb03f}'),
contractID: '@' + hostName + '/content-policy;1', contractID: '@' + hostName + '/content-policy;1',
ACCEPT: Ci.nsIContentPolicy.ACCEPT, ACCEPT: Ci.nsIContentPolicy.ACCEPT,
MAIN_FRAME: Ci.nsIContentPolicy.TYPE_DOCUMENT, MAIN_FRAME: Ci.nsIContentPolicy.TYPE_DOCUMENT,

6
platform/firefox/frameScript.js
View File

@ -16,7 +16,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see {http://www.gnu.org/licenses/}. along with this program. If not, see {http://www.gnu.org/licenses/}.
Home: https://github.com/gorhill/uBlock
Home: https://github.com/gorhill/uMatrix
*/ */
/******************************************************************************/ /******************************************************************************/
@ -50,11 +50,11 @@ let injectContentScripts = function(win) {
}; };
let onLoadCompleted = function() { let onLoadCompleted = function() {
removeMessageListener('ublock-load-completed', onLoadCompleted);
removeMessageListener('umatrix-load-completed', onLoadCompleted);
injectContentScripts(content); injectContentScripts(content);
}; };
addMessageListener('ublock-load-completed', onLoadCompleted);
addMessageListener('umatrix-load-completed', onLoadCompleted);
locationChangeListener = new LocationChangeListener(docShell); locationChangeListener = new LocationChangeListener(docShell);

11
platform/firefox/install.rdf
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<r:RDF xmlns:r="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.mozilla.org/2004/em-rdf#"> <r:RDF xmlns:r="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.mozilla.org/2004/em-rdf#">
<r:Description about="urn:mozilla:install-manifest"> <r:Description about="urn:mozilla:install-manifest">
<id>uBlock0@raymondhill.net</id>
<id>uMatrix@raymondhill.net</id>
<version>{version}</version> <version>{version}</version>
<name>{name}</name> <name>{name}</name>
<description>{description}</description> <description>{description}</description>
@ -22,15 +22,6 @@
</r:Description> </r:Description>
</targetApplication> </targetApplication>
<!-- Fennec -->
<targetApplication>
<r:Description>
<id>{{aa3c5121-dab2-40e2-81ca-7ea25febc110}}</id>
<minVersion>24.0</minVersion>
<maxVersion>40.0</maxVersion>
</r:Description>
</targetApplication>
<!-- SeaMonkey --> <!-- SeaMonkey -->
<targetApplication> <targetApplication>
<r:Description> <r:Description>

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

@ -16,7 +16,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see {http://www.gnu.org/licenses/}. along with this program. If not, see {http://www.gnu.org/licenses/}.
Home: https://github.com/gorhill/uBlock
Home: https://github.com/gorhill/uMatrix
*/ */
/* jshint esnext: true, bitwise: false */ /* jshint esnext: true, bitwise: false */
@ -39,12 +39,11 @@ const {Services} = Cu.import('resource://gre/modules/Services.jsm', null);
var vAPI = self.vAPI = self.vAPI || {}; var vAPI = self.vAPI = self.vAPI || {};
vAPI.firefox = true; vAPI.firefox = true;
vAPI.fennec = Services.appinfo.ID === '{aa3c5121-dab2-40e2-81ca-7ea25febc110}';
/******************************************************************************/ /******************************************************************************/
vAPI.app = { vAPI.app = {
name: 'uBlock₀',
name: 'uMatrix',
version: location.hash.slice(1) version: location.hash.slice(1)
}; };
@ -78,7 +77,7 @@ window.addEventListener('unload', function() {
if ( cleanupTasks.length < expectedNumberOfCleanups ) { if ( cleanupTasks.length < expectedNumberOfCleanups ) {
console.error( console.error(
'uBlock> Cleanup tasks performed: %s (out of %s)',
'uMatrix> Cleanup tasks performed: %s (out of %s)',
cleanupTasks.length, cleanupTasks.length,
expectedNumberOfCleanups expectedNumberOfCleanups
); );
@ -296,10 +295,7 @@ var windowWatcher = {
return; return;
} }
if ( tabBrowser.deck ) {
// Fennec
tabContainer = tabBrowser.deck;
} else if ( tabBrowser.tabContainer ) {
if ( tabBrowser.tabContainer ) {
// desktop Firefox // desktop Firefox
tabContainer = tabBrowser.tabContainer; tabContainer = tabBrowser.tabContainer;
vAPI.contextMenu.register(this.document); vAPI.contextMenu.register(this.document);
@ -347,7 +343,7 @@ vAPI.noTabId = '-1';
/******************************************************************************/ /******************************************************************************/
var getTabBrowser = function(win) { var getTabBrowser = function(win) {
return vAPI.fennec && win.BrowserApp || win.gBrowser || null;
return win.gBrowser || null;
}; };
/******************************************************************************/ /******************************************************************************/
@ -356,7 +352,7 @@ var getBrowserForTab = function(tab) {
if ( !tab ) { if ( !tab ) {
return null; return null;
} }
return vAPI.fennec && tab.browser || tab.linkedBrowser || null;
return tab.linkedBrowser || null;
}; };
/******************************************************************************/ /******************************************************************************/
@ -366,15 +362,6 @@ var getOwnerWindow = function(target) {
return target.ownerDocument.defaultView; return target.ownerDocument.defaultView;
} }
// Fennec
for ( var win of vAPI.tabs.getWindows() ) {
for ( var tab of win.BrowserApp.tabs) {
if ( tab === target || tab.window === target ) {
return win;
}
}
}
return null; return null;
}; };
@ -407,10 +394,7 @@ vAPI.tabs.registerListeners = function() {
continue; continue;
} }
if ( tabBrowser.deck ) {
// Fennec
tabContainer = tabBrowser.deck;
} else if ( tabBrowser.tabContainer ) {
if ( tabBrowser.tabContainer ) {
tabContainer = tabBrowser.tabContainer; tabContainer = tabBrowser.tabContainer;
tabBrowser.removeTabsProgressListener(tabWatcher); tabBrowser.removeTabsProgressListener(tabWatcher);
} }
@ -444,12 +428,7 @@ vAPI.tabs.getTabId = function(target) {
if ( !target ) { if ( !target ) {
return vAPI.noTabId; return vAPI.noTabId;
} }
if ( vAPI.fennec ) {
if ( target.browser ) {
// target is a tab
target = target.browser;
}
} else if ( target.linkedPanel ) {
if ( target.linkedPanel ) {
// target is a tab // target is a tab
target = target.linkedBrowser; target = target.linkedBrowser;
} }
@ -519,14 +498,8 @@ vAPI.tabs.get = function(tabId, callback) {
var windows = this.getWindows(); var windows = this.getWindows();
var browser = getBrowserForTab(tab); var browser = getBrowserForTab(tab);
var tabBrowser = getTabBrowser(win); var tabBrowser = getTabBrowser(win);
var tabIndex, tabTitle;
if ( vAPI.fennec ) {
tabIndex = tabBrowser.tabs.indexOf(tab);
tabTitle = browser.contentTitle;
} else {
tabIndex = tabBrowser.browsers.indexOf(browser);
tabTitle = tab.label;
}
var tabIndex = tabBrowser.browsers.indexOf(browser);
var tabTitle = tab.label;
callback({ callback({
id: tabId, id: tabId,
@ -630,12 +603,6 @@ vAPI.tabs.open = function(details) {
win = Services.wm.getMostRecentWindow('navigator:browser'); win = Services.wm.getMostRecentWindow('navigator:browser');
tabBrowser = getTabBrowser(win); tabBrowser = getTabBrowser(win);
if ( vAPI.fennec ) {
tabBrowser.addTab(details.url, {selected: details.active !== false});
// Note that it's impossible to move tabs on Fennec, so don't bother
return;
}
if ( details.index === -1 ) { if ( details.index === -1 ) {
details.index = tabBrowser.browsers.indexOf(tabBrowser.selectedBrowser) + 1; details.index = tabBrowser.browsers.indexOf(tabBrowser.selectedBrowser) + 1;
} }
@ -668,10 +635,6 @@ vAPI.tabs.replace = function(tabId, url) {
/******************************************************************************/ /******************************************************************************/
vAPI.tabs._remove = function(tab, tabBrowser) { vAPI.tabs._remove = function(tab, tabBrowser) {
if ( vAPI.fennec ) {
tabBrowser.closeTab(tab);
return;
}
tabBrowser.removeTab(tab); tabBrowser.removeTab(tab);
}; };
@ -714,12 +677,7 @@ vAPI.tabs.select = function(tab) {
} }
var tabBrowser = getTabBrowser(getOwnerWindow(tab)); var tabBrowser = getTabBrowser(getOwnerWindow(tab));
if ( vAPI.fennec ) {
tabBrowser.selectTab(tab);
} else {
tabBrowser.selectedTab = tab;
}
tabBrowser.selectedTab = tab;
}; };
/******************************************************************************/ /******************************************************************************/
@ -844,7 +802,7 @@ vAPI.messaging.onMessage = function({target, data}) {
return; return;
} }
console.error('uBlock> messaging > unknown request: %o', data);
console.error('uMatrix> messaging > unknown request: %o', data);
// Unhandled: // Unhandled:
// Need to callback anyways in case caller expected an answer, or // Need to callback anyways in case caller expected an answer, or
@ -1020,7 +978,7 @@ var httpObserver = {
try { try {
this.componentRegistrar.unregisterFactory(this.classID, Components.manager.getClassObject(this.classID, Ci.nsIFactory)); this.componentRegistrar.unregisterFactory(this.classID, Components.manager.getClassObject(this.classID, Ci.nsIFactory));
} catch (ex) { } catch (ex) {
console.error('uBlock> httpObserver > unable to unregister stale instance: ', ex);
console.error('uMatrix> httpObserver > unable to unregister stale instance: ', ex);
} }
} }
@ -1388,75 +1346,6 @@ vAPI.toolbarButton = {
// Toolbar button UI for desktop Firefox // Toolbar button UI for desktop Firefox
vAPI.toolbarButton.init = function() { vAPI.toolbarButton.init = function() {
if ( vAPI.fennec ) {
// Menu UI for Fennec
var tb = {
menuItemIds: new WeakMap(),
label: vAPI.app.name,
tabs: {}
};
vAPI.toolbarButton = tb;
tb.getMenuItemLabel = function(tabId) {
var label = this.label;
if ( tabId === undefined ) {
return label;
}
var tabDetails = this.tabs[tabId];
if ( !tabDetails ) {
return label;
}
if ( !tabDetails.img ) {
label += ' (' + vAPI.i18n('fennecMenuItemBlockingOff') + ')';
} else if ( tabDetails.badge ) {
label += ' (' + tabDetails.badge + ')';
}
return label;
};
tb.onClick = function() {
var win = Services.wm.getMostRecentWindow('navigator:browser');
var curTabId = vAPI.tabs.getTabId(getTabBrowser(win).selectedTab);
vAPI.tabs.open({
url: 'popup.html?tabId=' + curTabId,
index: -1,
select: true
});
};
tb.updateState = function(win, tabId) {
var id = this.menuItemIds.get(win);
if ( !id ) {
return;
}
win.NativeWindow.menu.update(id, {
name: this.getMenuItemLabel(tabId)
});
};
// Only actually expecting one window under Fennec (note, not tabs, windows)
for ( var win of vAPI.tabs.getWindows() ) {
var label = tb.getMenuItemLabel();
var id = win.NativeWindow.menu.add({
name: label,
callback: tb.onClick
});
tb.menuItemIds.set(win, id);
}
cleanupTasks.push(function() {
for ( var win of vAPI.tabs.getWindows() ) {
var id = tb.menuItemIds.get(win);
if ( id ) {
win.NativeWindow.menu.remove(id);
tb.menuItemIds.delete(win);
}
}
});
return;
}
var CustomizableUI; var CustomizableUI;
try { try {
CustomizableUI = Cu.import('resource:///modules/CustomizableUI.jsm', null).CustomizableUI; CustomizableUI = Cu.import('resource:///modules/CustomizableUI.jsm', null).CustomizableUI;
@ -1756,17 +1645,6 @@ vAPI.contextMenu.register = function(doc) {
return; return;
} }
if ( vAPI.fennec ) {
// TODO https://developer.mozilla.org/en-US/Add-ons/Firefox_for_Android/API/NativeWindow/contextmenus/add
/*var nativeWindow = doc.defaultView.NativeWindow;
contextId = nativeWindow.contextmenus.add(
this.menuLabel,
nativeWindow.contextmenus.linkOpenableContext,
this.onCommand
);*/
return;
}
var contextMenu = doc.getElementById('contentAreaContextMenu'); var contextMenu = doc.getElementById('contentAreaContextMenu');
var menuitem = doc.createElement('menuitem'); var menuitem = doc.createElement('menuitem');
menuitem.setAttribute('id', this.menuItemId); menuitem.setAttribute('id', this.menuItemId);
@ -1785,11 +1663,6 @@ vAPI.contextMenu.unregister = function(doc) {
return; return;
} }
if ( vAPI.fennec ) {
// TODO
return;
}
var menuitem = doc.getElementById(this.menuItemId); var menuitem = doc.getElementById(this.menuItemId);
var contextMenu = menuitem.parentNode; var contextMenu = menuitem.parentNode;
menuitem.removeEventListener('command', this.onCommand); menuitem.removeEventListener('command', this.onCommand);
@ -1862,7 +1735,7 @@ vAPI.contextMenu.remove = function() {
/******************************************************************************/ /******************************************************************************/
var optionsObserver = { var optionsObserver = {
addonId: 'uBlock0@raymondhill.net',
addonId: 'uMatrix@raymondhill.net',
register: function() { register: function() {
Services.obs.addObserver(this, 'addon-options-displayed', false); Services.obs.addObserver(this, 'addon-options-displayed', false);
@ -1918,7 +1791,7 @@ vAPI.onLoadAllCompleted = function() {
var µb = µBlock; var µb = µBlock;
for ( var tab of this.tabs.getAll() ) { for ( var tab of this.tabs.getAll() ) {
// We're insterested in only the tabs that were already loaded // We're insterested in only the tabs that were already loaded
if ( !vAPI.fennec && tab.hasAttribute('pending') ) {
if ( tab.hasAttribute('pending') ) {
continue; continue;
} }

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

@ -16,7 +16,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see {http://www.gnu.org/licenses/}. along with this program. If not, see {http://www.gnu.org/licenses/}.
Home: https://github.com/gorhill/uBlock
Home: https://github.com/gorhill/uMatrix
*/ */
/* global addMessageListener, removeMessageListener, sendAsyncMessage */ /* global addMessageListener, removeMessageListener, sendAsyncMessage */
@ -160,7 +160,7 @@ vAPI.messaging = {
vAPI.messaging.listeners[message.requestId] = callback; vAPI.messaging.listeners[message.requestId] = callback;
} }
sendAsyncMessage('ublock0:background', message);
sendAsyncMessage('umatrix:background', message);
}, },
close: function() { close: function() {
delete vAPI.messaging.channels[this.channelName]; delete vAPI.messaging.channels[this.channelName];

2
platform/firefox/vapi-common.js
View File

@ -16,7 +16,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see {http://www.gnu.org/licenses/}. along with this program. If not, see {http://www.gnu.org/licenses/}.
Home: https://github.com/gorhill/uBlock
Home: https://github.com/gorhill/uMatrix
*/ */
/* global sendAsyncMessage */ /* global sendAsyncMessage */

Write Preview
Loading…
Cancel
Save