mirror of
https://github.com/gorhill/uMatrix.git
synced 2024-07-01 12:30:23 +12:00
Firefox: ownsWeak=true for observers, +minor mods
This commit is contained in:
parent
4f8c0e65e6
commit
a3b2edf65e
|
@ -321,7 +321,6 @@ vAPI.tabs.registerListeners = function() {
|
||||||
// onClosed - handled in windowWatcher.onTabClose
|
// onClosed - handled in windowWatcher.onTabClose
|
||||||
// onPopup ?
|
// onPopup ?
|
||||||
|
|
||||||
|
|
||||||
for (var win of this.getWindows()) {
|
for (var win of this.getWindows()) {
|
||||||
windowWatcher.onReady.call(win);
|
windowWatcher.onReady.call(win);
|
||||||
}
|
}
|
||||||
|
@ -561,6 +560,10 @@ vAPI.tabs.injectScript = function(tabId, details, callback) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (details.file) {
|
||||||
|
details.file = vAPI.getURL(details.file);
|
||||||
|
}
|
||||||
|
|
||||||
tab.linkedBrowser.messageManager.sendAsyncMessage(
|
tab.linkedBrowser.messageManager.sendAsyncMessage(
|
||||||
location.host + ':broadcast',
|
location.host + ':broadcast',
|
||||||
JSON.stringify({
|
JSON.stringify({
|
||||||
|
@ -580,7 +583,7 @@ vAPI.tabs.injectScript = function(tabId, details, callback) {
|
||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|
||||||
vAPI.tabIcons = { /*tabId: {badge: 0, img: ''}*/ };
|
vAPI.tabIcons = { /*tabId: {badge: 0, img: boolean}*/ };
|
||||||
vAPI.setIcon = function(tabId, iconStatus, badge) {
|
vAPI.setIcon = function(tabId, iconStatus, badge) {
|
||||||
// If badge is undefined, then setIcon was called from the TabSelect event
|
// If badge is undefined, then setIcon was called from the TabSelect event
|
||||||
var curWin = badge === undefined
|
var curWin = badge === undefined
|
||||||
|
@ -718,6 +721,11 @@ vAPI.toolbarButton.register = function(doc) {
|
||||||
|
|
||||||
if (!this.styleURI) {
|
if (!this.styleURI) {
|
||||||
this.styleURI = 'data:text/css,' + encodeURIComponent([
|
this.styleURI = 'data:text/css,' + encodeURIComponent([
|
||||||
|
'#' + this.widgetId + ' {',
|
||||||
|
'list-style-image: url(',
|
||||||
|
vAPI.getURL('img/browsericons/icon16-off.svg'),
|
||||||
|
');',
|
||||||
|
'}',
|
||||||
'#' + this.widgetId + '[badge]:not([badge=""])::after {',
|
'#' + this.widgetId + '[badge]:not([badge=""])::after {',
|
||||||
'position: absolute;',
|
'position: absolute;',
|
||||||
'margin-left: -16px;',
|
'margin-left: -16px;',
|
||||||
|
@ -856,7 +864,7 @@ vAPI.messaging.setup = function(defaultHandler) {
|
||||||
this.onMessage
|
this.onMessage
|
||||||
);
|
);
|
||||||
|
|
||||||
this.globalMessageManager.loadFrameScript(vAPI.messaging.frameScript, true);
|
this.globalMessageManager.loadFrameScript(this.frameScript, true);
|
||||||
|
|
||||||
vAPI.unload.push(function() {
|
vAPI.unload.push(function() {
|
||||||
var gmm = vAPI.messaging.globalMessageManager;
|
var gmm = vAPI.messaging.globalMessageManager;
|
||||||
|
@ -880,10 +888,6 @@ vAPI.messaging.broadcast = function(message) {
|
||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|
||||||
vAPI.net = {};
|
|
||||||
|
|
||||||
/******************************************************************************/
|
|
||||||
|
|
||||||
var httpObserver = {
|
var httpObserver = {
|
||||||
ABORT: Components.results.NS_BINDING_ABORTED,
|
ABORT: Components.results.NS_BINDING_ABORTED,
|
||||||
lastRequest: {
|
lastRequest: {
|
||||||
|
@ -893,6 +897,23 @@ var httpObserver = {
|
||||||
frameId: null,
|
frameId: null,
|
||||||
parentFrameId: null
|
parentFrameId: null
|
||||||
},
|
},
|
||||||
|
QueryInterface: (function() {
|
||||||
|
var {XPCOMUtils} = Cu['import']('resource://gre/modules/XPCOMUtils.jsm', {});
|
||||||
|
return XPCOMUtils.generateQI([
|
||||||
|
Ci.nsIObserver,
|
||||||
|
Ci.nsISupportsWeakReference
|
||||||
|
]);
|
||||||
|
})(),
|
||||||
|
register: function() {
|
||||||
|
Services.obs.addObserver(httpObserver, 'http-on-opening-request', true);
|
||||||
|
// Services.obs.addObserver(httpObserver, 'http-on-modify-request', true);
|
||||||
|
Services.obs.addObserver(httpObserver, 'http-on-examine-response', true);
|
||||||
|
},
|
||||||
|
unregister: function() {
|
||||||
|
Services.obs.removeObserver(httpObserver, 'http-on-opening-request');
|
||||||
|
// Services.obs.removeObserver(httpObserver, 'http-on-modify-request');
|
||||||
|
Services.obs.removeObserver(httpObserver, 'http-on-examine-response');
|
||||||
|
},
|
||||||
observe: function(httpChannel, topic) {
|
observe: function(httpChannel, topic) {
|
||||||
// No need for QueryInterface if this check is performed?
|
// No need for QueryInterface if this check is performed?
|
||||||
if (!(httpChannel instanceof Ci.nsIHttpChannel)) {
|
if (!(httpChannel instanceof Ci.nsIHttpChannel)) {
|
||||||
|
@ -994,6 +1015,10 @@ var httpObserver = {
|
||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|
||||||
|
vAPI.net = {};
|
||||||
|
|
||||||
|
/******************************************************************************/
|
||||||
|
|
||||||
vAPI.net.registerListeners = function() {
|
vAPI.net.registerListeners = function() {
|
||||||
var typeMap = {
|
var typeMap = {
|
||||||
2: 'script',
|
2: 'script',
|
||||||
|
@ -1022,9 +1047,7 @@ vAPI.net.registerListeners = function() {
|
||||||
shouldLoadListener
|
shouldLoadListener
|
||||||
);
|
);
|
||||||
|
|
||||||
Services.obs.addObserver(httpObserver, 'http-on-opening-request', false);
|
httpObserver.register();
|
||||||
// Services.obs.addObserver(httpObserver, 'http-on-modify-request', false);
|
|
||||||
Services.obs.addObserver(httpObserver, 'http-on-examine-response', false);
|
|
||||||
|
|
||||||
vAPI.unload.push(function() {
|
vAPI.unload.push(function() {
|
||||||
vAPI.messaging.globalMessageManager.removeMessageListener(
|
vAPI.messaging.globalMessageManager.removeMessageListener(
|
||||||
|
@ -1032,9 +1055,7 @@ vAPI.net.registerListeners = function() {
|
||||||
shouldLoadListener
|
shouldLoadListener
|
||||||
);
|
);
|
||||||
|
|
||||||
Services.obs.removeObserver(httpObserver, 'http-on-opening-request');
|
httpObserver.unregister();
|
||||||
// Services.obs.removeObserver(httpObserver, 'http-on-modify-request');
|
|
||||||
Services.obs.removeObserver(httpObserver, 'http-on-examine-response');
|
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue