extend blacklist syntax to specify an element (#96)

Author: akahuku

src/chrome/_locales/en_US/messages.json

@@ -34,8 +34,8 @@
     "description": "Exceptional URLs"
   },
   "option_qa_blacklist_tips": {
-    "message": "* Put any URL to prevent from wasavi activation.\n* One URL per line.\n* A line starting with [c];[/c] or [c]#[/c] is treated as comment.\n* You can use wildcard [c]*[/c] and [c]?[/c] in URL.",
-    "description": "* Put any URL to prevent from wasavi activation.\n* One URL per line.\n* A line starting with [c];[/c] or [c]#[/c] is treated as comment.\n* You can use wildcard [c]*[/c] and [c]?[/c] in URL."
+    "message": "* Put any URL to prevent from wasavi activation.\n* One URL per line.\n* A line starting with [c];[/c] or [c]#[/c] is treated as comment.\n* You can use wildcard [c]*[/c] and [c]?[/c] in URL.\n* You can also put blank and CSS selector expression after URL, like [c]http://example.net/ [name=\"foo\"][/c]. The selector will changes a blacklisting target to an element from a page.",
+    "description": "* Put any URL to prevent from wasavi activation.\n* One URL per line.\n* A line starting with [c];[/c] or [c]#[/c] is treated as comment.\n* You can use wildcard [c]*[/c] and [c]?[/c] in URL.\n* You can also put blank and CSS selector expression after URL, like [c]http://example.net/ [name=\"foo\"][/c]. The selector will changes a blacklisting target to an element from a page."
   },
   "option_target_elements_desc": {
     "message": "* Format is <(modifier-)* key>,...\nFor example, <c-enter>, <insert> means \"Launch wasavi when ctrl+enter or insert is pressed.\"\n* Following keys can be used:\n[c]backspace[/c] [c]bs[/c] [c]tab[/c] [c]enter[/c] [c]return[/c] [c]ret[/c] [c]pageup[/c] [c]pagedown[/c] [c]end[/c] [c]home[/c] [c]left[/c] [c]up[/c] [c]right[/c] [c]down[/c] [c]insert[/c] [c]ins[/c] [c]delete[/c] [c]del[/c] [c],[/c] [c]comma[/c] [c].[/c] [c]dot[/c] [c]period[/c] [c]/[/c] [c]slash[/c] [c]\\[[/c] [c]\\\\[/c] [c]backslash[/c] [c]\\][/c]\n[c]f1[/c] to [c]f12[/c], [c]a[/c] to [c]z[/c], [c]0[/c] to [c]9[/c]\n* Following keys can be used as modifier: [c]s[/c] (for SHIFT), [c]c[/c] (for CTRL).\n* If text field is left empty default shortcut <c-enter>, <insert> is used.",
@@ -988,4 +988,4 @@
     "message": "You are in the restricted region.",
     "description": "You are in the restricted region."
   }
-}
+}

src/chrome/_locales/ja/messages.json

@@ -34,8 +34,8 @@
     "description": "Exceptional URLs"
   },
   "option_qa_blacklist_tips": {
-    "message": "* wasavi の起動をさせない URL を記述してください。\n* 1 行につき 1 URL です。\n* [c];[/c] または [c]#[/c] で始まる行はコメントと見なされます。\n* URL の中ではワイルドカード [c]*[/c] および [c]?[/c] を使用できます。",
-    "description": "* Put any URL to prevent from wasavi activation.\n* One URL per line.\n* A line starting with [c];[/c] or [c]#[/c] is treated as comment.\n* You can use wildcard [c]*[/c] and [c]?[/c] in URL."
+    "message": "* wasavi の起動をさせない URL を記述してください。\n* 1 行につき 1 URL です。\n* [c];[/c] または [c]#[/c] で始まる行はコメントと見なされます。\n* URL の中ではワイルドカード [c]*[/c] および [c]?[/c] を使用できます。\n* URL に続けて、空白と CSS セレクタを [c]http://example.net/ [name=\"foo\"][/c] のように記述することもできます。このセレクタは、ブロッキングの対象をページから要素に狭めます。",
+    "description": "* Put any URL to prevent from wasavi activation.\n* One URL per line.\n* A line starting with [c];[/c] or [c]#[/c] is treated as comment.\n* You can use wildcard [c]*[/c] and [c]?[/c] in URL.\n* You can also put blank and CSS selector expression after URL, like [c]http://example.net/ [name=\"foo\"][/c]. The selector will changes a blacklisting target to an element from a page."
   },
   "option_target_elements_desc": {
     "message": "* ショートカットの書式は <(修飾子-)*キー>,... です。\n例えば、<c-enter>,<insert> は「ctrl+enter か insert が押されたら、wasavi を起動する」ことを意味します。\n* 以下のキーをショートカットに使用できます:\n[c]backspace[/c] [c]bs[/c] [c]tab[/c] [c]enter[/c] [c]return[/c] [c]ret[/c] [c]pageup[/c] [c]pagedown[/c] [c]end[/c] [c]home[/c] [c]left[/c] [c]up[/c] [c]right[/c] [c]down[/c] [c]insert[/c] [c]ins[/c] [c]delete[/c] [c]del[/c] [c],[/c] [c]comma[/c] [c].[/c] [c]dot[/c] [c]period[/c] [c]/[/c] [c]slash[/c] [c]\\[[/c] [c]\\\\[/c] [c]backslash[/c] [c]\\][/c]\n[c]f1[/c] から [c]f12[/c], [c]a[/c] から [c]z[/c], [c]0[/c] から [c]9[/c]\n* 以下のキーを修飾子として使用できます: [c]s[/c] (シフトキー)、[c]c[/c] (コントロールキー)。\n* テキストフィールドを空にすると、既定のショートカット <c-enter>, <insert> が使用されます。",
@@ -988,4 +988,4 @@
     "message": "保護された領域内です。",
     "description": "You are in the restricted region."
   }
-}
+}

src/chrome/frontend/agent.js

@@ -63,7 +63,7 @@ var fontFamily;
 var quickActivation;
 var devMode;
 var logMode;
-var canLaunch;
+var blacklist;
 var statusLineHeight;
 
 var targetElement;
@@ -684,18 +684,49 @@ function toPlainText (input) {
 	}
 }
 
-function isInBlacklist (blacklist) {
-	var result = (blacklist || '').split('\n').some(function (url) {
-		url = url.replace(/^\s+|\s+$/g, '');
-		if (url == '' || /^[#;]/.test(url)) return;
-
+function parseBlacklist (blacklist) {
+	var result = {
+		fullBlocked: false,
+		selectors: [],
+		includes: function (element) {
+			return this.fullBlocked || this.selectors.some(function (s) {
+				try {
+					return Array.prototype.indexOf.call(
+						document.querySelectorAll(s), element) >= 0;
+				}
+				catch (e) {}
+			});
+		}
+	};
+	(blacklist || '').split('\n').some(function (line) {
+		line = line.replace(/^\s+|\s+$/g, '');
+		if (line == '' || /^[#;]/.test(url)) return;
+
+		var delimiter = /\s+/.exec(line);
+		if (delimiter) {
+			line = [
+				line.substring(0, delimiter.index),
+				line.substring(delimiter.index + delimiter[0].length)
+			];
+		}
+		else {
+			line = [line, ''];
+		}
 		try {
-			url = new RegExp('^' + url
+			var url = new RegExp('^' + line[0]
 				.replace(/[\\^$+.()|{}]/g, function ($0) {return '\\' + $0})
 				.replace(/\?/g, '.')
 				.replace(/\*/g, '.+?'), 'i');
 
-			if (url.test(window.location.href)) return true;
+			if (url.test(window.location.href)) {
+				if (line[1] == '') {
+					result.fullBlocked = true;
+					return true;
+				}
+				else {
+					result.selectors.push(line[1]);
+				}
+			}
 		}
 		catch (e) {}
 	});
@@ -863,13 +894,13 @@ function createPageAgent (listenKeydown, hookKeyEvents) {
  */
 
 function handleKeydown (e) {
-	if (!canLaunch || targetElement || !e || !e.target || !allowedElements) return;
+	if (targetElement || !e || !e.target || !allowedElements) return;
 	if (e.keyCode == 16 || e.keyCode == 17 || e.keyCode == 18) return;
+	if (blacklist.includes(e.target)) return;
 
 	if (e.target.isContentEditable && allowedElements.enableContentEditable
 	||  e.target.nodeName == 'BODY' && allowedElements.enablePage
 	||  /^(?:TEXTAREA|INPUT)$/.test(e.target.nodeName) && isAcceptable(e.target.type)) {
-
 		/*
 		 * <textarea>
 		 * <textarea data-texteditor-extension="auto">
@@ -901,12 +932,11 @@ function handleKeydown (e) {
  */
 
 function handleTargetFocus (e) {
-	if (!canLaunch || !quickActivation || targetElement || !e || !e.target || !allowedElements) return;
-
+	if (!quickActivation || targetElement || !e || !e.target || !allowedElements) return;
+	if (blacklist.includes(e.target)) return;
 	if (e.target.isContentEditable && allowedElements.enableContentEditable
 	||  e.target.nodeName == 'BODY' && allowedElements.enablePage
 	||  /^(?:TEXTAREA|INPUT)$/.test(e.target.nodeName) && isAcceptable(e.target.type)) {
-
 		var current = e.target.getAttribute(EXTENSION_CURRENT);
 		var spec = e.target.getAttribute(EXTENSION_SPECIFIER);
 		if (current !== null) return;
@@ -965,10 +995,11 @@ function handleAgentInitialized (req) {
  */
 
 function handleRequestLaunch () {
-	if (!canLaunch || wasaviFrame || targetElement || !allowedElements) return;
+	if (wasaviFrame || targetElement || !allowedElements) return;
 	if (typeof document.hasFocus == 'function' && !document.hasFocus()) return;
 
 	var target = document.activeElement;
+	if (blacklist.includes(target)) return;
 	if (target.isContentEditable && allowedElements.enableContentEditable
 	||  (target.nodeName == 'TEXTAREA' || target.nodeName == 'INPUT')
 		&& target.type in ACCEPTABLE_TYPES
@@ -1237,9 +1268,7 @@ function handleBackendMessage (req) {
 				break;
 			}
 		}
-		if (qaBlacklist) {
-			canLaunch = !isInBlacklist(qaBlacklist);
-		}
+		blacklist = parseBlacklist(qaBlacklist);
 		logbuf.length && log(
 			'update-storage: consumed ', logbuf.join(', '));
 		break;
@@ -1374,7 +1403,7 @@ function handleConnect (req) {
 	quickActivation = req.quickActivation;
 	devMode = req.devMode;
 	logMode = req.logMode;
-	canLaunch = !isInBlacklist(req.qaBlacklist);
+	blacklist = parseBlacklist(req.qaBlacklist);
 	statusLineHeight = req.statusLineHeight;
 
 	extension.ensureRun(handleAgentInitialized, req);

src/chrome/scripts/options-core.js

@@ -76,6 +76,11 @@ function setMarkup (node, text) {
 							document.createElement(nodeName))
 					});
 				}
+				else {
+					stack[0].node.appendChild(document.createTextNode(
+						s.replace(/\\(.)/g, '$1')
+					));
+				}
 			}
 		}
 		else {