fix: "Search in page" transforms to "Global search"

close #1767
pull/1845/head
Tienson Qin 2021-05-13 17:52:57 +08:00
parent 6deb22549c
commit e93e4cd1d8
2 changed files with 11 additions and 8 deletions

View File

@ -283,7 +283,7 @@
(js/clearTimeout @search-timeout))
(let [value (util/evalue e)]
(if (string/blank? value)
(search-handler/clear-search!)
(search-handler/clear-search! false)
(let [search-mode (state/get-search-mode)
opts (if (= :page search-mode)
(let [current-page (or (state/get-current-page)

View File

@ -31,13 +31,16 @@
(swap! state/state assoc search-key result))))))
(defn clear-search!
[]
(swap! state/state assoc
:search/result nil
:search/q ""
:search/mode :global)
(when-let [input (gdom/getElement "search-field")]
(gobj/set input "value" "")))
([]
(clear-search! true))
([clear-search-mode?]
(let [m (cond-> {:search/result nil
:search/q ""}
clear-search-mode?
(assoc :search/mode :global))]
(swap! state/state merge m))
(when-let [input (gdom/getElement "search-field")]
(gobj/set input "value" ""))))
(defn rebuild-indices!
[]