michael/grub-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Refactor recipe view - remove dommy dependence

Browse source
This commit is contained in:
Nicholas Kariniemi 2013-10-21 23:39:46 +03:00
parent 48ccf9e447
commit 4a07d98fe9
2 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/cljs/grub/view/dom.cljs
View file

@ -104,12 +104,18 @@
(def new-recipe (make-recipe-node "new-recipe" "" "" true)) (def new-recipe (make-recipe-node "new-recipe" "" "" true))
(def new-recipe-done-btn
(sel1 new-recipe ".recipe-done-btn"))
(defn recipes-selector [] (defn recipes-selector []
[(sel1 :#recipe-list) :.recipe-panel]) [(sel1 :#recipe-list) :.recipe-panel])
(defn recipe-done-btns-selector [] (defn recipe-done-btns-selector []
[(sel1 :body) :.recipe-done-btn]) [(sel1 :body) :.recipe-done-btn])
(defn recipe-done-btn-selector [recipe-elem]
(sel1 recipe-elem :.recipe-done-btn))
(defn recipe-add-grubs-btns-selector [] (defn recipe-add-grubs-btns-selector []
[(sel1 :body) :.recipe-add-grubs-btn]) [(sel1 :body) :.recipe-add-grubs-btn])
@ -147,6 +153,14 @@
(defn clear-add-grub-text [] (defn clear-add-grub-text []
(dommy/set-value! add-grub-text "")) (dommy/set-value! add-grub-text ""))
(defn get-recipe-add-grubs-clicks []
(->> (:chan (listen (recipe-add-grubs-btns-selector) :click))
(a/map< #(dommy/closest (.-selectedTarget %) :.recipe-panel))))
(defn get-edit-recipe-input-click []
(->> (:chan (listen-once (recipes-selector) :click))
(a/filter< #(not (dommy/has-class? (.-selectedTarget %) :btn)))
(a/map< #(.-selectedTarget %))))
(defprotocol IHideable (defprotocol IHideable
(-hide! [this]) (-hide! [this])

20
src/cljs/grub/view/recipe.cljs
View file

@ -1,9 +1,7 @@
(ns grub.view.recipe (ns grub.view.recipe
(:require [grub.view.dom :as dom] (:require [grub.view.dom :as dom]
[dommy.core :as dommy]
[cljs.core.async :as a :refer [<! >! chan]]) [cljs.core.async :as a :refer [<! >! chan]])
(:require-macros [grub.macros :refer [log logs and-let]] (:require-macros [grub.macros :refer [log logs and-let]]
[dommy.macros :refer [sel1]]
[cljs.core.async.macros :refer [go go-loop]])) [cljs.core.async.macros :refer [go go-loop]]))
(defn wait-for-new-recipe-input-click [] (defn wait-for-new-recipe-input-click []
@ -26,9 +24,7 @@
{away-clicks :chan {away-clicks :chan
away-clicks-unlisten :unlisten} (dom/get-away-clicks dom/new-recipe) away-clicks-unlisten :unlisten} (dom/get-away-clicks dom/new-recipe)
{done-clicks :chan {done-clicks :chan
done-clicks-unlisten :unlisten} (dom/listen done-clicks-unlisten :unlisten} (dom/get-clicks dom/new-recipe-done-btn)]
(sel1 dom/new-recipe ".recipe-done-btn")
:click)]
(go (a/alts! [ctrl-enters away-clicks done-clicks]) (go (a/alts! [ctrl-enters away-clicks done-clicks])
(ctrl-enters-unlisten) (ctrl-enters-unlisten)
(away-clicks-unlisten) (away-clicks-unlisten)
@ -51,9 +47,7 @@
out)) out))
(defn wait-for-edit-recipe-input-click [] (defn wait-for-edit-recipe-input-click []
(->> (:chan (dom/listen-once (dom/recipes-selector) :click)) (dom/get-edit-recipe-input-click))
(a/filter< #(not (dommy/has-class? (.-selectedTarget %) :btn)))
(a/map< #(.-selectedTarget %))))
(defn parse-update-recipe-event [elem] (defn parse-update-recipe-event [elem]
(let [id (.-id elem) (let [id (.-id elem)
@ -72,9 +66,7 @@
{away-clicks :chan {away-clicks :chan
away-clicks-unlisten :unlisten} (dom/get-away-clicks elem) away-clicks-unlisten :unlisten} (dom/get-away-clicks elem)
{done-clicks :chan {done-clicks :chan
done-clicks-unlisten :unlisten} (dom/listen done-clicks-unlisten :unlisten} (dom/get-clicks (dom/recipe-done-btn-selector elem))]
(sel1 elem ".recipe-done-btn")
:click)]
(go (a/alts! [ctrl-enters away-clicks done-clicks]) (go (a/alts! [ctrl-enters away-clicks done-clicks])
(ctrl-enters-unlisten) (ctrl-enters-unlisten)
(away-clicks-unlisten) (away-clicks-unlisten)
@ -97,11 +89,9 @@
(defn get-add-grub-events [] (defn get-add-grub-events []
(let [out (chan) (let [out (chan)
clicks (:chan (dom/listen (dom/recipe-add-grubs-btns-selector) :click))] recipe-add-grubs-clicks (dom/get-recipe-add-grubs-clicks)]
(go-loop [] (go-loop []
(let [e (<! clicks) (let [elem (<! recipe-add-grubs-clicks)
elem (dommy/closest (.-selectedTarget e) :.recipe-panel)
id (.-id elem)
grub-texts (dom/-get-grubs elem) grub-texts (dom/-get-grubs elem)
grubs (map-indexed (fn [index g] {:id (str "grub-" (.now js/Date) index) grubs (map-indexed (fn [index g] {:id (str "grub-" (.now js/Date) index)
:grub g :grub g