@@ -63,6 +63,32 @@

    (-> entities concatv (get-using-name)) (-> entities concatv get-using-name append-history)

    :else (append-history {:err (str "Unknown command '" cmdline "'")}))))

+(re-frame/reg-event-fx

+ ::execute

+ (fn [cofx [_ cmd]]

+    (let [db (cofx :db)]

+      {:db (execute db cmd)

+       ; dispatch-later to ensure that the DOM has already been updated,

+       ; so that scrollMaxY has been changed appropriately.

+       :fx [[:dispatch-later {:ms 10 :dispatch [::scroll-to (prompt db)]}]]})))

+

+

+(re-frame/reg-event-db

+ ::clear-cmdline

+ (fn [db _]

+   (-> db

+     (assoc-in [:cmdline :current] nil)

+     (assoc-in [:cmdline :selected-history] nil)

+     (assoc-in [:cmdline :suggestions] {:options nil :selected nil}))))

+

+

+(re-frame/reg-event-fx

+ ::submit-cmdline

+ (fn [cofx _]

+   {:fx [[:dispatch [::execute (-> cofx :db :cmdline :current)]]

+         [:dispatch [::clear-cmdline]]]}))

+

+

 (re-frame/reg-event-db

  ::set-prompt-id

  (fn [db [_ prompt-id]]

@@ -129,13 +155,6 @@

  (fn [cmd [_ idx]]

      (assoc-in cmd [:suggestions :selected] idx)))

-(re-frame/reg-event-fx

- ::click-suggestion

- (fn [cofx [_ prompt cmd]]

-   (let [db (cofx :db)]

-     {:db (assoc-in db [:cmdline :current] cmd)

-      :fx [[:dispatch [::submit-cmd prompt]]]})))

-

 (re-frame/reg-event-db

  ::prompt-keypress

  (re-frame/path :cmdline)

@@ -165,23 +184,5 @@

                                                           (merge cmd {:suggestions null-suggestions}))

       :else     cmd))))

-(re-frame/reg-event-fx

- ::execute-cmd

- (fn [cofx [_ cmd]]

-    (let [db (cofx :db)]

-      {:db (execute db cmd)

-       ; dispatch-later to ensure that the DOM has already been updated,

-       ; so that scrollMaxY has been changed appropriately.

-       :fx [[:dispatch-later {:ms 10 :dispatch [::scroll-to (prompt db)]}]]})))

-(re-frame/reg-event-fx

- ::submit-cmdline

- (fn [cofx [_]]

-  (let [db (cofx :db)

-        cmdline (some-> db :cmdline :current)]

-    {:db

-     (-> db

-      (assoc-in [:cmdline :current] nil)

-      (assoc-in [:cmdline :selected-history] nil)

-      (assoc-in [:cmdline :suggestions] {:options nil :selected nil}))

-     :fx [[:dispatch [::execute-cmd cmdline]]]})))

+

@@ -42,7 +42,7 @@

 (defn code [text]

     [:code {:class (styles/code)

-            :on-click #(re-frame/dispatch [::events/execute-cmd text])}

+            :on-click #(re-frame/dispatch [::events/execute text])}

      text])

 (defn prompt [prompt-id]

@@ -69,10 +69,8 @@

             [:li

              {:class (when (= idx selected) :selected)

               :on-mouse-enter #(re-frame/dispatch [::events/hover-suggestion idx])

-              :on-click #(do (.preventDefault %)

-                             (re-frame/dispatch [::events/click-suggestion

-                                                 (-> % .-target .-parentElement .-parentElement)

-                                                 x]))}

+              :on-click #(do (re-frame/dispatch [::events/execute x])

+                             (re-frame/dispatch [::events/clear-cmdline]))}

              x]))]]))

 (defn title []