Merge pull request #1345 from cdrini/1344/fix/br-toolbar-w-search

Fix Toolbar requiring SearchView.init having already been called

Author: cdrini

BookReaderDemo/IADemoBr.js

@@ -5,6 +5,13 @@ import { extraVolOptions, custvolumesManifest } from './ia-multiple-volumes-mani
  * This is how Internet Archive loads bookreader
  */
 const urlParams = new URLSearchParams(window.location.search);
+function getFromUrl(name, def) {
+  if (urlParams.has(name)) {
+    return urlParams.get(name);
+  } else {
+    return def;
+  }
+}
 
 const ocaid = urlParams.get('ocaid');
 const openFullImmersionTheater = urlParams.get('view') === 'theater';
@@ -41,8 +48,8 @@ const initializeBookReader = (brManifest) => {
 
   const customAutoflipParams = {
     autoflip: !!autoflip,
-    flipSpeed: urlParams.flipSpeed || 2000,
-    flipDelay: urlParams.flipDelay || 5000
+    flipSpeed: parseFloat(getFromUrl('flipSpeed', '2000')),
+    flipDelay: parseFloat(getFromUrl('flipDelay', '5000')),
   };
 
   const options = {
@@ -62,7 +69,7 @@ const initializeBookReader = (brManifest) => {
     initialSearchTerm: searchTerm ? searchTerm : '',
     // leaving this option commented out bc we change given user agent on archive.org
     // onePage: { autofit: <?=json_encode($this->ios ? 'width' : 'auto')?> },
-    showToolbar: false,
+    showToolbar: getFromUrl('options.showToolbar', 'false') === 'true',
     /* Multiple volumes */
     // To show multiple volumes:
     enableMultipleBooks: false, // turn this on

src/plugins/search/plugin.search.js

@@ -66,23 +66,28 @@ BookReader.prototype.setup = (function (super_) {
     /** @type { {[pageIndex: number]: SearchInsideMatchBox[]} } */
     this._searchBoxesByIndex = {};
 
-    this.searchView = undefined;
+    if (this.enableSearch) {
+      this.searchView = new SearchView({
+        br: this,
+        searchCancelledCallback: () => {
+          this._cancelSearch();
+          this.trigger('SearchCanceled', { term: this.searchTerm, instance: this });
+        }
+      });
+    } else {
+      this.searchView = null;
+    }
   };
 })(BookReader.prototype.setup);
 
 /** @override */
 BookReader.prototype.init = (function (super_) {
   return function () {
     super_.call(this);
-    // give SearchView the most complete bookreader state
-    this.searchView = new SearchView({
-      br: this,
-      searchCancelledCallback: () => {
-        this._cancelSearch();
-        this.trigger('SearchCanceled', { term: this.searchTerm, instance: this });
-      }
-    });
-    if (this.options.enableSearch && this.options.initialSearchTerm) {
+    if (!this.enableSearch) return;
+
+    this.searchView.init();
+    if (this.options.initialSearchTerm) {
       /**
        * this.search() take two parameter
        * 1. this.options.initialSearchTerm - search term

src/plugins/search/view.js

@@ -11,10 +11,13 @@ class SearchView {
     this.br = br;
     this.matches = [];
     this.cacheDOMElements();
-    this.bindEvents();
     this.cancelSearch = searchCancelledCallback;
   }
 
+  init() {
+    this.bindEvents();
+  }
+
   cacheDOMElements() {
     this.dom = {};
     // Search input within the top toolbar. Will be removed once the mobile menu is replaced.