Skip to content

Commit 82e1463

Browse files
committed
WIP
1 parent 2d1fbc5 commit 82e1463

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

clients/cljs-om/project.clj

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
:url "http://example.com/FIXME"
44

55
:dependencies [[org.clojure/clojure "1.6.0"]
6-
[org.clojure/clojurescript "0.0-2202"]
6+
[org.clojure/clojurescript "0.0-2268"]
77
[org.clojure/core.async "0.1.303.0-886421-alpha"]
88
[tailrecursion/cljs-priority-map "1.1.0"]
9-
[om "0.6.4"]]
9+
[om "0.6.5"]]
1010

1111
:plugins [[lein-cljsbuild "1.0.3"]
1212
[com.cemerick/clojurescript.test "0.3.1"]]
@@ -29,13 +29,13 @@
2929
:externs ["externs/react.js" "externs/misc.js"]}}
3030
{:id "test"
3131
:source-paths ["src" "test"]
32+
:notify-command ["phantomjs" :cljs.test/runner "js/moment.min.js" "test-out/cljs_om.js"]
3233
:compiler {:output-to "test-out/cljs_om.js"
3334
:output-dir "test-out/"
3435
:optimizations :simple
3536
:externs ["externs/react.js" "externs/misc.js"]}}]
3637

3738
:test-commands {"unit-tests" ["phantomjs" :runner
38-
;"js/react.min.js"
39+
"js/react.min.js"
3940
"js/moment.min.js"
40-
"this.literal_js_was_evaluated=true"
4141
"test-out/cljs_om.js"]}})

clients/cljs-om/src/cljs_om/core.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
(def prev-tweets-chan (chan 10000))
4040

4141
(go-loop []
42-
(let [[t chan] (alts! [tweets-chan prev-tweets-chan] :priority true)]
42+
(let [[t chan] (alts! [tweets-chan prev-tweets-chan] :priority)]
4343
(tweets/add-tweet t app-state word-cloud)
4444
(recur)))
4545

clients/cljs-om/test/cljs_om/util.cljs

-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,3 @@
1515
"test that"
1616
(is (= (util/from-now (new js/Date)) "just now")))
1717

18-

0 commit comments

Comments
 (0)