yogsototh/freactive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed issue with unregistered parent state.

Browse source
This commit is contained in:
Aaron Craelius 2014-11-19 19:56:40 -05:00
parent 25af87571e
commit 038ab94bc8
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/clojure/freactive/dom.cljs
View file

@ -70,7 +70,7 @@
state (ElementState. node-id false element-spec nil)] state (ElementState. node-id false element-spec nil)]
(set! auto-node-id (inc auto-node-id)) (set! auto-node-id (inc auto-node-id))
(set-attr! dom-node "data-freactive-id" node-id) (set-attr! dom-node "data-freactive-id" node-id)
(when-let [m (-meta element-spec)] (when-let [m (meta element-spec)]
(when-let [on-disposed (get m :node-disposed)] (when-let [on-disposed (get m :node-disposed)]
(set! (.-disposed-callback state) on-disposed))) (set! (.-disposed-callback state) on-disposed)))
(aset element-state-lookup node-id state) (aset element-state-lookup node-id state)
@ -78,13 +78,11 @@
state)) state))
(defn- register-with-parent-state [parent-state child-key state] (defn- register-with-parent-state [parent-state child-key state]
;;(set! (.-child-states parent-state) (assoc (.-child-states parent-state) child state))
(let [child-states (or (.-child-states parent-state) (let [child-states (or (.-child-states parent-state)
(set! (.-child-states parent-state) #js {}))] (set! (.-child-states parent-state) #js {}))]
(aset child-states child-key state))) (aset child-states child-key state)))
(defn- unregister-from-parent-state [parent-state child-key] (defn- unregister-from-parent-state [parent-state child-key]
;;(set! (.-child-states parent-state) (dissoc (.-child-states parent-state) child))
(when-let [child-states (.-child-states parent-state)] (when-let [child-states (.-child-states parent-state)]
(js-delete child-states child-key))) (js-delete child-states child-key)))
@ -508,7 +506,9 @@
(defn- register-element-with-parent [parent new-elem] (defn- register-element-with-parent [parent new-elem]
(when-not (text-node? new-elem) (when-not (text-node? new-elem)
(when-let [parent-state (get-element-state parent)] (let [parent-state (get-element-state parent)
parent-state (or parent-state
(init-element-state! parent nil))]
(let [state (get-element-state new-elem)] (let [state (get-element-state new-elem)]
(set! (.-parent-state state) parent-state) (set! (.-parent-state state) parent-state)
(register-with-parent-state parent-state (get-node-id new-elem) state))))) (register-with-parent-state parent-state (get-node-id new-elem) state)))))
@ -776,7 +776,7 @@
(bind-attr! node k v state)) (bind-attr! node k v state))
(when children (when children
(append-children! node children)) (append-children! node children))
(when-let [m (-meta virtual-dom)] (when-let [m (meta virtual-dom)]
(when-let [node-created (get m :node-created)] (when-let [node-created (get m :node-created)]
(node-created node))) (node-created node)))
node)))) node))))