Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-05 18:32:30 +01:00
Code Issues Releases Wiki Activity

Add support for Chrome 22; fixes #1174

Browse Source
This commit is contained in:
Chris 2015-04-07 03:22:10 -06:00
parent 1f3ff792f3
commit 5d06019b19
4 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
platform/chromium/manifest.json
View File

@ -12,10 +12,7 @@
},
"browser_action": {
"default_icon": {
"19": "img/browsericons/icon19-off.png",
"38": "img/browsericons/icon38-off.png"
},
"default_icon": "img/browsericons/icon19-off.png",
"default_title": "uBlock",
"default_popup": "popup.html"
},

26
platform/chromium/vapi-background.js
View File

@ -49,6 +49,20 @@ vAPI.app = {
/******************************************************************************/
if (!chrome.runtime) {
// Chrome 20-21
chrome.runtime = chrome.extension;
}
else if(!chrome.runtime.onMessage) {
// Chrome 22-25
chrome.runtime.onMessage = chrome.extension.onMessage;
chrome.runtime.sendMessage = chrome.extension.sendMessage;
chrome.runtime.onConnect = chrome.extension.onConnect;
chrome.runtime.connect = chrome.extension.connect;
}
/******************************************************************************/
vAPI.app.restart = function() {
chrome.runtime.reload();
};
@ -711,6 +725,18 @@ vAPI.onLoadAllCompleted = function() {
}
};
var iconPaths = { '19': 'img/browsericons/icon19-off.png',
'38': 'img/browsericons/icon38-off.png' };
try {
chrome.browserAction.setIcon({ path: iconPaths }); // Hello? Is this a recent version of Chrome?
}
catch(e) {
chrome.browserAction._setIcon = chrome.browserAction.setIcon; // Nope; looks like older than v23
chrome.browserAction.setIcon = function(x, clbk){ // Shim
this._setIcon({path: x.path[19]}, clbk);
};
chrome.browserAction.setIcon({ path: iconPaths }); /* maybe this time... I'll win! */
};
chrome.tabs.query({ url: 'http://*/*' }, bindToTabs);
chrome.tabs.query({ url: 'https://*/*' }, bindToTabs);
};

14
platform/chromium/vapi-client.js
View File

@ -48,6 +48,20 @@ vAPI.chrome = true;
/******************************************************************************/
if (!chrome.runtime) {
// Chrome 20-21
chrome.runtime = chrome.extension;
}
else if(!chrome.runtime.onMessage) {
// Chrome 22-25
chrome.runtime.onMessage = chrome.extension.onMessage;
chrome.runtime.sendMessage = chrome.extension.sendMessage;
chrome.runtime.onConnect = chrome.extension.onConnect;
chrome.runtime.connect = chrome.extension.connect;
}
/******************************************************************************/
var messagingConnector = function(response) {
if ( !response ) {
return;

3
src/js/profiler.js
View File

@ -27,6 +27,9 @@ var quickProfiler = (function() {
'use strict';
var timer = window.performance || Date;
if(typeof timer.now === "undefined") {
timer.now = timer.webkitNow;
}
var time = 0;
var count = 0;
var tstart = 0;