browser: only reset focus after filter

[sheet.git] / searchlocal.js

diff --git a/searchlocal.js b/searchlocal.js
index 1a5037f1f7def5737a8ce3455f1c7e2ff74de848..8741044c4afce0b92cf9f876bcfc520e6ff8cfb4 100644 (file)
--- a/searchlocal.js
+++ b/searchlocal.js
@@ -6,10 +6,20 @@ function filtercell(el, set, action) {
                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;
-                       // continue
+                       el.classList.remove('focus');
+                       break;
                default: // reset
                        el.classList.remove('focus');
                        el.classList.remove('target');
@@ -19,19 +29,34 @@ function filtercell(el, set, action) {
 function filterrows(table, match, action) {
        var rows = table.tBodies[0].rows;
        for (var i = 0; i < rows.length; i++) {
-               filtercell(rows[i], match(rows[i]), action);
+               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-Z0-9 ]{2,}$/.test(query)) {
                // category title if all uppercase
                var match = function(row) {
                        return row.cells[0].title.match(query, 'i');
                };
        }
+       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) {
@@ -62,7 +87,7 @@ function prependsearch(target) {
                        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',