From: Mischa POSLAWSKY Date: Tue, 7 Dec 2010 23:10:57 +0000 (+0100) Subject: browser: restrict to browsers in column search X-Git-Tag: v1.4~38 X-Git-Url: http://git.shiar.nl/sheet.git/commitdiff_plain/1c9286ac0fd38f14787334c9de0ccb357568dcf8 browser: restrict to browsers in column search Retain non-browser columns for =* queries. --- diff --git a/searchlocal.js b/searchlocal.js index 752a3ee..8ac328d 100644 --- a/searchlocal.js +++ b/searchlocal.js @@ -1,6 +1,7 @@ var filterupdate; function filtercell(el, set, action) { + if (set === undefined) return; switch (action) { case 'focus': el.classList[set ? 'add' : 'remove'](action); @@ -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; @@ -75,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');