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

diff --git a/searchlocal.js b/searchlocal.js
index e6f16ff..ac38dce 100644
--- a/searchlocal.js
+++ b/searchlocal.js
@@ -18,17 +18,38 @@ function filtercell(el, set, action) {
 		case 'filter':
 			el.style.display = set ? '' : 'none';
 			if (!Element.prototype.hasOwnProperty('classList')) return;
-			// continue
+			el.classList.remove('focus');
+			break;
 		default: // reset
 			el.classList.remove('focus');
 			el.classList.remove('target');
 	}
 }
 
+function filtercols(table, match, action) {
+	var matchloc;
+	for (var y = 0; y < table.rows.length; y++) {
+		var loc = 0;
+		for (var x = 0; x < table.rows[y].cells.length; x++) {
+			var cell = table.rows[y].cells[x];
+			if (y == 0) {
+				if (match(cell)) {
+					if (!matchloc) matchloc = [loc];
+					matchloc[1] = loc + cell.colSpan;
+					filtercell(table.children.item(x+2), true, action); // colgroup
+				}
+			}
+			var keep = matchloc && loc >= matchloc[0] && loc < matchloc[1];
+			filtercell(cell, keep, action);
+			loc += cell.colSpan;
+		}
+	}
+}
+
 function filterrows(table, match, action) {
 	var rows = table.tBodies[0].rows;
 	for (var i = 0; i < rows.length; i++) {
-		filtercell(rows[i], match(rows[i]), action);
+		filtercell(rows[i], match && match(rows[i]), action);
 	}
 }
 
@@ -46,12 +67,32 @@ function filtertable(query, action) {
 		query = match[2];
 	}
 
+	if (/^[a-z_]+$/.test(query) && document.querySelector('.b-a-'+query)) {
+		// column if class b-a-* exists
+		var match = function(th) {
+			return new RegExp('-'+query+'\\b').test(th.className);
+		}
+		return filtercols(table, match, action || 'toggle');
+	}
+
 	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 if (numquery = /^([<>])(\d+)$/.exec(query)) {
+		// support percentage if numeric comparison
+		var match = function(row) {
+			var pct = row.cells[row.cells.length - 1].textContent;
+			pct -= numquery[2]; // compare to query
+			return numquery[1] == '<' ? pct < 0 : pct >= 0;
+		};
+	}
+	else if (action == 'focus' && query.length <= 1) {
+		// prevent superfluous highlighting
+		var match = false;
+	}
 	else {
 		// title text (case-insensitive unless caps in input)
 		var match = function(row) {
@@ -82,7 +123,7 @@ function prependsearch(target) {
 			newelement('input', {
 				type: 'search',
 				name: 'q',
-				onkeyup: "filtertable(this.value, this.value.length > 1 ? 'focus' : 'reset')",
+				onkeyup: "filtertable(this.value, 'focus')",
 			}),
 			newelement('input', {
 				type: 'button',