From 113b7dde1420df53df7efd471795f8c94fe9f0b0 Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 4 Feb 2015 00:04:43 -0700 Subject: [PATCH] Remove Safari sitepatch stuff (closes #633) --- platform/safari/sitepatch-safari.js | 111 ---------------------------- platform/safari/vapi-background.js | 14 ---- platform/safari/vapi-client.js | 7 -- 3 files changed, 132 deletions(-) delete mode 100644 platform/safari/sitepatch-safari.js diff --git a/platform/safari/sitepatch-safari.js b/platform/safari/sitepatch-safari.js deleted file mode 100644 index 1f935ebd4..000000000 --- a/platform/safari/sitepatch-safari.js +++ /dev/null @@ -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() {} - }); -})(); -}; diff --git a/platform/safari/vapi-background.js b/platform/safari/vapi-background.js index 078c0ab8b..9df2dc3e2 100644 --- a/platform/safari/vapi-background.js +++ b/platform/safari/vapi-background.js @@ -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) { if(e.key === 'open_prefs') { vAPI.tabs.open({ diff --git a/platform/safari/vapi-client.js b/platform/safari/vapi-client.js index bff10cc92..9da81d1cb 100644 --- a/platform/safari/vapi-client.js +++ b/platform/safari/vapi-client.js @@ -258,13 +258,6 @@ onpopstate();\ return r;\ };"; } - var whiteListed = safari.self.tab.canLoad(beforeLoadEvent, { - type: "isWhiteListed", - url: location.href - }); - if(vAPI.sitePatch && !whiteListed) { - tmpScript += "(" + vAPI.sitePatch + ")();"; - } tmpScript += "})();"; tmpJS.textContent = tmpScript; document.documentElement.removeChild(document.documentElement.appendChild(tmpJS));