X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/a3ffb22a8e1234cc85cd1d098ed9ff70cac5c51e..e3c062a167c810b627816ab101b22a5f331524aa:/searchlocal.js

diff --git a/searchlocal.js b/searchlocal.js
index 752a3ee..512f07b 100644
--- a/searchlocal.js
+++ b/searchlocal.js
@@ -1,6 +1,8 @@
 var filterupdate;
+var filtertoggles = document.body.classList !== undefined;
 
 function filtercell(el, set, action) {
+	if (set === undefined) return;
 	switch (action) {
 		case 'focus':
 			el.classList[set ? 'add' : 'remove'](action);
@@ -19,8 +21,7 @@ function filtercell(el, set, action) {
 			break;
 		case 'filter':
 			el.style.display = set ? '' : 'none';
-			if (!Element.prototype.hasOwnProperty('classList')) return;
-			el.classList.remove('focus');
+			if (filtertoggles) el.classList.remove('focus');
 			break;
 		default: // reset
 			el.classList.remove('focus');
@@ -34,9 +35,10 @@ function filtercols(table, match, action) {
 		var loc = 0;
 		for (var x = 0; x < table.rows[y].cells.length; x++) {
 			var cell = table.rows[y].cells[x];
-			if (y == 0 && match(cell)) {
-				for (var i = loc; i < loc + cell.colSpan; i++) matchloc[i] = true;
-				filtercell(table.children.item(x), true, action); // colgroup
+			if (y == 0) {
+				var res = match(cell);
+				for (var i = loc; i < loc + cell.colSpan; i++) matchloc[i] = res;
+				filtercell(table.children.item(x), res, action); // colgroup
 			}
 			filtercell(cell, matchloc[loc], action);
 			loc += cell.colSpan;
@@ -67,6 +69,7 @@ function filtertable(query, action) {
 		query = match[2];
 	}
 
+if (document.querySelector !== undefined) {
 	if (query == '' && action == 'add') {
 		// restore all columns if explicitly adding all ("+")
 		filtercols(table, function(){return true}, 'add');
@@ -75,10 +78,12 @@ function filtertable(query, action) {
 	if (/^[a-z_]+$/.test(query) && document.querySelector('.b-a-'+query)) {
 		// column if class b-a-* exists
 		var match = function(th) {
+			if (!/\bb-a-/.test(th.className)) return;
 			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
@@ -113,7 +118,7 @@ function newelement(tagname, attrlist, childlist) {
 	for (var name in attrlist)
 		el.setAttribute(name, attrlist[name]);
 	if (childlist) for (var i = 0; i < childlist.length; i++)
-		el.appendChild(childlist[i]);
+		if (childlist[i]) el.appendChild(childlist[i]);
 	return el;
 }
 
@@ -122,21 +127,22 @@ function prependsearch(target) {
 		'form', {
 			id: 'search',
 			'class': 'aside',
-			onsubmit: "filtertable(this.q.value); this.q.value = ''; return false",
+			'className': 'aside', // msie
+			onsubmit: "filtertable(this.q.value); this.q.value = ''; return false"
 		},
 		[
 			newelement('input', {
 				type: 'search',
 				name: 'q',
-				onkeyup: "if (!filterupdate) filterupdate = "
-					+ "window.setTimeout(filtertable, 300, undefined, 'focus')",
+				onkeyup: "if (filtertoggles && !filterupdate) filterupdate = "
+					+ "window.setTimeout(filtertable, 300, undefined, 'focus')"
 			}),
-			newelement('input', {
+			filtertoggles && newelement('input', {
 				type: 'button',
 				value: 'toggle',
-				onclick: "filtertable(this.form.q.value, 'target')",
+				onclick: "filtertable(this.form.q.value, 'target')"
 			}),
-			newelement('input', {type:'submit', value:'filter'}),
+			newelement('input', {type:'submit', value:'filter'})
 		]
 	), target);
 }