Преглед изворни кода

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

close #1767
Tienson Qin пре 4 година
родитељ
комит
e93e4cd1d8
2 измењених фајлова са 11 додато и 8 уклоњено
  1. 1 1
      src/main/frontend/components/search.cljs
  2. 10 7
      src/main/frontend/handler/search.cljs

+ 1 - 1
src/main/frontend/components/search.cljs

@@ -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)

+ 10 - 7
src/main/frontend/handler/search.cljs

@@ -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!
   []