Safari fixes and code reformatting

This commit is contained in:
Chris 2015-01-27 22:39:55 -07:00
parent a51a2666a9
commit 5a4f1b57cc
2 changed files with 323 additions and 372 deletions

View File

@ -1,104 +1,109 @@
/*******************************************************************************
µBlock - a browser extension to block requests.
Copyright (C) 2014 The µBlock authors
µ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 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.
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/}.
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
Home: https://github.com/gorhill/uBlock
*/
/******************************************************************************/
// Adding new URL requires to whitelist it in the background script too (addContentScriptFromURL)
// Note that the sitePach function will be converted to a string, and injected
// into the web-page in order to run in that scope. Because of this, variables
// from the extension scope won't be accessible in the sitePatch function.
var vAPI = self.vAPI = self.vAPI || {};
vAPI.sitePatch = function() {
// disable spf
window.ytspf = {};
Object.defineProperty(ytspf, 'enabled', {'value': false});
Object.defineProperty(ytspf, "enabled", {
"value": false
});
// Based on ExtendTube's ad removing solution
var p;
var yt = {};
var config_ = {};
var ytplayer = {};
var playerConfig = { args: {} };
var playerConfig = {
args: {}
};
Object.defineProperties(yt, {
'playerConfig': {
get: function() { return playerConfig; },
"playerConfig": {
get: function() {
return playerConfig;
},
set: function(data) {
if ( data && typeof data === 'object'
&& data.args && typeof data.args === 'object' ) {
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) ) {
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 ) {
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; }
"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(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; }
Object.defineProperty(ytplayer, "config", {
get: function() {
return playerConfig;
},
set: function(value) {
yt.playerConfig = value;
}
});
if ( window.yt ) {
if(window.yt) {
var oldyt = window.yt;
delete window.yt;
for ( p in oldyt ) { yt[p] = oldyt[p]; }
for(p in oldyt) {
yt[p] = oldyt[p];
}
Object.defineProperty(window, 'yt', {
get: function() { return yt; },
}
if(window.ytplayer) {
var oldytplayer = window.ytplayer;
delete window.ytplayer;
for(p in oldytplayer) {
ytplayer[p] = oldytplayer[p];
}
}
Object.defineProperty(window, "yt", {
get: function() {
return yt;
},
set: function() {}
});
if ( window.ytplayer ) {
for ( p in window.ytplayer ) { ytplayer[p] = window.ytplayer[p]; }
window.ytplayer = ytplayer;
}
else {
Object.defineProperty(window, 'ytplayer', {
get: function() { return ytplayer; },
Object.defineProperty(window, "ytplayer", {
get: function() {
return ytplayer;
},
set: function() {}
});
}
};

View File

@ -1,7 +1,7 @@
/*******************************************************************************
µBlock - a browser extension to block requests.
Copyright (C) 2014 The µBlock authors
Copyright (C) 2015 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
@ -18,134 +18,108 @@
Home: https://github.com/gorhill/uBlock
*/
/******************************************************************************/
// For non background pages
/******************************************************************************/
(function() {
'use strict';
var vAPI = self.vAPI = self.vAPI || {};
vAPI.safari = true;
/******************************************************************************/
var messagingConnector = function(response) {
if ( !response ) {
'use strict';
var vAPI = self.vAPI = self.vAPI || {};
vAPI.safari = true;
/******************************************************************************/
var messagingConnector = function(response) {
if(!response) {
return;
}
var channels = vAPI.messaging.channels;
var channel, listener;
if ( response.broadcast === true && !response.channelName ) {
for ( channel in channels ) {
if ( channels.hasOwnProperty(channel) === false ) {
if(response.broadcast === true && !response.channelName) {
for(channel in channels) {
if(channels.hasOwnProperty(channel) === false) {
continue;
}
listener = channels[channel].listener;
if ( typeof listener === 'function' ) {
if(typeof listener === 'function') {
listener(response.msg);
}
}
return;
}
if ( response.requestId ) {
if(response.requestId) {
listener = vAPI.messaging.listeners[response.requestId];
delete vAPI.messaging.listeners[response.requestId];
delete response.requestId;
}
if ( !listener ) {
if(!listener) {
channel = channels[response.channelName];
listener = channel && channel.listener;
}
if ( typeof listener === 'function' ) {
if(typeof listener === 'function') {
listener(response.msg);
}
};
/******************************************************************************/
var uniqueId = function() {
};
/******************************************************************************/
var uniqueId = function() {
return Math.random().toString(36).slice(2);
};
/******************************************************************************/
// Relevant?
// https://developer.apple.com/library/safari/documentation/Tools/Conceptual/SafariExtensionGuide/MessagesandProxies/MessagesandProxies.html#//apple_ref/doc/uid/TP40009977-CH14-SW12
vAPI.messaging = {
};
/******************************************************************************/
// Relevant?
// https://developer.apple.com/library/safari/documentation/Tools/Conceptual/SafariExtensionGuide/MessagesandProxies/MessagesandProxies.html#//apple_ref/doc/uid/TP40009977-CH14-SW12
vAPI.messaging = {
channels: {},
listeners: {},
requestId: 1,
connectorId: uniqueId(),
setup: function() {
this.connector = function(msg) {
// messages from the background script are sent to every frame,
// so we need to check the connectorId to accept only
// what is meant for the current context
if ( msg.name === vAPI.messaging.connectorId
|| msg.name === 'broadcast' ) {
if(msg.name === vAPI.messaging.connectorId || msg.name === 'broadcast') {
messagingConnector(msg.message);
}
};
safari.self.addEventListener('message', this.connector, false);
this.channels['vAPI'] = {
listener: function(msg) {
if ( msg.cmd === 'injectScript' && msg.details.code ) {
if(msg.cmd === 'injectScript' && msg.details.code) {
Function(msg.details.code).call(self);
}
}
};
},
close: function() {
if ( this.connector ) {
if(this.connector) {
safari.self.removeEventListener('message', this.connector, false);
this.connector = null;
this.channels = {};
this.listeners = {};
}
},
channel: function(channelName, callback) {
if ( !channelName ) {
if(!channelName) {
return;
}
this.channels[channelName] = {
channelName: channelName,
listener: typeof callback === 'function' ? callback : null,
send: function(message, callback) {
if ( !vAPI.messaging.connector ) {
if(!vAPI.messaging.connector) {
vAPI.messaging.setup();
}
message = {
channelName: this.channelName,
msg: message
};
if ( callback ) {
if(callback) {
message.requestId = vAPI.messaging.requestId++;
vAPI.messaging.listeners[message.requestId] = callback;
}
// popover content doesn't know messaging...
if ( safari.extension.globalPage ) {
if ( !safari.self.visible ) {
if(safari.extension.globalPage) {
if(!safari.self.visible) {
return;
}
safari.extension.globalPage.contentWindow
.vAPI.messaging.onMessage({
safari.extension.globalPage.contentWindow.vAPI.messaging.onMessage({
name: vAPI.messaging.connectorId,
message: message,
target: {
@ -157,52 +131,42 @@ vAPI.messaging = {
}
});
} else {
safari.self.tab.dispatchMessage(
vAPI.messaging.connectorId,
message
);
safari.self.tab.dispatchMessage(vAPI.messaging.connectorId, message);
}
},
close: function() {
delete vAPI.messaging.channels[this.channelName];
}
};
return this.channels[channelName];
}
};
};
/******************************************************************************/
vAPI.canExecuteContentScript = function() {
return(/^https?:/.test(location.protocol) && typeof safari === "object");
};
vAPI.canExecuteContentScript = function() {
return (/^https?:/.test(location.protocol) && typeof safari === 'object');
};
/******************************************************************************/
// This file can be included into extensin pages,
// but the following code should run only in content pages.
if ( location.protocol === 'safari-extension:' || typeof safari !== 'object' ) {
// The following code should run only in content pages
if(location.protocol === "safari-extension:" || typeof safari !== "object") {
return;
}
}
/******************************************************************************/
var frameId = window === window.top ? 0 : Date.now() % 1E5;
var parentFrameId = (frameId ? 0 : -1);
var frameId = window === window.top ? 0 : Date.now() % 1E5;
var parentFrameId = (frameId ? 0 : -1);
var beforeLoadEvent = new Event("beforeload"); // Helper event to message background
// Helper event to message background,
// and helper anchor element
var beforeLoadEvent = new Event("beforeload"),
linkHelper = document.createElement("a");
// Inform that we've navigated
if(frameId === 0) {
// Inform that we've navigated
if(frameId === 0) {
safari.self.tab.canLoad(beforeLoadEvent, {
url: location.href,
type: "navigatedToNew"
});
}
var linkHelper = document.createElement("a");
var nodeTypes = {
}
var nodeTypes = {
"frame": "sub_frame",
"iframe": "sub_frame",
"script": "script",
@ -211,16 +175,16 @@ var nodeTypes = {
"object": "object",
"embed": "object",
"link": "stylesheet"
};
var shouldBlockDetailedRequest = function(details) {
};
var shouldBlockDetailedRequest = function(details) {
linkHelper.href = details.url;
details.url = linkHelper.href;
details.frameId = frameId;
details.parentFrameId = parentFrameId;
details.timeStamp = Date.now();
return !(safari.self.tab.canLoad(beforeLoadEvent, details));
}
var onBeforeLoad = function(e) {
}
var onBeforeLoad = function(e) {
if(e.url.lastIndexOf("data:", 0) === 0) {
return;
}
@ -228,7 +192,7 @@ var onBeforeLoad = function(e) {
var url = linkHelper.href;
var details = {
url: url,
type: nodeTypes[e.target.nodeName.toLowerCase()] || 'other',
type: nodeTypes[e.target.nodeName.toLowerCase()] || "other",
// tabId is determined in the background script
frameId: frameId,
parentFrameId: parentFrameId,
@ -238,83 +202,76 @@ var onBeforeLoad = function(e) {
if(!response) {
e.preventDefault();
}
};
};
document.addEventListener("beforeload", onBeforeLoad, true);
document.addEventListener('beforeload', onBeforeLoad, true);
/******************************************************************************/
// block pop-ups, intercept xhr requests, and apply site patches
var firstMutation = function() {
document.removeEventListener('DOMContentLoaded', firstMutation, true);
// Block popups, intercept XHRs, and add site patches
var firstMutation = function() {
document.removeEventListener("DOMContentLoaded", firstMutation, true);
firstMutation = false;
var randEventName = uniqueId();
window.addEventListener(randEventName, function(e) {
if(shouldBlockDetailedRequest(e.detail)) {
e.detail.url = false;
};
}, true);
// the extension context is unable to reach the page context,
// also this only works when Content Security Policy allows inline scripts
var tmpJS = document.createElement('script');
var tmpScript = ['(function() {',
'var block = function(u, t) {',
'var e = new CustomEvent("' + randEventName +'",',
'{detail: {url: u, type: t}, bubbles: false});',
'dispatchEvent(e);',
'return e.detail.url === false;',
'}, wo = open, xo = XMLHttpRequest.prototype.open;',
'open = function(u) {',
'return block(u, "popup") ? null : wo.apply(this, arguments);',
'};',
'XMLHttpRequest.prototype.open = function(m, u, s) {',
'return xo.apply(',
'this,',
'block(u, "xmlhttprequest") ? ["HEAD", u, s] : arguments',
');',
'};'
];
if(frameId === 0) {
tmpScript.push(
'var pS = history.pushState, rS = history.replaceState,',
'onpopstate = function(e) {',
'if (!e || e.state !== null) block(location.href, "popstate");',
'};',
'window.addEventListener("popstate", onpopstate, true);',
'history.pushState = function() {',
'var r = pS.apply(this, arguments);',
'onpopstate();',
'return r;',
'};',
'history.replaceState = function() {',
'var r = rS.apply(this, arguments);',
'onpopstate();',
'return r;',
'};'
);
}
}, true);
var tmpJS = document.createElement("script");
var tmpScript = "\
(function() {\
var block = function(u, t) {\
var e = new CustomEvent('" + randEventName + "', {\
detail: {\
url: u,\
type: t\
},\
bubbles: false\
});\
dispatchEvent(e);\
return e.detail.url === false;\
},\
wo = open,\
xo = XMLHttpRequest.prototype.open;\
open = function(u) {\
return block(u, 'popup') ? null : wo.apply(this, arguments);\
};\
XMLHttpRequest.prototype.open = function(m, u, s) {\
return xo.apply(this, block(u, 'xmlhttprequest') ? ['HEAD', u, s] : arguments);\
};";
if(frameId === 0) {
tmpScript += "\
var pS = history.pushState,\
rS = history.replaceState,\
onpopstate = function(e) {\
if(!e || e.state !== null) {\
block(location.href, 'popstate');\
}\
};\
window.addEventListener('popstate', onpopstate, true);\
history.pushState = function() {\
var r = pS.apply(this, arguments);\
onpopstate();\
return r;\
};\
history.replaceState = function() {\
var r = rS.apply(this, arguments);\
onpopstate();\
return r;\
};";
}
var whiteListed = safari.self.tab.canLoad(beforeLoadEvent, {
type: "isWhiteListed",
url: location.href
});
if(vAPI.sitePatch && !whiteListed) {
tmpScript.push('(' + vAPI.sitePatch + ')();');
tmpScript += "(" + vAPI.sitePatch + ")();";
}
tmpScript.push('})();');
tmpJS.textContent = tmpScript.join('');
tmpScript += "})();";
tmpJS.textContent = tmpScript;
document.documentElement.removeChild(document.documentElement.appendChild(tmpJS));
};
};
document.addEventListener("DOMContentLoaded", firstMutation, true);
document.addEventListener('DOMContentLoaded', firstMutation, true);
/******************************************************************************/
var onContextMenu = function(e) {
var onContextMenu = function(e) {
var target = e.target;
var tagName = target.tagName.toLowerCase();
var details = {
@ -322,34 +279,23 @@ var onContextMenu = function(e) {
pageUrl: location.href,
insideFrame: window !== window.top
};
details.editable = tagName === 'textarea' || tagName === 'input';
if ( target.hasOwnProperty('checked') ) {
details.editable = (tagName === "textarea" || tagName === "input");
if(target.hasOwnProperty("checked")) {
details.checked = target.checked;
}
if ( tagName === 'a' ) {
if(tagName === "a") {
details.linkUrl = target.href;
}
if ( target.hasOwnProperty('src') ) {
if(target.hasOwnProperty("src")) {
details.srcUrl = target.src;
if ( tagName === 'img' ) {
details.mediaType = 'image';
} else if ( tagName === 'video' || tagName === 'audio' ) {
if(tagName === "img") {
details.mediaType = "image";
} else if(tagName === "video" || tagName === "audio") {
details.mediaType = tagName;
}
}
safari.self.tab.setContextMenuEventUserInfo(e, details);
};
self.addEventListener('contextmenu', onContextMenu, true);
/******************************************************************************/
};
self.addEventListener("contextmenu", onContextMenu, true);
})();
/******************************************************************************/