X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/3d1587c2e784bae0642f9d788d82936282ca61ea..d7726fe9d86267f50fe4129e53399d014aa7b4c0:/searchlocal.js

diff --git a/searchlocal.js b/searchlocal.js
index 2993a4a..e6f16ff 100644
--- a/searchlocal.js
+++ b/searchlocal.js
@@ -1,23 +1,64 @@
-function filtertable(query, action) {
-	var rows = document.getElementsByTagName('TBODY')[0].rows;
+function filtercell(el, set, action) {
+	switch (action) {
+		case 'focus':
+			el.classList[set ? 'add' : 'remove'](action);
+			break;
+		case 'target':
+			if (set) el.classList.toggle(action);
+			break;
+		case 'remove':
+			if (set) el.style.display = 'none';
+			break;
+		case 'add':
+			if (set) el.style.display = '';
+			break;
+		case 'toggle':
+			if (set) el.style.display = el.style.display == 'none' ? '' : 'none';
+			break;
+		case 'filter':
+			el.style.display = set ? '' : 'none';
+			if (!Element.prototype.hasOwnProperty('classList')) return;
+			// continue
+		default: // reset
+			el.classList.remove('focus');
+			el.classList.remove('target');
+	}
+}
+
+function filterrows(table, match, action) {
+	var rows = table.tBodies[0].rows;
 	for (var i = 0; i < rows.length; i++) {
-		var keep = query.match(/^[A-Z0-9 ]{2,}$/) ? rows[i].cells[0].title.match(query, 'i')
-			: rows[i].cells[1].textContent.match(query, query.match(/[A-Z]/) ? '' : 'i');
-		switch (action) {
-			case 'focus':
-				rows[i].classList[keep ? 'add' : 'remove'](action);
-				break;
-			case 'target':
-				if (keep) rows[i].classList.toggle(action);
-				break;
-			case 'filter':
-				rows[i].style.display = keep ? '' : 'none';
-				// continue
-			default: // reset
-				rows[i].classList.remove('focus');
-				rows[i].classList.remove('target');
+		filtercell(rows[i], match(rows[i]), action);
+	}
+}
+
+function filtertable(query, action) {
+	var table = document.getElementsByTagName('TABLE')[0];
+
+	if (!action) {
+		var match = /^([-+?=]?)(.*)/.exec(query);
+		switch (match[1]) {
+			case '+': action = 'add';    break;
+			case '-': action = 'remove'; break;
+			case '?': action = 'toggle'; break;
+			case '=': action = 'filter'; break;
 		}
+		query = match[2];
+	}
+
+	if (/^[A-Z0-9 ]{2,}$/.test(query)) {
+		// category title if all uppercase
+		var match = function(row) {
+			return row.cells[0].title.match(query, 'i');
+		};
+	}
+	else {
+		// title text (case-insensitive unless caps in input)
+		var match = function(row) {
+			return row.cells[1].textContent.match(query, /[A-Z]/.test(query) ? '' : 'i');
+		};
 	}
+	filterrows(table, match, action || 'filter');
 }
 
 function newelement(tagname, attrlist, childlist) {
@@ -34,8 +75,8 @@ function prependsearch(target) {
 	target.parentNode.insertBefore(newelement(
 		'form', {
 			id: 'search',
-			class: 'aside',
-			onsubmit: "filtertable(this.q.value, 'filter'); this.q.value = ''; return false",
+			'class': 'aside',
+			onsubmit: "filtertable(this.q.value); this.q.value = ''; return false",
 		},
 		[
 			newelement('input', {