Merge remote-tracking branch 'refs/remotes/origin/master' into legacy…

…permissions
andryou · Jan 18, 2017 · fe97597 · fe97597
2 parents e08268c + 740f1d9
commit fe97597
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 5 deletions.
diff --git a/html/popup.html b/html/popup.html
@@ -8,7 +8,7 @@
 </head>
 <body>
 	<div id="container">
-		<div id="header"><a href="javascript:;" id="pop_webstore">ScriptSafe v<span id="version"></span> BETA</a><div><a href="javascript:;" id="pop_options">Options</a> | <span class="box box3" id="pop_refresh">&#x21bb;</span> | <span class="box box4 closebtn" id="pop_close">X</span></div></div>
+		<div id="header"><a href="javascript:;" id="pop_webstore">ScriptSafe v<span id="version"></span></a><div><a href="javascript:;" id="pop_options">Options</a> | <span class="box box3" id="pop_refresh">&#x21bb;</span> | <span class="box box4 closebtn" id="pop_close">X</span></div></div>
 		<table border="0" cellpadding="0" cellspacing="0">
 			<tr><th id="currentdomain"></th></tr>
 			<tr><td id="parent"></td></tr>

diff --git a/html/updated.html b/html/updated.html
@@ -31,11 +31,14 @@
 			</div>
 			<hr>
 			<div class="panel panel-success">
-				<div class="panel-heading"><h3>Updated to v<span id="versionno"></span> BETA! (Friday, January 13, 2017)</h3></div>
+				<div class="panel-heading"><h3>Updated to v<span id="versionno"></span>! (Wednesday, January 18, 2017)</h3></div>
 				<div class="panel-body">
+					<p>Happy new year! I hope 2017 is off to a great start for you.</p>
+					<p>This update brings several improvements, a redesign of the ScriptSafe panel to better accommodate all languages and long domain names, as well as Spanish translation. On the topic of language: I will start working on providing users the ability to control the interface language.</p>
+					<p>I want to take this opportunity to recommend an excellent Chrome extension by EFF (Electronic Frontier Foundation) which automatically blocks ads and trackers using heuristics, which you can use alongside ScriptSafe: <a href="https://www.eff.org/privacybadger" target="_blank">Privacy Badger</a>.</p>
 					<p>In this release you will find the following updates:</p>
 					<ul>
-						<li><strong>v1.0.9.0 BETA:</strong><ul>
+						<li><strong>v1.0.9.0:</strong><ul>
 							<li>Several improvements have been made to the ScriptSafe panel:
 								<ul>
 									<li>Changed to a one-column layout to better accommodate all languages and long domain names</li>

diff --git a/js/options.js b/js/options.js
@@ -292,7 +292,7 @@ function saveElement(id) {
 	localStorage[id] = $("#"+id).val();
 }
 function loadOptions() {
-	$("#title").html("ScriptSafe v"+version+" BETA");
+	$("#title").html("ScriptSafe v"+version);
 	loadCheckbox("enable");
 	loadCheckbox("syncenable");
 	if (!$("#syncenable").prop('checked')) $("#syncbuttons").hide();

diff --git a/js/popup.js b/js/popup.js
@@ -48,6 +48,7 @@ function truncate(str, len) {
 }
 document.addEventListener('DOMContentLoaded', function () {
 	setTimeout(init, 150);
+	$("#pop_ay").mouseup(function(e) { if (e.which != 3) openTab('https://twitter.com/andryou'); });
 	$("#pop_docs").mouseup(function(e) { if (e.which != 3) openTab('https://www.andryou.com/scriptsafe/'); });
 	$("#pop_project").mouseup(function(e) { if (e.which != 3) openTab('https://github.com/andryou/scriptsafe'); });
 	$("#pop_options").mouseup(function(e) { if (e.which != 3) openTab(chrome.extension.getURL('html/options.html')); });

diff --git a/js/updated.js b/js/updated.js
@@ -3,7 +3,7 @@
 // The GNU General Public License can be found in the gpl.txt file. Alternatively, see <http://www.gnu.org/licenses/>.
 document.addEventListener('DOMContentLoaded', function () {
 	var version = '1.0.9.0';
-	$("#title").html("ScriptSafe v"+version+" BETA");
+	$("#title").html("ScriptSafe v"+version);
 	$('#versionno').html(version);
 	$("#loadoptionspage").click(function() { location.href='options.html'; });
 	$("#closepage").click(function() { window.open('', '_self', '');window.close(); });

diff --git a/js/yoyo.js b/js/yoyo.js
@@ -5431,6 +5431,7 @@ var yoyo1 = [
 'onclickads2.net',
 'onclickpredictiv.com',
 'onclickrev.com',
+'onclkds.com',
 'one-door.com',
 'one-time-offer.com',
 'one.ru',
@@ -5698,6 +5699,7 @@ var yoyo1 = [
 'playertraffic.com',
 'playhaven.com',
 'playminigolf.com',
+'playnow.guru',
 'playtomic.com',
 'pleasedontslaymy.download',
 'plemedia.com',
@@ -6046,6 +6048,7 @@ var yoyo1 = [
 'redirectingat.com',
 'reditions.net',
 'redmas.com',
+'redrct.site',
 'redroomnetwork.com',
 'reduxmedia.com',
 'reduxmediagroup.com',
@@ -28349,6 +28352,7 @@ var yoyo2 = [
 'akatracking.esearchvision.com',
 'akihabaranews.us.intellitxt.com',
 'akillimeyveler.reklamagaci.com',
+'akm.playnow.guru',
 'aknoj.voluumtrk.com',
 'aksb-a.akamaihd.net',
 'aktrack.pubmatic.com',
@@ -32582,6 +32586,7 @@ var yoyo2 = [
 'c.aol.com',
 'c.apple.com',
 'c.atdmt.com',
+'c.ato.mx',
 'c.baidu.com',
 'c.betrad.com',
 'c.bigmir.net',
@@ -40452,13 +40457,15 @@ var yoyo2 = [
 'i.n.jwpltx.com',
 'i.nuseek.com',
 'i.offerx.co.uk',
+'i.playnow.guru',
 'i.plug.it',
 'i.po.st',
 'i.psa-ads.openx.com',
 'i.pxlad.io',
 'i.r1-cdn.net',
 'i.sahcdn.com',
 'i.sbitinbsjs.info',
+'i.serves.live',
 'i.simpli.fi',
 'i.smartwebads.com',
 'i.socdm.com',