Fix update.

andryou · andryou · commit 085bff033c0b · 2016-06-05T21:12:14.000-04:00
diff --git a/js/background.js b/js/background.js
@@ -25,13 +25,13 @@ function enabled(tab, dpcloakindex) {
 function domainCheck(domain) {
 	if (!domain) return '-1';
 	for (var i in whiteList) {
-		if (new RegExp('(?:www\\.)?(?:'+whiteList[i].replace(/^www\./, '').replace(/\./g, '\\.').replace(/\*/g, '\\w+').replace(/\?/g, '.')+')').test(domain)) {
+		if (new RegExp('(?:www\\.|^)(?:'+whiteList[i].replace(/^www\./, '').replace(/\./g, '\\.').replace(/\*/g, '[^.]+').replace(/\?/g, '.')+')').test(domain)) {
 			return '0';
 			break;
 		}
 	}
 	for (var i in blackList) {
-		if (new RegExp('(?:www\\.)?(?:'+blackList[i].replace(/^www\./, '').replace(/\./g, '\\.').replace(/\*/g, '\\w+').replace(/\?/g, '.')+')').test(domain)) {
+		if (new RegExp('(?:www\\.|^)(?:'+blackList[i].replace(/^www\./, '').replace(/\./g, '\\.').replace(/\*/g, '[^.]+').replace(/\?/g, '.')+')').test(domain)) {
 			return '1';
 			break;
 		}
@@ -413,6 +413,6 @@ whiteList = JSON.parse(localStorage['whiteList']);
 setDPIcon();
 dpContext();
 if ((!optionExists("version") || localStorage["version"] != version) && localStorage["showUpdateNotifications"] == 'true') {
-	if (!optionExists("version")) chrome.tabs.create({ url: chrome.extension.getURL('updated.html'), selected: false }); // very minor update, so only show to new installations.
+	// chrome.tabs.create({ url: chrome.extension.getURL('updated.html'), selected: false }); // very minor update
 	localStorage["version"] = version;
 }
diff --git a/manifest.json b/manifest.json
@@ -27,5 +27,5 @@
    },
    "permissions": [ "http://*/*", "https://*/*", "contextMenus", "tabs" ],
    "update_url": "http://clients2.google.com/service/update2/crx",
-   "version": "0.46.56.2"
+   "version": "0.46.56.4"
 }
diff --git a/updated.html b/updated.html
@@ -7,16 +7,16 @@
 <body id="updatepage">
 	<span id="title">Decreased Productivity</span> by Andrew Y.<br /><br />
 	<div id="main">
-	<h1>Updated to v0.46.56.2! (Sunday, June 5, 2016)</h1>
+	<h1>Updated to v0.46.56.4! (Sunday, June 5, 2016)</h1>
 	<ul>
-		<li>v0.46.56.2:<ul>
+		<li>v0.46.56.4:<ul>
 			<li><strong>Proudly presenting a long-awaited feature</strong>: wildcards and single character matching support:<ul>
 				<li>Domain Matching: <strong>domain.com</strong> matches domain.com and www.domain.com</li>
 				<li>Wildcard Matching: <strong>*.domain.com</strong> matches anything.domain.com (but <u>not</u> domain.com (no subdomain))</li>
 				<li>Single Character Matching: <strong>?.abc.com</strong> matches a.abc.com, b.abc.com, 2.abc.com, etc.</li>
 				<li><strong>Note 1:</strong> the * and ? can be placed anywhere and/or combined (e.g. ab?.com, cat*.c?)</li>
 				<li><strong>Note 2:</strong> if there are any duplicates, the whitelist always takes precedence over the blacklist</li>
-				<li><strong>Note 3:</strong> .2 update = improved performance if you have a very large whitelist/blacklist</li>
+				<li><strong>Note 3:</strong> .4 update = improved performance if you have a very large whitelist/blacklist</li>
 			</ul></li>
 			<li>the above update should also result in further improved performance</li>
 			<li>added cloaking support for &lt;picture&gt; elements</li>

Original file line number	Diff line number	Diff line change
`@@ -25,13 +25,13 @@ function enabled(tab, dpcloakindex) {`
`25`	`25`	`function domainCheck(domain) {`
`26`	`26`	`if (!domain) return '-1';`
`27`	`27`	`for (var i in whiteList) {`
`28`		`- if (new RegExp('(?:www\\.)?(?:'+whiteList[i].replace(/^www\./, '').replace(/\./g, '\\.').replace(/\*/g, '\\w+').replace(/\?/g, '.')+')').test(domain)) {`
	`28`	`+ if (new RegExp('(?:www\\.\|^)(?:'+whiteList[i].replace(/^www\./, '').replace(/\./g, '\\.').replace(/\*/g, '[^.]+').replace(/\?/g, '.')+')').test(domain)) {`
`29`	`29`	`return '0';`
`30`	`30`	`break;`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`	`for (var i in blackList) {`
`34`		`- if (new RegExp('(?:www\\.)?(?:'+blackList[i].replace(/^www\./, '').replace(/\./g, '\\.').replace(/\*/g, '\\w+').replace(/\?/g, '.')+')').test(domain)) {`
	`34`	`+ if (new RegExp('(?:www\\.\|^)(?:'+blackList[i].replace(/^www\./, '').replace(/\./g, '\\.').replace(/\*/g, '[^.]+').replace(/\?/g, '.')+')').test(domain)) {`
`35`	`35`	`return '1';`
`36`	`36`	`break;`
`37`	`37`	`}`
`@@ -413,6 +413,6 @@ whiteList = JSON.parse(localStorage['whiteList']);`
`413`	`413`	`setDPIcon();`
`414`	`414`	`dpContext();`
`415`	`415`	`if ((!optionExists("version") \|\| localStorage["version"] != version) && localStorage["showUpdateNotifications"] == 'true') {`
`416`		`- if (!optionExists("version")) chrome.tabs.create({ url: chrome.extension.getURL('updated.html'), selected: false }); // very minor update, so only show to new installations.`
	`416`	`+ // chrome.tabs.create({ url: chrome.extension.getURL('updated.html'), selected: false }); // very minor update`
`417`	`417`	`localStorage["version"] = version;`
`418`	`418`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,5 +27,5 @@`
`27`	`27`	`},`
`28`	`28`	`"permissions": [ "http:///", "https:///", "contextMenus", "tabs" ],`
`29`	`29`	`"update_url": "http://clients2.google.com/service/update2/crx",`
`30`		`- "version": "0.46.56.2"`
	`30`	`+ "version": "0.46.56.4"`
`31`	`31`	`}`