Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
gorhill 2015-02-10 09:03:48 -05:00
parent 89ab43164b 5b16418e60
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

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

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

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

@ -24,6 +24,10 @@
(function() {
'use strict';
var vAPI = self.vAPI = self.vAPI || {};
if(vAPI.vapiClientInjected) {
return;
}
vAPI.vapiClientInjected = true;
vAPI.safari = true;
/******************************************************************************/
var messagingConnector = function(response) {

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

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