jesus/mdbook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Guillaume Gomez 2025-06-25 18:20:59 +02:00
parent f3ee794283
commit 63e1dac122
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/renderer/html_handlebars/search.rs
View file

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

4
tests/gui/search.goml
View file

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