mirror of
https://github.com/gorhill/uBlock.git
synced 2024-11-16 23:42:39 +01:00
this fixes https://github.com/gorhill/uBlock/issues/101
This commit is contained in:
parent
c9c7fedc33
commit
01386b0fd1
@ -52,8 +52,7 @@ vAPI.app = {
|
|||||||
if ( !chrome.runtime ) {
|
if ( !chrome.runtime ) {
|
||||||
// Chrome 20-21
|
// Chrome 20-21
|
||||||
chrome.runtime = chrome.extension;
|
chrome.runtime = chrome.extension;
|
||||||
}
|
} else if ( !chrome.runtime.onMessage ) {
|
||||||
else if(!chrome.runtime.onMessage) {
|
|
||||||
// Chrome 22-25
|
// Chrome 22-25
|
||||||
chrome.runtime.onMessage = chrome.extension.onMessage;
|
chrome.runtime.onMessage = chrome.extension.onMessage;
|
||||||
chrome.runtime.sendMessage = chrome.extension.sendMessage;
|
chrome.runtime.sendMessage = chrome.extension.sendMessage;
|
||||||
@ -75,6 +74,21 @@ vAPI.storage = chrome.storage.local;
|
|||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|
||||||
|
// https://github.com/gorhill/uBlock/issues/101
|
||||||
|
// chrome API expects tab id to be a number, not a string.
|
||||||
|
|
||||||
|
var toChromiumTabId = function(tabId) {
|
||||||
|
if ( typeof tabId === 'string' ) {
|
||||||
|
tabId = parseInt(tabId, 10);
|
||||||
|
}
|
||||||
|
if ( typeof tabId !== 'number' || isNaN(tabId) || tabId === -1 ) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
return tabId;
|
||||||
|
};
|
||||||
|
|
||||||
|
/******************************************************************************/
|
||||||
|
|
||||||
vAPI.tabs = {};
|
vAPI.tabs = {};
|
||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
@ -204,7 +218,6 @@ vAPI.tabs.registerListeners = function() {
|
|||||||
if ( typeof this.onClosed === 'function' ) {
|
if ( typeof this.onClosed === 'function' ) {
|
||||||
chrome.tabs.onRemoved.addListener(this.onClosed);
|
chrome.tabs.onRemoved.addListener(this.onClosed);
|
||||||
}
|
}
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
@ -218,11 +231,10 @@ vAPI.tabs.get = function(tabId, callback) {
|
|||||||
// Caller must be prepared to deal with nil tab value
|
// Caller must be prepared to deal with nil tab value
|
||||||
callback(tab);
|
callback(tab);
|
||||||
};
|
};
|
||||||
|
|
||||||
if ( tabId !== null ) {
|
if ( tabId !== null ) {
|
||||||
if ( typeof tabId === 'string' ) {
|
tabId = toChromiumTabId(tabId);
|
||||||
tabId = parseInt(tabId, 10);
|
if ( tabId === 0 ) {
|
||||||
}
|
|
||||||
if ( typeof tabId !== 'number' || isNaN(tabId) ) {
|
|
||||||
onTabReady(null);
|
onTabReady(null);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@ -230,6 +242,7 @@ vAPI.tabs.get = function(tabId, callback) {
|
|||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var onTabReceived = function(tabs) {
|
var onTabReceived = function(tabs) {
|
||||||
// https://code.google.com/p/chromium/issues/detail?id=410868#c8
|
// https://code.google.com/p/chromium/issues/detail?id=410868#c8
|
||||||
if ( chrome.runtime.lastError ) {
|
if ( chrome.runtime.lastError ) {
|
||||||
@ -289,7 +302,7 @@ vAPI.tabs.open = function(details) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// update doesn't accept index, must use move
|
// update doesn't accept index, must use move
|
||||||
chrome.tabs.update(parseInt(details.tabId, 10), _details, function(tab) {
|
chrome.tabs.update(toChromiumTabId(details.tabId), _details, function(tab) {
|
||||||
// if the tab doesn't exist
|
// if the tab doesn't exist
|
||||||
if ( vAPI.lastError() ) {
|
if ( vAPI.lastError() ) {
|
||||||
chrome.tabs.create(_details, focusWindow);
|
chrome.tabs.create(_details, focusWindow);
|
||||||
@ -337,6 +350,11 @@ vAPI.tabs.open = function(details) {
|
|||||||
// Replace the URL of a tab. Noop if the tab does not exist.
|
// Replace the URL of a tab. Noop if the tab does not exist.
|
||||||
|
|
||||||
vAPI.tabs.replace = function(tabId, url) {
|
vAPI.tabs.replace = function(tabId, url) {
|
||||||
|
tabId = toChromiumTabId(tabId);
|
||||||
|
if ( tabId === 0 ) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
var targetURL = url;
|
var targetURL = url;
|
||||||
|
|
||||||
// extension pages
|
// extension pages
|
||||||
@ -344,17 +362,10 @@ vAPI.tabs.replace = function(tabId, url) {
|
|||||||
targetURL = vAPI.getURL(targetURL);
|
targetURL = vAPI.getURL(targetURL);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( typeof tabId !== 'number' ) {
|
|
||||||
tabId = parseInt(tabId, 10);
|
|
||||||
if ( isNaN(tabId) ) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
chrome.tabs.update(tabId, { url: targetURL }, function() {
|
chrome.tabs.update(tabId, { url: targetURL }, function() {
|
||||||
// this prevent console error
|
// https://code.google.com/p/chromium/issues/detail?id=410868#c8
|
||||||
if ( chrome.runtime.lastError ) {
|
if ( chrome.runtime.lastError ) {
|
||||||
return;
|
/* noop */
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
@ -362,20 +373,36 @@ vAPI.tabs.replace = function(tabId, url) {
|
|||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|
||||||
vAPI.tabs.remove = function(tabId) {
|
vAPI.tabs.remove = function(tabId) {
|
||||||
|
tabId = toChromiumTabId(tabId);
|
||||||
|
if ( tabId === 0 ) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
var onTabRemoved = function() {
|
var onTabRemoved = function() {
|
||||||
|
// https://code.google.com/p/chromium/issues/detail?id=410868#c8
|
||||||
if ( vAPI.lastError() ) {
|
if ( vAPI.lastError() ) {
|
||||||
|
/* noop */
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
chrome.tabs.remove(parseInt(tabId, 10), onTabRemoved);
|
chrome.tabs.remove(tabId, onTabRemoved);
|
||||||
};
|
};
|
||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|
||||||
vAPI.tabs.reload = function(tabId /*, flags*/) {
|
vAPI.tabs.reload = function(tabId /*, flags*/) {
|
||||||
if ( typeof tabId === 'string' ) {
|
tabId = toChromiumTabId(tabId);
|
||||||
tabId = parseInt(tabId, 10);
|
if ( tabId === 0 ) {
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
chrome.tabs.reload(tabId);
|
|
||||||
|
var onReloaded = function() {
|
||||||
|
// https://code.google.com/p/chromium/issues/detail?id=410868#c8
|
||||||
|
if ( chrome.runtime.lastError ) {
|
||||||
|
/* noop */
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
chrome.tabs.reload(tabId, onReloaded);
|
||||||
};
|
};
|
||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
@ -384,14 +411,14 @@ vAPI.tabs.injectScript = function(tabId, details, callback) {
|
|||||||
var onScriptExecuted = function() {
|
var onScriptExecuted = function() {
|
||||||
// https://code.google.com/p/chromium/issues/detail?id=410868#c8
|
// https://code.google.com/p/chromium/issues/detail?id=410868#c8
|
||||||
if ( chrome.runtime.lastError ) {
|
if ( chrome.runtime.lastError ) {
|
||||||
|
/* noop */
|
||||||
}
|
}
|
||||||
if ( typeof callback === 'function' ) {
|
if ( typeof callback === 'function' ) {
|
||||||
callback();
|
callback();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
if ( tabId ) {
|
if ( tabId ) {
|
||||||
tabId = parseInt(tabId, 10);
|
chrome.tabs.executeScript(toChromiumTabId(tabId), details, onScriptExecuted);
|
||||||
chrome.tabs.executeScript(tabId, details, onScriptExecuted);
|
|
||||||
} else {
|
} else {
|
||||||
chrome.tabs.executeScript(details, onScriptExecuted);
|
chrome.tabs.executeScript(details, onScriptExecuted);
|
||||||
}
|
}
|
||||||
@ -407,7 +434,11 @@ vAPI.tabs.injectScript = function(tabId, details, callback) {
|
|||||||
// anymore, so this ensures it does still exist.
|
// anymore, so this ensures it does still exist.
|
||||||
|
|
||||||
vAPI.setIcon = function(tabId, iconStatus, badge) {
|
vAPI.setIcon = function(tabId, iconStatus, badge) {
|
||||||
tabId = parseInt(tabId, 10);
|
tabId = toChromiumTabId(tabId);
|
||||||
|
if ( tabId === 0 ) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
var onIconReady = function() {
|
var onIconReady = function() {
|
||||||
if ( vAPI.lastError() ) {
|
if ( vAPI.lastError() ) {
|
||||||
return;
|
return;
|
||||||
@ -731,18 +762,26 @@ vAPI.onLoadAllCompleted = function() {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
var iconPaths = { '19': 'img/browsericons/icon19-off.png',
|
var iconPaths = {
|
||||||
'38': 'img/browsericons/icon38-off.png' };
|
'19': 'img/browsericons/icon19-off.png',
|
||||||
|
'38': 'img/browsericons/icon38-off.png'
|
||||||
|
};
|
||||||
|
|
||||||
try {
|
try {
|
||||||
chrome.browserAction.setIcon({ path: iconPaths }); // Hello? Is this a recent version of Chrome?
|
// Hello? Is this a recent version of Chrome?
|
||||||
|
chrome.browserAction.setIcon({ path: iconPaths });
|
||||||
}
|
}
|
||||||
catch(e) {
|
catch(e) {
|
||||||
chrome.browserAction._setIcon = chrome.browserAction.setIcon; // Nope; looks like older than v23
|
// Nope; looks like older than v23
|
||||||
chrome.browserAction.setIcon = function(x, clbk){ // Shim
|
chrome.browserAction._setIcon = chrome.browserAction.setIcon;
|
||||||
|
// Shim
|
||||||
|
chrome.browserAction.setIcon = function(x, clbk) {
|
||||||
this._setIcon({path: x.path[19], tabId: x.tabId}, clbk);
|
this._setIcon({path: x.path[19], tabId: x.tabId}, clbk);
|
||||||
};
|
};
|
||||||
chrome.browserAction.setIcon({ path: iconPaths }); /* maybe this time... I'll win! */
|
// maybe this time... I'll win!
|
||||||
};
|
chrome.browserAction.setIcon({ path: iconPaths });
|
||||||
|
}
|
||||||
|
|
||||||
chrome.tabs.query({ url: 'http://*/*' }, bindToTabs);
|
chrome.tabs.query({ url: 'http://*/*' }, bindToTabs);
|
||||||
chrome.tabs.query({ url: 'https://*/*' }, bindToTabs);
|
chrome.tabs.query({ url: 'https://*/*' }, bindToTabs);
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user