browser: disable search features dependent on classList

[sheet.git] / searchlocal.js

diff --git a/searchlocal.js b/searchlocal.js
index 6c37fc901362c7f2fbb5b9a4c3d2138e8cb729a6..09899710cac5731d1276aa1ee538f4154a60985f 100644 (file)
--- 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');
@@ -29,20 +30,17 @@ function filtercell(el, set, action) {
 }
 
 function filtercols(table, match, action) {
-       var matchloc;
+       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 res = match(cell);
+                               for (var i = loc; i < loc + cell.colSpan; i++) matchloc[i] = res;
+                               filtercell(table.children.item(x), res, action); // colgroup
                        }
-                       var keep = matchloc && loc >= matchloc[0] && loc < matchloc[1];
-                       filtercell(cell, keep, action);
+                       filtercell(cell, matchloc[loc], action);
                        loc += cell.colSpan;
                }
        }
@@ -79,6 +77,7 @@ 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');
@@ -117,7 +116,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;
 }
 
@@ -132,10 +131,10 @@ function prependsearch(target) {
                        newelement('input', {
                                type: 'search',
                                name: 'q',
-                               onkeyup: "if (!filterupdate) filterupdate = "
+                               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')",