X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/f544f1d7860235fa4d86348e66deb3e1d5f0634a..1c9286ac0fd38f14787334c9de0ccb357568dcf8:/searchlocal.js diff --git a/searchlocal.js b/searchlocal.js index 99bffb2..8ac328d 100644 --- a/searchlocal.js +++ b/searchlocal.js @@ -1,4 +1,7 @@ +var filterupdate; + function filtercell(el, set, action) { + if (set === undefined) return; switch (action) { case 'focus': el.classList[set ? 'add' : 'remove'](action); @@ -27,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; } } @@ -54,6 +54,8 @@ function filterrows(table, match, action) { } function filtertable(query, action) { + filterupdate = undefined; + if (query === undefined) query = document.getElementById('search').q.value; var table = document.getElementsByTagName('TABLE')[0]; if (!action) { @@ -67,9 +69,15 @@ function filtertable(query, action) { query = match[2]; } + if (query == '' && action == 'add') { + // restore all columns if explicitly adding all ("+") + filtercols(table, function(){return true}, 'add'); + // continue to restore rows + } 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'); @@ -81,6 +89,14 @@ function filtertable(query, action) { 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; @@ -115,7 +131,8 @@ function prependsearch(target) { newelement('input', { type: 'search', name: 'q', - onkeyup: "filtertable(this.value, 'focus')", + onkeyup: "if (!filterupdate) filterupdate = " + + "window.setTimeout(filtertable, 300, undefined, 'focus')", }), newelement('input', { type: 'button',