v0.46.56

- Proudly presenting a long-awaited feature: wildcards and single
character matching support:
--- Domain Matching: domain.com matches domain.com and www.domain.com
--- Wildcard Matching: *.domain.com matches anything.domain.com (but not
domain.com (no subdomain))
--- Single Character Matching: ?.abc.com matches a.abc.com, b.abc.com,
2.abc.com, etc.
--- Note 1: the * and ? can be placed anywhere and/or combined (e.g.
ab?.com, cat*.c?)
--- Note 2: if there are any duplicates, the whitelist always takes
precedence over the blacklist
- the above update should also result in further improved performance
- added cloaking support for <picture> elements

Author: andryou

changelog.txt

@@ -1,3 +1,13 @@
+v0.46.56 - Wednesday, May 25, 2016
+- Proudly presenting a long-awaited feature: wildcards and single character matching support:
+--- Domain Matching: domain.com matches domain.com and www.domain.com
+--- Wildcard Matching: *.domain.com matches anything.domain.com (but not domain.com (no subdomain))
+--- Single Character Matching: ?.abc.com matches a.abc.com, b.abc.com, 2.abc.com, etc.
+--- Note 1: the * and ? can be placed anywhere and/or combined (e.g. ab?.com, cat*.c?)
+--- Note 2: if there are any duplicates, the whitelist always takes precedence over the blacklist
+- the above update should also result in further improved performance
+- added cloaking support for <picture> elements
+
 v0.46.55.1 - Friday, May 20, 2016
 - further significant foundation code optimization, resulting in (probably noticeably) faster and more efficient logic and processing
 
@@ -77,7 +87,7 @@ v0.46.45 - Tuesday, February 9, 2016
 - improved compatibility with Engadget (thanks Dan), Google+ (scrolling stuttering), YouTube (thanks Jason), Reddit (if using Reddit Enhancement Suite (Night Mode))
 
 v0.46.44 - Friday, February 5, 2016
-- polished cloaking so more sites should be readable</li>
+- polished cloaking so more sites should be readable
 - improved compatibility with Facebook (main timeline post box and Instagram photos), Reddit (if using Reddit Enhancement Suite), the Gawker sites (e.g. Lifehacker, Gizmodo, etc)
 
 v0.46.43 - Friday, February 5, 2016

js/background.js

@@ -23,18 +23,8 @@ function enabled(tab, dpcloakindex) {
 	return 'false';
 }
 function domainCheck(domain) {
-	if (whiteList.indexOf(domain) != -1) return '0';
-	if (blackList.indexOf(domain) != -1) return '1';
-	if (domain.substr(0,4)=='www.') {
-		var truncdomain = domain.substr(4);
-		if (whiteList.indexOf(truncdomain) != -1) return '0';
-		if (blackList.indexOf(truncdomain) != -1) return '1';
-	} else {
-		// temp until regex support is coded
-		var wwwdomain = 'www.'+domain;
-		if (whiteList.indexOf(wwwdomain) != -1) return '0';
-		if (blackList.indexOf(wwwdomain) != -1) return '1';
-	}
+	if (whiteList && new RegExp(whiteList).test(domain)) return '0';
+	if (blackList && new RegExp(blackList).test(domain)) return '1';
 	return '-1';
 }
 function extractDomainFromURL(url) {
@@ -50,26 +40,30 @@ function domainHandler(domain,action) {
 	// Initialize local storage
 	if (typeof(localStorage['whiteList'])=='undefined') localStorage['whiteList'] = JSON.stringify([]);
 	if (typeof(localStorage['blackList'])=='undefined') localStorage['blackList'] = JSON.stringify([]);
+	var tempWhitelist = JSON.parse(localStorage['whiteList']);
+	var tempBlacklist = JSON.parse(localStorage['blackList']);
 
 	// Remove domain from whitelist and blacklist
-	var pos = whiteList.indexOf(domain);
-	if (pos>-1) whiteList.splice(pos,1);
-	pos = blackList.indexOf(domain);
-	if (pos>-1) blackList.splice(pos,1);
+	var pos = tempWhitelist.indexOf(domain);
+	if (pos>-1) tempWhitelist.splice(pos,1);
+	pos = tempBlacklist.indexOf(domain);
+	if (pos>-1) tempBlacklist.splice(pos,1);
 
 	switch(action) {
 		case 0:	// Whitelist
-			whiteList.push(domain);
+			tempWhitelist.push(domain);
 			break;
 		case 1:	// Blacklist
-			blackList.push(domain);
+			tempBlacklist.push(domain);
 			break;
 		case 2:	// Remove
 			break;
 	}
 
-	localStorage['whiteList'] = JSON.stringify(whiteList);
-	localStorage['blackList'] = JSON.stringify(blackList);
+	localStorage['blackList'] = JSON.stringify(tempBlacklist);
+	localStorage['whiteList'] = JSON.stringify(tempWhitelist);
+	blackList = regexify(tempBlacklist);
+	whiteList = regexify(tempWhitelist);
 	return false;
 }
 // ----- Options
@@ -282,6 +276,10 @@ function setDPIcon() {
 		});
 	});
 }
+function regexify(arr) {
+	if (arr.length == 0) return '';
+	return '(?:www\\.)?(?:'+arr.join('|').replace(/\./g, '\\.').replace(/\*/g, '\\w+').replace(/\?/g, '.')+')';
+}
 // ----- Request library to support content script communication
 chrome.tabs.onUpdated.addListener(function(tabid, changeinfo, tab) {
 	if (changeinfo.status == "loading") {
@@ -403,8 +401,8 @@ chrome.pageAction.onClicked.addListener(function(tab) {
 // Execute
 setDefaultOptions();
 // save blacklist and whitelist in global variable for faster lookups
-blackList = JSON.parse(localStorage['blackList']);
-whiteList = JSON.parse(localStorage['whiteList']);
+blackList = regexify(JSON.parse(localStorage['blackList']));
+whiteList = regexify(JSON.parse(localStorage['whiteList']));
 setDPIcon();
 dpContext();
 if ((!optionExists("version") || localStorage["version"] != version) && localStorage["showUpdateNotifications"] == 'true') {

js/dp.js

@@ -41,15 +41,15 @@ function addCloak(sfw, f, fsize, u, bg, text, table, link, bold, o1, o2, collaps
 	else magic += 'none !important; }';
 
 	if (sfw == 'SFW' || sfw == 'SFW1' || sfw == 'SFW2') {
-		if (o1 == 0 && collapseimage == 'true') magic += ' iframe, img, input[type=image], path, polygon { display: none !important; }';
-		else magic += ' iframe, img, input[type=image], path, polygon { opacity: '+o1+' !important; } iframe:hover, img:hover, input[type=image]:hover, path:hover, polygon:hover { opacity: '+o2+' !important; }';
+		if (o1 == 0 && collapseimage == 'true') magic += ' iframe, img, input[type=image], path, polygon, picture { display: none !important; }';
+		else magic += ' iframe, img, input[type=image], path, polygon, picture { opacity: '+o1+' !important; } iframe:hover, img:hover, input[type=image]:hover, path:hover, polygon:hover { opacity: '+o2+' !important; }';
 	}
 	if (sfw == 'SFW') {
 		if (o1 == 0 && collapseimage == 'true') magic += ' object, embed, param, video, audio { display: none !important; }';
 		else magic += ' object, embed, param, video, audio { opacity: '+o1+' !important; } object:hover, embed:hover, param:hover, video:hover, audio:hover { opacity: '+o2+' !important; }';
 	}
 	if (sfw == 'SFW1') magic += ' object, embed, param, video, audio { display: none !important; opacity: 0 !important; }';
-	if (sfw == 'Paranoid') magic += ' iframe, img, input[type=image], path, polygon, object, embed, param, video, audio { display: none !important; opacity: 0 !important; }';
+	if (sfw == 'Paranoid') magic += ' iframe, img, input[type=image], path, polygon, object, embed, param, video, audio, picture { display: none !important; opacity: 0 !important; }';
 
 	magic += ' .dp'+timestamp+'_visible { visibility: visible !important; opacity: 1 !important; }';
 	magic += ' .dp'+timestamp+'_unbold { font-weight: normal !important }';

js/options.js

@@ -471,9 +471,10 @@ function stylePreset(s) {
 // <!-- modified from KB SSL Enforcer: https://code.google.com/p/kbsslenforcer/
 function addList(type) {
 	var domain = $('#url').val();
-	var domainValidator = new RegExp('^[\\-\\w]+(\\.[\\-\\w]+)*(:[0-9]+)?$'); // https://stackoverflow.com/posts/18696953/revisions
+	var domainValidator = new RegExp('^[\\-\\w\\*\\?]+(\\.[\\-\\w\\*\\?]+)*(:[0-9]+)?$'); // https://stackoverflow.com/posts/18696953/revisions
+	domain = domain.toLowerCase();
 
-	if (!(domainValidator.test(domain.toLowerCase()))) {
+	if (!(domainValidator.test(domain))) {
 		$('#listMsg').html(chrome.i18n.getMessage("invaliddomain")).stop().fadeIn("slow").delay(2000).fadeOut("slow");
 	} else {
 		bkg.domainHandler(domain, type);

manifest.json

@@ -27,5 +27,5 @@
    },
    "permissions": [ "http://*/*", "https://*/*", "contextMenus", "tabs" ],
    "update_url": "http://clients2.google.com/service/update2/crx",
-   "version": "0.46.55.1"
+   "version": "0.46.56"
 }

options.html

@@ -218,7 +218,12 @@ <h1>Page Title</h1>
 				<tr>
 				<td colspan="2">
 					<table border="0" cellspacing="0" cellpadding="0">
-						<tr class="first"><td colspan="2"><label for="url" class="i18_domain">Domain</label>: <input id="url" value="" class="mousetrap" /> <input type="button" value="+ Whitelist" class="i18_addwhitelist" /><input type="button" value="+ Blacklist" class="i18_addblacklist" /><span id="listMsg"></span></td></tr>
+						<tr class="first"><td colspan="2"><label for="url" class="i18_domain">Domain</label>: <input id="url" value="" class="mousetrap" /> <input type="button" value="+ Whitelist" class="i18_addwhitelist" /><input type="button" value="+ Blacklist" class="i18_addblacklist" /><ul>
+							<li><small>Domain Matching: <strong>domain.com</strong> matches domain.com and www.domain.com</small></li>
+							<li><small>Wildcard Matching: <strong>*.domain.com</strong> matches anything.domain.com (but <u>not</u> domain.com (no subdomain))</small></li>
+							<li><small>Single Character Matching: <strong>?.abc.com</strong> matches a.abc.com, b.abc.com, 2.abc.com, etc.</small></li>
+							<li><small><strong>Note:</strong> the * and ? can be placed anywhere and/or combined (e.g. ab?.com, cat*.c?)</small></li>
+						</ul><span id="listMsg"></span></td></tr>
 						<tr><td><strong class="i18_whitelist">Whitelist</strong> (<a href="javascript:;" class="i18_clear">clear</a>)<div class="list" id="whitelist"></div></td><td><strong class="i18_blacklist">Blacklist</strong> (<a href="javascript:;" class="i18_clear">clear</a>)<div class="list" id="blacklist"></div></td></tr>
 					</table>
 				</td>
@@ -235,7 +240,7 @@ <h1>Page Title</h1>
 	<input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----">
 	<input type="image" src="./img/icon48.png" border="0" name="submit" class="i18_supportimg" alt="Support Andrew!" title="Support Andrew!">
 	</form> <span class="i18_support">Support Andrew!</span><br /><br />
-	<i style="width:937px; display:block;"><span class="i18_people">People who bought Andrew coffee</span>: Leonardo C., 朱之灏, Donald D., John B., Patrick H., Luke C., Eric G., Brian B., Daniel C., Joel D., Joseph W., David M., Rafal W., Ip L., Caillin P., Simon B., Keith T., Peter C., Gordon M., James M., Ranjan S., Philipp B., Rommel G., Todd A., Jason T., Vineet W., Adam C., Jim M., Alex U., Stanislav S., George T., Genere S., Kevin S., Jérémy P., Carlos S., Miguel L., Adrian H., Scott B., Daniel C., Mark M., Timothy D., Alexis B., Peter C., Christiaan E., Matthew L., Russell H., David D., Keith S., Elena G., Rafael V., Scott F., Paul M., Danielle F., 曾 信夫, Jon T., Barry D., Andrew H., Ma X., Frank E., Alex W., Roger S., Artem S., Wassim N., Rajat N., Vadim P., Celia D., Mikyas W., Reann M., Gabriel J., Anthony Z., Kai Cheong W., Jason T., Michael L., Maximilian B., Anton C., Koen de W., Juan de Dios Egido A., Harry P., Jaiganesh R.</i><br />
+	<i style="width:937px; display:block;"><span class="i18_people">People who bought Andrew coffee</span>: Leonardo C., 朱之灏, Donald D., John B., Patrick H., Luke C., Eric G., Brian B., Daniel C., Joel D., Joseph W., David M., Rafal W., Ip L., Caillin P., Simon B., Keith T., Peter C., Gordon M., James M., Ranjan S., Philipp B., Rommel G., Todd A., Jason T., Vineet W., Adam C., Jim M., Alex U., Stanislav S., George T., Genere S., Kevin S., Jérémy P., Carlos S., Miguel L., Adrian H., Scott B., Daniel C., Mark M., Timothy D., Alexis B., Peter C., Christiaan E., Matthew L., Russell H., David D., Keith S., Elena G., Rafael V., Scott F., Paul M., Danielle F., 曾 信夫, Jon T., Barry D., Andrew H., Ma X., Frank E., Alex W., Roger S., Artem S., Wassim N., Rajat N., Vadim P., Celia D., Mikyas W., Reann M., Gabriel J., Anthony Z., Kai Cheong W., Jason T., Michael L., Maximilian B., Anton C., Koen de W., Juan de Dios Egido A., Harry P., Jaiganesh R., Mark Rafael R., Adam B.</i><br />
 	<i style="width:937px; display:block;"><span class="i18_translators">People who helped translate</span>: Christoph (Deutsch), Luciano (Español), Yamaji (Japanese), Jérémy (Français), VeryFriend (Russian), Lorenzo (Italian)</i><br />
 	<i><span class="i18_help">If you can help translate or improve, please contact me</span>: <a href="mailto:[email protected]">[email protected]</a></i><br /><br />
 	<i><a href="https://twitter.com/andryou" target="_blank">Follow me (@andryou) on Twitter!</a><br /><br />