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

…permissions

html/options.html

@@ -41,11 +41,6 @@
 					<input type="checkbox" id="noscript" class="save" /><label for="noscript"> &lt;NOSCRIPT&gt;</label><br />
 					<input type="checkbox" id="image" class="save" /><label for="image"> &lt;IMG&gt;</label>
 				</td></tr>
-				<tr><td class="rowtitle"><label for="preservesamedomain">Respect Same-Domain</label>:</td><td><select id="preservesamedomain" class="savechange">
-					<option value="false">Disabled</option>
-					<option value="strict">Strict - allow same domain only</option>
-					<option value="true">Loose - allow same domain and subdomains</option>
-				</select><br /><i>(Default: Disabled; preserve same-domain elements)</i></td></tr>
 				<tr><td class="rowtitle"><label for="xml">XML HTTP Request Handling</label>:</td><td><select id="xml" class="savechange">
 					<option value="false">Disable</option>
 					<option value="true">Control Cross-Domain Requests (allow Same-Domain)</option>
@@ -116,6 +111,11 @@
 					<option value="same">Same Tab</option>
 					<option value="new">New Tab</option>
 				</select> <i>(Default: -Unchanged-; modifies how all links are opened)</i></td></tr>
+				<tr><td class="rowtitle"><label for="preservesamedomain">Respect Same-Domain</label>:</td><td><select id="preservesamedomain" class="savechange">
+					<option value="false">Disabled</option>
+					<option value="strict">Strict - allow same domain only</option>
+					<option value="true">Loose - allow same domain and subdomains</option>
+				</select><br /><i>(Default: Disabled; preserve same-domain elements)</i></td></tr>
 				<tr><td class="rowtitle"><label for="refresh">Auto-Refresh Page</label>:</td><td><input type="checkbox" id="refresh" class="save" /> <i>(Default: enabled; auto-refresh page after list change)</i></td></tr>
 				<tr><td class="rowtitle"><label for="rating">Show Rating Button</label>:</td><td><input type="checkbox" id="rating" class="save" /> <i>(Default: enabled; if ticked, adds rating button under domains in tab popup)</i></td></tr>
 				<tr><td class="rowtitle"><label for="classicoptions">Classic Options Mode</label>:</td><td><input type="checkbox" id="classicoptions" class="save" /> <i>(Default: disabled; if ticked, closes tab options everytime an option is clicked)</i></td></tr>

html/updated.html

@@ -9,17 +9,16 @@
 	<div id="message"></div> 
 	<div id="main">
 	<div id="header"><span id="title">ScriptSafe</span><br /><br />
-	<h1>Updated to v<span id="versionno"></span>! (__, June __, 2016)</h1>
+	<h1>Updated to v<span id="versionno"></span>! (Monday, June 13, 2016)</h1>
 	<br />
 	<hr>
 	<div style="text-align: left; line-height: 18px; font-size: 13px;"><br />
 	In this version you will find the following updates:
 	<ul>
-		<li><b>v1.0.7.11-DEV:</b><ul>
-			<li><strong>Announcement: <a href="https://github.com/andryou/scriptsafe/issues/29" target="_blank">changes to ScriptSafe updates</a></strong> (thank you to all those who <a href="https://github.com/andryou/scriptsafe/issues/40" target="_blank">helped test this release</a> over this weekend)</li>
+		<li><b>v1.0.7.11:</b><ul>
+			<li><strong>Announcement: <a href="https://github.com/andryou/scriptsafe/issues/29" target="_blank">changes to ScriptSafe updates</a></strong> (thank you to all those who helped test this release over this weekend)</li>
 			<li>Further important compatibility fixes for ScriptSafe to work in Chrome-derivative browsers (e.g. not crash)</li>
 			<li>Greatly reduced page load times/CPU usage if using large lists and "Block Click-Through Referrer" enabled</li>
-			<li>Moved "Respect Same-Domain" option to be in the "General Settings" section</li>
 			<li>Removed update notification messages based on feedback</li>
 			<li>Better behaviour when visiting pages on blocked domains</li>
 			<li>Better handling of post-page-load inserted content</li>

js/yoyo.js

@@ -1627,7 +1627,6 @@ var yoyo1 = [
 'bannerswap.com',
 'bannersworld.com',
 'bannersxchange.com',
-'bannertesting.com',
 'bannerware.com',
 'bannerweb.com',
 'bannery.cz',
@@ -3139,7 +3138,9 @@ var yoyo1 = [
 'euroconcept.ro',
 'eurocounter.com',
 'europe-academy.net',
+'european-toplist.de',
 'europerank.com',
+'euroranking.de',
 'euros4click.de',
 'eurosponsor.de',
 'eusta.de',
@@ -3549,6 +3550,7 @@ var yoyo1 = [
 'geovisites.com',
 'geoworldonline.com',
 'geraldine-arpin.us',
+'german-linkindex.de',
 'gesdes.com',
 'get-amazing-results.com',
 'get-answers-fast.com',
@@ -5612,6 +5614,7 @@ var yoyo1 = [
 'opap.co.kr',
 'openads.org',
 'openadserving.com',
+'openclick.com',
 'opendownloadmanager.com',
 'openmarket.com',
 'opensoftwareupdate.com',
@@ -5691,6 +5694,7 @@ var yoyo1 = [
 'pagerank-estate-spb.ru',
 'pagerank-ranking.com',
 'pagerank-ranking.de',
+'pagerank-server7.de',
 'pagerank-submitter.com',
 'pagerank-submitter.de',
 'pagerank-suchmaschine.de',
@@ -27584,6 +27588,7 @@ var yoyo2 = [
 'adserver.cams.com',
 'adserver.cash4webmaster.de',
 'adserver.chickclick.com',
+'adserver.clashmusic.com',
 'adserver.click-fr.com',
 'adserver.click4cash.de',
 'adserver.clix.pt',
@@ -28032,6 +28037,7 @@ var yoyo2 = [
 'adv.r7.com',
 'adv.researchnow.co.uk',
 'adv.rockstar.bg',
+'adv.securestudies.com',
 'adv.sexcounter.com',
 'adv.speednet.bg',
 'adv.starozagorci.com',