From 97b799108de0b2e0decc711e8f345f50b0bf2cc2 Mon Sep 17 00:00:00 2001
From: Jaifroid <egk10@cam.ac.uk>
Date: Tue, 11 Dec 2018 08:16:54 +0000
Subject: [PATCH] Remove timeout for findInArticle event listener #65

Former-commit-id: a006135103d6d7154a604a9bb0b8a890cb01f5d9 [formerly fa190c94afe28011b0c57851684501285dfc0e4e]
Former-commit-id: 74626580a2597bef7340bcedd43f11f03f2d5bd7
---
 www/js/app.js | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/www/js/app.js b/www/js/app.js
index 970258e7..5cd32d53 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -316,8 +316,6 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'q', 'module'
             localSearch.setMatchType('left');
             var timer = null;
             findInArticle.addEventListener('keyup', function (e) {
-                //Ensure timeout doesn't occur if another key has been pressed within time window
-                clearTimeout(timer);
                 //If user pressed Alt-F or Ctrl-F, exit
                 if ((e.altKey || e.ctrlKey) && e.which == 70) return;
                 var val = this.value;
@@ -333,24 +331,22 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'q', 'module'
                 if (~(val.length - 2)) {
                     localSearch.scrollFrom = 0;
                     localSearch.lastScrollValue = val;
-                    timer = setTimeout(function () {
-                        localSearch.apply(val);
-                        if (val.length) {
-                            var fullTotal = localSearch.countFullMatches(val);
-                            var partialTotal = localSearch.countPartialMatches();
-                            fullTotal = fullTotal > partialTotal ? partialTotal : fullTotal;
-                            document.getElementById('matches').innerHTML = '<a id="scrollLink" href="#">Full: ' + fullTotal + '</a>';
-                            document.getElementById('partial').innerHTML = "Partial: " + partialTotal;
-                            document.getElementById('scrollLink').addEventListener('click', function () {
-                                localSearch.scrollFrom = localSearch.scrollToFullMatch(val, localSearch.scrollFrom);
-                            });
-                            //Auto-scroll: TODO - consider making this an option
+                    localSearch.apply(val);
+                    if (val.length) {
+                        var fullTotal = localSearch.countFullMatches(val);
+                        var partialTotal = localSearch.countPartialMatches();
+                        fullTotal = fullTotal > partialTotal ? partialTotal : fullTotal;
+                        document.getElementById('matches').innerHTML = '<a id="scrollLink" href="#">Full: ' + fullTotal + '</a>';
+                        document.getElementById('partial').innerHTML = "Partial: " + partialTotal;
+                        document.getElementById('scrollLink').addEventListener('click', function () {
                             localSearch.scrollFrom = localSearch.scrollToFullMatch(val, localSearch.scrollFrom);
-                        } else {
-                            document.getElementById('matches').innerHTML = "Full: 0";
-                            document.getElementById('partial').innerHTML = "Partial: 0";
-                        }
-                    }, 500);
+                        });
+                        //Auto-scroll: TODO - consider making this an option
+                        localSearch.scrollFrom = localSearch.scrollToFullMatch(val, localSearch.scrollFrom);
+                    } else {
+                        document.getElementById('matches').innerHTML = "Full: 0";
+                        document.getElementById('partial').innerHTML = "Partial: 0";
+                    }
                 }
             });
         });