mirror of
https://github.com/gorhill/uBlock.git
synced 2024-10-06 09:37:12 +02:00
Firefox: location.host isntead of app.cleanName
This commit is contained in:
parent
4e271aebb3
commit
20bd1287cf
@ -45,8 +45,7 @@ vAPI.firefox = true;
|
|||||||
|
|
||||||
vAPI.app = {
|
vAPI.app = {
|
||||||
name: 'µBlock',
|
name: 'µBlock',
|
||||||
version: '0.7.2.0',
|
version: '0.8.2.0'
|
||||||
cleanName: location.host
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
@ -75,7 +74,7 @@ var SQLite = {
|
|||||||
throw Error('Should be a directory...');
|
throw Error('Should be a directory...');
|
||||||
}
|
}
|
||||||
|
|
||||||
path.append(vAPI.app.cleanName + '.sqlite');
|
path.append(location.host + '.sqlite');
|
||||||
this.db = Services.storage.openDatabase(path);
|
this.db = Services.storage.openDatabase(path);
|
||||||
this.db.executeSimpleSQL(
|
this.db.executeSimpleSQL(
|
||||||
'CREATE TABLE IF NOT EXISTS settings' +
|
'CREATE TABLE IF NOT EXISTS settings' +
|
||||||
@ -83,6 +82,7 @@ var SQLite = {
|
|||||||
);
|
);
|
||||||
|
|
||||||
vAPI.unload.push(function() {
|
vAPI.unload.push(function() {
|
||||||
|
// VACUUM somewhere else, instead on unload?
|
||||||
SQLite.run('VACUUM');
|
SQLite.run('VACUUM');
|
||||||
SQLite.db.asyncClose();
|
SQLite.db.asyncClose();
|
||||||
});
|
});
|
||||||
@ -343,7 +343,7 @@ vAPI.tabs.registerListeners = function() {
|
|||||||
for (var tab of win.gBrowser.tabs) {
|
for (var tab of win.gBrowser.tabs) {
|
||||||
var URI = tab.linkedBrowser.currentURI;
|
var URI = tab.linkedBrowser.currentURI;
|
||||||
|
|
||||||
if (URI.scheme === 'chrome' && URI.host === vAPI.app.cleanName) {
|
if (URI.scheme === 'chrome' && URI.host === location.host) {
|
||||||
win.gBrowser.removeTab(tab);
|
win.gBrowser.removeTab(tab);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -551,7 +551,7 @@ vAPI.tabs.injectScript = function(tabId, details, callback) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
tab.linkedBrowser.messageManager.sendAsyncMessage(
|
tab.linkedBrowser.messageManager.sendAsyncMessage(
|
||||||
vAPI.app.cleanName + ':broadcast',
|
location.host + ':broadcast',
|
||||||
JSON.stringify({
|
JSON.stringify({
|
||||||
broadcast: true,
|
broadcast: true,
|
||||||
portName: 'vAPI',
|
portName: 'vAPI',
|
||||||
@ -599,8 +599,8 @@ vAPI.setIcon = function(tabId, img, badge) {
|
|||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|
||||||
vAPI.toolbarButton = {
|
vAPI.toolbarButton = {
|
||||||
widgetId: vAPI.app.cleanName + '-button',
|
widgetId: location.host + '-button',
|
||||||
panelId: vAPI.app.cleanName + '-panel'
|
panelId: location.host + '-panel'
|
||||||
};
|
};
|
||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
@ -663,7 +663,7 @@ vAPI.toolbarButton.add = function(doc) {
|
|||||||
|
|
||||||
var onPopupReady = function() {
|
var onPopupReady = function() {
|
||||||
if (!this.contentWindow
|
if (!this.contentWindow
|
||||||
|| this.contentWindow.location.host !== vAPI.app.cleanName) {
|
|| this.contentWindow.location.host !== location.host) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -822,7 +822,7 @@ vAPI.messaging.setup = function(defaultHandler) {
|
|||||||
this.defaultHandler = defaultHandler;
|
this.defaultHandler = defaultHandler;
|
||||||
|
|
||||||
this.globalMessageManager.addMessageListener(
|
this.globalMessageManager.addMessageListener(
|
||||||
vAPI.app.cleanName + ':background',
|
location.host + ':background',
|
||||||
this.onMessage
|
this.onMessage
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -833,7 +833,7 @@ vAPI.messaging.setup = function(defaultHandler) {
|
|||||||
|
|
||||||
gmm.removeDelayedFrameScript(vAPI.messaging.frameScript);
|
gmm.removeDelayedFrameScript(vAPI.messaging.frameScript);
|
||||||
gmm.removeMessageListener(
|
gmm.removeMessageListener(
|
||||||
vAPI.app.cleanName + ':background',
|
location.host + ':background',
|
||||||
vAPI.messaging.onMessage
|
vAPI.messaging.onMessage
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
@ -843,7 +843,7 @@ vAPI.messaging.setup = function(defaultHandler) {
|
|||||||
|
|
||||||
vAPI.messaging.broadcast = function(message) {
|
vAPI.messaging.broadcast = function(message) {
|
||||||
this.globalMessageManager.broadcastAsyncMessage(
|
this.globalMessageManager.broadcastAsyncMessage(
|
||||||
vAPI.app.cleanName + ':broadcast',
|
location.host + ':broadcast',
|
||||||
JSON.stringify({broadcast: true, msg: message})
|
JSON.stringify({broadcast: true, msg: message})
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
@ -851,7 +851,7 @@ vAPI.messaging.broadcast = function(message) {
|
|||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|
||||||
vAPI.net = {
|
vAPI.net = {
|
||||||
beforeRequestMessageName: vAPI.app.cleanName + ':onBeforeRequest'
|
beforeRequestMessageName: location.host + ':onBeforeRequest'
|
||||||
};
|
};
|
||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
Loading…
Reference in New Issue
Block a user