extend the functionality of writeas option (#156)

Author: akahuku

src/chrome/frontend/agent.js

@@ -1304,6 +1304,13 @@ function keylog () {
 	t.scrollTop = t.scrollHeight - t.clientHeight;
 }
 
+function getGlobRegex (s) {
+	return new RegExp('^' + s
+		.replace(/[\\^$+.()|{}]/g, function ($0) {return '\\' + $0})
+		.replace(/\?/g, '.')
+		.replace(/\*/g, '.+?'), 'i');
+}
+
 function parseBlacklist (blacklist) {
 	var result = {
 		fullBlocked: false,
@@ -1333,10 +1340,7 @@ function parseBlacklist (blacklist) {
 			line = [line, ''];
 		}
 		try {
-			var url = new RegExp('^' + line[0]
-				.replace(/[\\^$+.()|{}]/g, function ($0) {return '\\' + $0})
-				.replace(/\?/g, '.')
-				.replace(/\*/g, '.+?'), 'i');
+			var url = getGlobRegex(line[0]);
 
 			if (url.test(window.location.href)) {
 				if (line[1] == '') {
@@ -1704,7 +1708,34 @@ var writeContentToElement = (function () {
 		}
 
 		else if (element.isContentEditable) {
-			switch (opts.writeAs) {
+			var writeAs = opts.writeAs;
+			try {
+				var data = JSON.parse(writeAs);
+				for (var pattern in data) {
+					if (!getGlobRegex(pattern).test(window.location.href)) continue;
+
+					// simple string
+					if (typeof data[pattern] == 'string') {
+						writeAs = data[pattern];
+					}
+
+					// array...
+					else if (data[pattern] instanceof Array) {
+						data[pattern].some(function (pair) {
+							if (!('selector' in pair)) return;
+							if (document.querySelector(pair.selector)) {
+								writeAs = pair.writeas;
+								return true;
+							}
+						});
+					}
+					break;
+				}
+			}
+			catch (e) {
+			}
+
+			switch (writeAs) {
 			case 'div':
 				return overwrite(element, content, toDiv);
 

src/chrome/frontend/wasavi.js

@@ -448,7 +448,7 @@ function ExCommandExecutor (app) {
 			return true;
 		}
 		function paragraph12 () {
-			if (/^(?:map|unmap|abbreviate|unabbreviate)$/.test(commandName)) {
+			if (/^(?:set|map|unmap|abbreviate|unabbreviate)$/.test(commandName)) {
 				// do not include double quote for compatibility with vim.
 				skipto(/[\n|]/g, {escapeChars:'\u0016'});
 			}
@@ -471,6 +471,8 @@ function ExCommandExecutor (app) {
 		 *
 		 */
 
+		source = source.replace(/\\\n/g, '');
+
 		if (/[\\\u0016]$/.test(source)) {
 			source = source.substring(0, source.length - 1);
 		}
@@ -5288,7 +5290,13 @@ var config = new Wasavi.Configurator(appProxy,
 				targetElement.writeAs = v;
 				break;
 			default:
-				v = targetElement.writeAs;
+				var asjson = parseJson(v);
+				if (asjson) {
+					targetElement.writeAs = v;
+				}
+				else {
+					v = targetElement.writeAs;
+				}
 				break;
 			}
 			return v;

src/chrome/scripts/options-core.js

@@ -34,8 +34,17 @@ function $ (arg) {
  * ----------------
  */
 
-function setMarkup (node, text) {
+function markup (node, text) {
+	var debug = /\* /.test(text);
+
+	text = text.replace(/(?:\*\s+(?:\*\S|[^*])+(?:\n|$))+/g, function ($0) {
+		return '[ul]' +
+			$0.replace(/\*\s+((?:\*\S|[^*])+(?:\n|$))/g, '[li]$1[/li]') +
+			'[/ul]';
+	});
+
 	text = text.replace(/\n/g, '[br]');
+	text = text.replace(/\[br\](\[\/\w+\])/g, '$1');
 
 	var pattern = /((?:\\.|[^\[])+)|(\[\/?(\w+)[^\]]*\])/g;
 	var stack = [{name:'#root', node: node}];
@@ -59,11 +68,10 @@ function setMarkup (node, text) {
 					break;
 
 				case 'i':
-					newNode = document.createElement('i');
-					break;
-
 				case 'b':
-					newNode = document.createElement('b');
+				case 'ul':
+				case 'li':
+					newNode = document.createElement(re[3]);
 					break;
 
 				case 'br':
@@ -184,27 +192,6 @@ function initPage (req) {
 	 * replace all message ids to translated one
 	 */
 
-	function defaultConverter (node, message) {
-		node.nodeValue = '';
-		setMarkup(node.parentNode, message);
-	}
-	function extractList (node, message) {
-		node = node.parentNode;
-		node.textContent = '';
-		var ul = node.appendChild(document.createElement('ul'));
-		message
-		.replace(/^\s*\*\s*/, '')
-		.split(/\n\*\s*/)
-		.forEach(function (line) {
-			var li = ul.appendChild(document.createElement('li'));
-			setMarkup(li, line);
-		});
-	}
-
-	var converter = {
-		option_target_elements_desc: extractList,
-		option_qa_blacklist_tips: extractList
-	};
 	var iter = document.createNodeIterator(
 		document, window.NodeFilter.SHOW_TEXT, null, false);
 
@@ -231,7 +218,8 @@ function initPage (req) {
 			message = extension.getMessage(id) || id;
 		}
 
-		(converter[id] || defaultConverter)(node, message);
+		node.nodeValue = '';
+		markup(node.parentNode, message);
 	});
 
 	/*