Merge pull request #2735 from GuillaumeGomez/fix-js-error

Fix JS error when `hasFocus` method is overwritten on search index load

Author: ehuss

src/renderer/html_handlebars/search.rs

@@ -69,7 +69,7 @@ pub fn create_files(
             // To reduce the size of the generated JSON by preventing all `"` characters to be
             // escaped, we instead surround the string with much less common `'` character.
             format!(
-                "window.search = JSON.parse('{}');",
+                "window.search = Object.assign(window.search, JSON.parse('{}'));",
                 index.replace("\\", "\\\\").replace("'", "\\'")
             )
             .as_bytes(),

tests/gui/search.goml

@@ -1,5 +1,6 @@
 // This tests basic search behavior.
 
+fail-on-js-error: true
 go-to: |DOC_PATH| + "index.html"
 
 define-function: (
@@ -41,6 +42,9 @@ press-key: 's'
 wait-for-css-false: ("#search-wrapper", {"display": "none"})
 // We ensure the search bar has the focus.
 assert: "#searchbar:focus"
+// Pressing a key will therefore update the search input.
+press-key: 't'
+assert-text: ("#searchbar", "t")
 
 // Now we press `Escape` to ensure that the search input disappears again.
 press-key: 'Escape'

tests/testsuite/search.rs

@@ -9,8 +9,9 @@ use std::path::{Path, PathBuf};
 fn read_book_index(root: &Path) -> serde_json::Value {
     let index = root.join("book/searchindex.js");
     let index = std::fs::read_to_string(index).unwrap();
-    let index = index.trim_start_matches("window.search = JSON.parse('");
-    let index = index.trim_end_matches("');");
+    let index =
+        index.trim_start_matches("window.search = Object.assign(window.search, JSON.parse('");
+    let index = index.trim_end_matches("'));");
     // We need unescape the string as it's supposed to be an escaped JS string.
     serde_json::from_str(&index.replace("\\'", "'").replace("\\\\", "\\")).unwrap()
 }