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

diff --git a/searchlocal.js b/searchlocal.js
index f0036a6..ac38dce 100644
--- a/searchlocal.js
+++ b/searchlocal.js
@@ -1,24 +1,105 @@
-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;
+			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++) {
-		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';
-				if (!Element.prototype.hasOwnProperty('classList')) continue;
-				// continue
-			default: // reset
-				rows[i].classList.remove('focus');
-				rows[i].classList.remove('target');
+		filtercell(rows[i], match && 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-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) {
+			return row.cells[1].textContent.match(query, /[A-Z]/.test(query) ? '' : 'i');
+		};
 	}
+	filterrows(table, match, action || 'filter');
 }
 
 function newelement(tagname, attrlist, childlist) {
@@ -36,13 +117,13 @@ function prependsearch(target) {
 		'form', {
 			id: 'search',
 			'class': 'aside',
-			onsubmit: "filtertable(this.q.value, 'filter'); this.q.value = ''; return false",
+			onsubmit: "filtertable(this.q.value); this.q.value = ''; return false",
 		},
 		[
 			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',