Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-09-18 08:52:26 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:gorhill/uBlock

Browse Source
This commit is contained in:
gorhill 2015-02-10 09:03:48 -05:00
commit 794e23a9c9
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/ublock/filter-lists.json
View File

@ -56,7 +56,7 @@
}, },
"www.fanboy.co.nz/fanboy-antifacebook.txt": { "www.fanboy.co.nz/fanboy-antifacebook.txt": {
"off": true, "off": true,
"title": "Anti-ThirdpartySocial‎ (see warning inside list)", "title": "Anti-ThirdpartySocial (see warning inside list)",
"group": "social", "group": "social",
"homeURL": "https://www.fanboy.co.nz/fanboy-antifacebook.txt" "homeURL": "https://www.fanboy.co.nz/fanboy-antifacebook.txt"
}, },
@ -280,4 +280,4 @@
"group": "regions", "group": "regions",
"homeURL": "" "homeURL": ""
} }
} }

6
platform/safari/vapi-client.js
View File

@ -24,6 +24,10 @@
(function() { (function() {
'use strict'; 'use strict';
var vAPI = self.vAPI = self.vAPI || {}; var vAPI = self.vAPI = self.vAPI || {};
if(vAPI.vapiClientInjected) {
return;
}
vAPI.vapiClientInjected = true;
vAPI.safari = true; vAPI.safari = true;
/******************************************************************************/ /******************************************************************************/
var messagingConnector = function(response) { var messagingConnector = function(response) {
@ -143,7 +147,7 @@
}; };
vAPI.canExecuteContentScript = function() { vAPI.canExecuteContentScript = function() {
return(/^https?:/.test(location.protocol) && typeof safari === "object"); return (/^https?:/.test(location.protocol) && typeof safari === "object");
}; };
// The following code should run only in content pages // The following code should run only in content pages

3
platform/safari/vapi-popup.js
View File

@ -18,6 +18,8 @@
Home: https://github.com/gorhill/uBlock Home: https://github.com/gorhill/uBlock
*/ */
(function() {
'use strict';
var whenSizeChanges = function(elm, callback) { var whenSizeChanges = function(elm, callback) {
var reset = function() { var reset = function() {
@ -63,3 +65,4 @@ var onLoaded = function() {
whenSizeChanges(body, updateSize); whenSizeChanges(body, updateSize);
}; };
window.addEventListener('load', onLoaded); window.addEventListener('load', onLoaded);
})();