From cabbdc35b7f3caf028e25b1e16337d0793b7ed2a Mon Sep 17 00:00:00 2001 From: Brandon Bloom Date: Sun, 29 Apr 2012 14:45:42 -0700 Subject: [PATCH] Fix js-obj fn --- src/cljs/cljs/core.cljs | 10 ++-------- test/cljs/cljs/core_test.cljs | 5 +++++ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/cljs/cljs/core.cljs b/src/cljs/cljs/core.cljs index 4c52f39..8065910 100644 --- a/src/cljs/cljs/core.cljs +++ b/src/cljs/cljs/core.cljs @@ -689,14 +689,8 @@ reduces them without incurring seq initialization" (defn js-obj ([] (js* "{}")) - ([k1 v1] - (js* "{~{}:~{}}" k1 v1)) - ([k1 v1 k2 v2] - (js* "{~{}:~{},~{}:~{}}" k1 v1 k2 v2)) - ([k1 v1 k2 v2 k3 v3] - (js* "{~{}:~{},~{}:~{},~{}:~{}}" k1 v1 k2 v2 k3 v3)) - ([k1 v1 k2 v2 k3 v3 & more] - (apply gobject/create k1 v1 k2 v2 k3 v3 more))) + ([& keyvals] + (apply gobject/create keyvals))) (defn js-keys [obj] (let [keys (array)] diff --git a/test/cljs/cljs/core_test.cljs b/test/cljs/cljs/core_test.cljs index 0b2c387..80dbf6c 100644 --- a/test/cljs/cljs/core_test.cljs +++ b/test/cljs/cljs/core_test.cljs @@ -1,6 +1,11 @@ (ns cljs.core-test) (defn test-stuff [] + ;; js primitives + (let [keys #(vec (js-keys %))] + (assert (= [] (keys (js-obj)) (keys (apply js-obj [])))) + (assert (= ["x"] (keys (js-obj "x" "y")) (keys (apply js-obj ["x" "y"]))))) + ;; -equiv (assert (= 1)) (assert (= 1 1)) -- 1.7.9.1