Tweaked Wildcard Matching

andryou · andryou · commit eaffd914b761 · 2016-05-29T13:11:52.000-04:00
diff --git a/js/background.js b/js/background.js
@@ -278,7 +278,7 @@ function setDPIcon() {
 }
 function regexify(arr) {
 	if (arr.length == 0) return '';
-	return '(?:www\\.|^)(?:'+arr.join('|').replace(/(^|\|)www\./g, '$1').replace(/\./g, '\\.').replace(/\*/g, '\\w+').replace(/\?/g, '.')+')';
+	return '(?:www\\.|^)(?:'+arr.join('|').replace(/(^|\|)www\./g, '$1').replace(/\./g, '\\.').replace(/\*/g, '[^.]+').replace(/\?/g, '.')+')';
 }
 // ----- Request library to support content script communication
 chrome.tabs.onUpdated.addListener(function(tabid, changeinfo, tab) {
@@ -407,6 +407,6 @@ setDPIcon();
 dpContext();
 if ((!optionExists("version") || localStorage["version"] != version) && localStorage["showUpdateNotifications"] == 'true') {
 	//chrome.tabs.create({ url: chrome.extension.getURL('updated.html'), selected: false });
-	// v0.46.56.2 is a minor update, so no need to show update notification.
+	// v0.46.56.2 and 3 are a minor update, so no need to show update notification.
 	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.3"
 }
diff --git a/updated.html b/updated.html
@@ -7,9 +7,9 @@
 <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, May 29, 2016)</h1>
+	<h1>Updated to v0.46.56.3! (Sunday, May 29, 2016)</h1>
 	<ul>
-		<li>v0.46.56.2:<ul>
+		<li>v0.46.56.3:<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>

Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ function setDPIcon() {`
`278`	`278`	`}`
`279`	`279`	`function regexify(arr) {`
`280`	`280`	`if (arr.length == 0) return '';`
`281`		`- return '(?:www\\.\|^)(?:'+arr.join('\|').replace(/(^\|\\|)www\./g, '$1').replace(/\./g, '\\.').replace(/\*/g, '\\w+').replace(/\?/g, '.')+')';`
	`281`	`+ return '(?:www\\.\|^)(?:'+arr.join('\|').replace(/(^\|\\|)www\./g, '$1').replace(/\./g, '\\.').replace(/\*/g, '[^.]+').replace(/\?/g, '.')+')';`
`282`	`282`	`}`
`283`	`283`	`// ----- Request library to support content script communication`
`284`	`284`	`chrome.tabs.onUpdated.addListener(function(tabid, changeinfo, tab) {`
`@@ -407,6 +407,6 @@ setDPIcon();`
`407`	`407`	`dpContext();`
`408`	`408`	`if ((!optionExists("version") \|\| localStorage["version"] != version) && localStorage["showUpdateNotifications"] == 'true') {`
`409`	`409`	`//chrome.tabs.create({ url: chrome.extension.getURL('updated.html'), selected: false });`
`410`		`- // v0.46.56.2 is a minor update, so no need to show update notification.`
	`410`	`+ // v0.46.56.2 and 3 are a minor update, so no need to show update notification.`
`411`	`411`	`localStorage["version"] = version;`
`412`	`412`	`}`
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.3"`
`31`	`31`	`}`