Skips subsequent creation of search views when setup called 1+n times (…

…#489)
internetarchive · Oct 5, 2020 · 3ab0cb2 · 3ab0cb2
1 parent dd08f52
commit 3ab0cb2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/js/plugins/search/plugin.search.js b/src/js/plugins/search/plugin.search.js
@@ -50,6 +50,7 @@ BookReader.prototype.setup = (function (super_) {
     this.subPrefix = options.subPrefix;
     this.bookPath = options.bookPath;
 
+    if (this.searchView) { return; }
     this.searchView = new SearchView({
       br: this,
       selector: '#BRsearch_tray',

diff --git a/src/js/plugins/search/view.js b/src/js/plugins/search/view.js
@@ -186,7 +186,10 @@ class SearchView {
   }
 
   teardownSearchNavigation() {
-    if (!this.dom.searchNavigation) { return; }
+    if (!this.dom.searchNavigation) {
+      this.dom.searchNavigation = $('.BRsearch-navigation');
+    }
+    if (!this.dom.searchNavigation.length) { return; }
 
     this.dom.searchNavigation.off('.searchNavigation').remove();
     this.dom.searchNavigation = null;
@@ -423,6 +426,7 @@ class SearchView {
   handleSearchCallback(e, { results }) {
     this.matches = results.matches;
     this.setCurrentMatchIndex();
+    this.teardownSearchNavigation();
     this.renderSearchNavigation();
     this.bindSearchNavigationEvents();
     this.renderMatches(results.matches);