1 files changed, 44 insertions, 33 deletions

diff --git a/assets_src/js/lib/search.js b/assets_src/js/lib/search.js
index 0cb33df..85559ef 100644
--- a/assets_src/js/lib/search.js
+++ b/assets_src/js/lib/search.js
@@ -1,40 +1,51 @@
-var strokeTimeout = null;
+import * as dom from './dom';
+import * as ajax from './ajax';
 
-function instantSearch() {
-        if (strokeTimeout) {
-                clearTimeout(strokeTimeout);
-        }
-        strokeTimeout = setTimeout(doSearch, 150);
-}
-
-function doSearch() {
-        value = document.getElementById("search").value;
-
-        if (value === "") {
-                strokeTimeout = null;
-                document.getElementById("search-results").innerHTML = "";
-                return;
-        }
-        var xhr = new XMLHttpRequest();
-        xhr.onreadystatechange = function() {
-        if (xhr.readyState == XMLHttpRequest.DONE) {
-                        if (xhr.status === 404 || xhr.status === 400 || typeof xhr.response === 'undefined' || xhr.response === '404 not found') {
-                                document.getElementById("search-results").innerHTML = '';
-                                return
+export class InstantSearch {
+        constructor(element, resultsElem) {
+                this.resultClicked = () => {};
+                this.element = element;
+                this.resultsElem = resultsElem;
+                this.strokeTimeout = null;
+                element.addEventListener('keydown', e => {
+                        if (this.strokeTimeout) {
+                                clearTimeout(this.strokeTimeout);
                         }
-                        if (value === "") {
-                                document.getElementById("search-results").innerHTML = "";
-                                return;
+                        this.strokeTimeout = setTimeout(() => this.doSearch(), 150);
+                }, false);
+                resultsElem.addEventListener('click', e => {
+                        let li = dom.closest(e.target, el => el.tagName.match(/li/i));
+                        if (!li) {
+                                return true;
                         }
+                        this.resultsElem.innerHTML = '';
+                        this.resultClicked(li.getAttribute('data-id'));
+                }, true);
+        }
 
-                        document.getElementById("search-results").innerHTML = xhr.response.replace(new RegExp('{ (.*?)(' + value + ')(.*?) }', 'gi'), "$1<b>$2</b>$3").replace(new RegExp('{ (.*?) }', 'gi'), '$1');
+        async doSearch() {
+                let value = this.element.value;
+                if (value.length < 2) {
+                        this.strokeTimeout = null;
+                        this.resultsElem.innerHTML = "";
+                        return;
+                }
+                let response = null;
+                try {
+                        response = await ajax.get(`/search/gril_instant/${value}`);
+                } catch (e) {
+                        this.resultsElem.innerHTML = '';
+                        return;
                 }
+                this.resultsElem.innerHTML = response
+                        .replace(
+                                new RegExp('{ (.*?)(' +
+                                           value +
+                                           ')(.*?) }', 'gi'),
+                                "$1<b>$2</b>$3")
+                        .replace(
+                                new RegExp('{ (.*?) }', 'gi'),
+                                '$1');
+                this.strokeTimeout = null;
         }
-        xhr.open('GET', '/search/gril_instant/' + value, true);
-        xhr.send(null);
-        strokeTimeout = null;
 }
-
-function clickSearchResult(resId) {
-
-}
\ No newline at end of file