mirror of https://github.com/gorhill/uBlock.git
Merge branch 'master' of github.com:gorhill/uBlock
This commit is contained in:
gorhill
commit
c4ee65b8cf
|
|
@ -1,111 +0,0 @@
|
||||||
/*******************************************************************************
|
|
||||||
|
|
||||||
µBlock - a browser extension to block requests.
|
|
||||||
Copyright (C) 2014 The µBlock authors
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see {http://www.gnu.org/licenses/}.
|
|
||||||
|
|
||||||
Home: https://github.com/gorhill/uBlock
|
|
||||||
*/
|
|
||||||
|
|
||||||
var vAPI = self.vAPI = self.vAPI || {};
|
|
||||||
vAPI.sitePatch = function() {
|
|
||||||
(function() {
|
|
||||||
// disable spf
|
|
||||||
window.ytspf = {};
|
|
||||||
Object.defineProperty(window.ytspf, "enabled", {
|
|
||||||
"value": false
|
|
||||||
});
|
|
||||||
// Based on ExtendTube's ad removing solution
|
|
||||||
var p;
|
|
||||||
var yt = {};
|
|
||||||
var config_ = {};
|
|
||||||
var ytplayer = {};
|
|
||||||
var playerConfig = {
|
|
||||||
args: {}
|
|
||||||
};
|
|
||||||
Object.defineProperties(yt, {
|
|
||||||
"playerConfig": {
|
|
||||||
get: function() {
|
|
||||||
return playerConfig;
|
|
||||||
},
|
|
||||||
set: function(data) {
|
|
||||||
if(data && typeof data === "object" && data.args && typeof data.args === "object") {
|
|
||||||
var nope = /ad\d?_|afv|watermark|adsense|xfp/;
|
|
||||||
for(var prop in data.args) {
|
|
||||||
if(nope.test(prop) && !/policy/.test(prop)) {
|
|
||||||
delete data.args[prop];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
playerConfig = data;
|
|
||||||
var playerRoot = document.querySelector("[data-swf-config]");
|
|
||||||
if(playerRoot) {
|
|
||||||
playerRoot.dataset.swfConfig = JSON.stringify(yt.playerConfig);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"config_": {
|
|
||||||
get: function() {
|
|
||||||
return config_;
|
|
||||||
},
|
|
||||||
set: function(value) {
|
|
||||||
config_ = value;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
Object.defineProperty(config_, "PLAYER_CONFIG", {
|
|
||||||
get: function() {
|
|
||||||
return yt.playerConfig;
|
|
||||||
},
|
|
||||||
set: function(value) {
|
|
||||||
yt.playerConfig = value;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
Object.defineProperty(ytplayer, "config", {
|
|
||||||
get: function() {
|
|
||||||
return playerConfig;
|
|
||||||
},
|
|
||||||
set: function(value) {
|
|
||||||
yt.playerConfig = value;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
if(window.yt) {
|
|
||||||
var oldyt = window.yt;
|
|
||||||
delete window.yt;
|
|
||||||
for(p in oldyt) {
|
|
||||||
yt[p] = oldyt[p];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Object.defineProperty(window, "yt", {
|
|
||||||
get: function() {
|
|
||||||
return yt;
|
|
||||||
},
|
|
||||||
set: function() {}
|
|
||||||
});
|
|
||||||
if(window.ytplayer) {
|
|
||||||
var oldytplayer = window.ytplayer.config;
|
|
||||||
delete window.ytplayer;
|
|
||||||
for(p in oldytplayer) {
|
|
||||||
ytplayer.config[p] = oldytplayer[p];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Object.defineProperty(window, "ytplayer", {
|
|
||||||
get: function() {
|
|
||||||
return ytplayer;
|
|
||||||
},
|
|
||||||
set: function() {}
|
|
||||||
});
|
|
||||||
})();
|
|
||||||
};
|
|
||||||
|
|
@ -47,20 +47,6 @@
|
||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|
||||||
// addContentScriptFromURL allows whitelisting,
|
|
||||||
// so load sitepaching this way, instead of adding it to the Info.plist
|
|
||||||
|
|
||||||
safari.extension.addContentScriptFromURL(
|
|
||||||
safari.extension.baseURI + 'js/sitepatch-safari.js', [
|
|
||||||
'http://www.youtube.com/*',
|
|
||||||
'https://www.youtube.com/*',
|
|
||||||
'http://www.youtube-nocookie.com/*',
|
|
||||||
'https://www.youtube-nocookie.com/*'
|
|
||||||
]
|
|
||||||
);
|
|
||||||
|
|
||||||
/******************************************************************************/
|
|
||||||
|
|
||||||
safari.extension.settings.addEventListener('change', function(e) {
|
safari.extension.settings.addEventListener('change', function(e) {
|
||||||
if(e.key === 'open_prefs') {
|
if(e.key === 'open_prefs') {
|
||||||
vAPI.tabs.open({
|
vAPI.tabs.open({
|
||||||
|
|
|
||||||
|
|
@ -258,13 +258,6 @@ onpopstate();\
|
||||||
return r;\
|
return r;\
|
||||||
};";
|
};";
|
||||||
}
|
}
|
||||||
var whiteListed = safari.self.tab.canLoad(beforeLoadEvent, {
|
|
||||||
type: "isWhiteListed",
|
|
||||||
url: location.href
|
|
||||||
});
|
|
||||||
if(vAPI.sitePatch && !whiteListed) {
|
|
||||||
tmpScript += "(" + vAPI.sitePatch + ")();";
|
|
||||||
}
|
|
||||||
tmpScript += "})();";
|
tmpScript += "})();";
|
||||||
tmpJS.textContent = tmpScript;
|
tmpJS.textContent = tmpScript;
|
||||||
document.documentElement.removeChild(document.documentElement.appendChild(tmpJS));
|
document.documentElement.removeChild(document.documentElement.appendChild(tmpJS));
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue