browser: only reset focus after filter

[sheet.git] / searchlocal.js

diff --git a/searchlocal.js b/searchlocal.js
index 2993a4a96fa83261ac0833dede4132f3a4fc03cb..8741044c4afce0b92cf9f876bcfc520e6ff8cfb4 100644 (file)
--- a/searchlocal.js
+++ b/searchlocal.js
@@ -1,23 +1,69 @@
-function filtertable(query, action) {
-       var rows = document.getElementsByTagName('TBODY')[0].rows;
+function filtercell(el, set, action) {
+       switch (action) {
+               case 'focus':
+                       el.classList[set ? 'add' : 'remove'](action);
+                       break;
+               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;
+                       el.classList.remove('focus');
+                       break;
+               default: // reset
+                       el.classList.remove('focus');
+                       el.classList.remove('target');
+       }
+}
+
+function filterrows(table, match, action) {
+       var rows = table.tBodies[0].rows;
        for (var i = 0; i < rows.length; i++) {
-               var keep = query.match(/^[A-Z0-9 ]{2,}$/) ? rows[i].cells[0].title.match(query, 'i')
-                       : rows[i].cells[1].textContent.match(query, query.match(/[A-Z]/) ? '' : 'i');
-               switch (action) {
-                       case 'focus':
-                               rows[i].classList[keep ? 'add' : 'remove'](action);
-                               break;
-                       case 'target':
-                               if (keep) rows[i].classList.toggle(action);
-                               break;
-                       case 'filter':
-                               rows[i].style.display = keep ? '' : 'none';
-                               // continue
-                       default: // reset
-                               rows[i].classList.remove('focus');
-                               rows[i].classList.remove('target');
+               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) {
+                       return row.cells[1].textContent.match(query, /[A-Z]/.test(query) ? '' : 'i');
+               };
        }
+       filterrows(table, match, action || 'filter');
 }
 
 function newelement(tagname, attrlist, childlist) {
@@ -34,14 +80,14 @@ function prependsearch(target) {
        target.parentNode.insertBefore(newelement(
                'form', {
                        id: 'search',
-                       class: 'aside',
-                       onsubmit: "filtertable(this.q.value, 'filter'); this.q.value = ''; return false",
+                       'class': 'aside',
+                       onsubmit: "filtertable(this.q.value); this.q.value = ''; return false",
                },
                [
                        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',