From f7accce5a520a979cc78ac822814dfc35f3dc536 Mon Sep 17 00:00:00 2001 From: Nicholas Chubrich Date: Sat, 13 Dec 2014 16:53:13 -0800 Subject: [PATCH 1/3] added ISeqable and IPrintWithWriter to help view event maps, existing tests pass --- src/cljs/domina/events.cljs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/cljs/domina/events.cljs b/src/cljs/domina/events.cljs index 1db48f3..3e06d0a 100644 --- a/src/cljs/domina/events.cljs +++ b/src/cljs/domina/events.cljs @@ -39,7 +39,19 @@ val (aget evt (name k)))) (-lookup [o k not-found] (or (-lookup o k) - not-found)))) + not-found)) + ISeqable + (-seq [o] + (map #(vector % (gobj/get evt %)) (prim-seq (gobj/getKeys evt) 0))) + IPrintWithWriter + (-pr-writer [o writer opts] + (let [pr-pair (fn [keyval] (pr-sequential-writer writer pr-writer "" " " "" opts keyval))] + (pr-sequential-writer writer pr-pair "{" ", " "}" opts + (reify + ISeqable + (-seq [o] + (map #(vector % (gobj/get evt %)) (prim-seq (gobj/getKeys evt) 0)))) + ))))) true)) (defn- listen-internal! From 89e22a64e70f876aa7b174023476b6c595e01aae Mon Sep 17 00:00:00 2001 From: Nicholas Chubrich Date: Sun, 14 Dec 2014 12:48:51 -0800 Subject: [PATCH 2/3] IPrintWithWriter using ckirkendall's suggestion --- src/cljs/domina/events.cljs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/cljs/domina/events.cljs b/src/cljs/domina/events.cljs index 3e06d0a..d2c0333 100644 --- a/src/cljs/domina/events.cljs +++ b/src/cljs/domina/events.cljs @@ -45,13 +45,7 @@ (map #(vector % (gobj/get evt %)) (prim-seq (gobj/getKeys evt) 0))) IPrintWithWriter (-pr-writer [o writer opts] - (let [pr-pair (fn [keyval] (pr-sequential-writer writer pr-writer "" " " "" opts keyval))] - (pr-sequential-writer writer pr-pair "{" ", " "}" opts - (reify - ISeqable - (-seq [o] - (map #(vector % (gobj/get evt %)) (prim-seq (gobj/getKeys evt) 0)))) - ))))) + (-write writer "domina.event" (into {} (seq o)))))) true)) (defn- listen-internal! From a9478d506ce0e2841f98a501b50f0d146fd3dcc5 Mon Sep 17 00:00:00 2001 From: Nicholas Chubrich Date: Sun, 14 Dec 2014 13:17:21 -0800 Subject: [PATCH 3/3] -write with correct number of arguments, output is good and all tests pass --- src/cljs/domina/events.cljs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cljs/domina/events.cljs b/src/cljs/domina/events.cljs index d2c0333..c6bcfcd 100644 --- a/src/cljs/domina/events.cljs +++ b/src/cljs/domina/events.cljs @@ -45,7 +45,7 @@ (map #(vector % (gobj/get evt %)) (prim-seq (gobj/getKeys evt) 0))) IPrintWithWriter (-pr-writer [o writer opts] - (-write writer "domina.event" (into {} (seq o)))))) + (-write writer (into {} (seq o)))))) true)) (defn- listen-internal!