formatting

matthiasn · matthiasn · commit 2d1fbc587506 · 2014-07-24T11:24:33.000+02:00
diff --git a/clients/cljs-om/src/cljs_om/core.cljs b/clients/cljs-om/src/cljs_om/core.cljs
@@ -39,7 +39,7 @@
 (def prev-tweets-chan (chan 10000))
 
 (go-loop []
- (let [[t chan] (alts! [tweets-chan prev-tweets-chan] :priority)]
+ (let [[t chan] (alts! [tweets-chan prev-tweets-chan] :priority true)]
    (tweets/add-tweet t app-state word-cloud)
    (recur)))
 
diff --git a/clients/cljs-om/src/cljs_om/tweets.cljs b/clients/cljs-om/src/cljs_om/tweets.cljs
@@ -10,7 +10,9 @@
 
 (defn add-to-tweets-map [app tweets-map tweet]
   "adds tweet to tweets-map"
-  (swap! app assoc-in [tweets-map (keyword (:id_str tweet))] (util/format-tweet tweet)))
+  (swap! app
+         assoc-in [tweets-map (keyword (:id_str tweet))]
+         (util/format-tweet tweet)))
 
 (defn swap-when-larger [app priority-map rt-id n]
   "swaps item in priority-map when new value is larger than old value"
diff --git a/clients/cljs-om/src/cljs_om/util.cljs b/clients/cljs-om/src/cljs_om/util.cljs
@@ -9,7 +9,7 @@
   "formats a number for display, e.g. 1.7K, 122K or 1.5M followers"
   (cond
     (< number 1000) (str number)
-    (< number 100000) (str (/ (.round js/Math (/ number 100))10) "K")
+    (< number 100000) (str (/ (.round js/Math (/ number 100)) 10) "K")
     (< number 1000000) (str (.round js/Math (/ number 1000)) "K")
     :default (str (/ (.round js/Math (/ number 100000)) 10) "M")))
 
@@ -69,16 +69,18 @@
   "swaps item in priority-map"
   (swap! app assoc priority-map (assoc (priority-map @app) id n)))
 
-(defn initial-state [] {:count 0        :n 10            :retweets {}
-                        :tweets-map {}  :search-text ""  :page 1
-                        :search "*"     :stream nil
-                        :sorted :by-rt-since-startup
-                        :by-followers (priority-map-by >)
-                        :by-retweets (priority-map-by >)
-                        :by-favorites (priority-map-by >)
-                        :by-rt-since-startup (priority-map-by >)
-                        :by-id (priority-map-by >)
-                        :words-sorted-by-count (priority-map-by >)})
+(defn initial-state []
+  "function returning fresh application state"
+  {:count 0        :n 10            :retweets {}
+   :tweets-map {}  :search-text ""  :page 1
+   :search "*"     :stream nil
+   :sorted :by-rt-since-startup
+   :by-followers (priority-map-by >)
+   :by-retweets (priority-map-by >)
+   :by-favorites (priority-map-by >)
+   :by-rt-since-startup (priority-map-by >)
+   :by-id (priority-map-by >)
+   :words-sorted-by-count (priority-map-by >)})
 
 (defn tweets-by-order [tweets-map order]
   "find top n tweets by specified order"
