Merge branch 'master' of github.com:relevance/clojurescript

Author: stuarthalloway

samples/twitterbuzz/src/twitterbuzz/core.cljs

@@ -85,14 +85,11 @@
 (defn update-graph [graph tweet-maps]
   (reduce (fn [acc tweet]
             (let [user (:from_user tweet)
-                  mentions (parse-mentions tweet)]
-              (-> (if-let [existing-node (get acc user)]
-                    (assoc acc user
-                           (assoc existing-node :last-tweet (:text tweet)))
-                    (assoc acc user
-                           {:image-url (:profile_image_url tweet)
-                            :last-tweet (:text tweet)
-                            :mentions {}}))
+                  mentions (parse-mentions tweet)
+                  node (get acc user {:mentions {}})]
+              (-> (assoc acc user
+                         (assoc node :last-tweet (:text tweet)
+                                     :image-url (:profile_image_url tweet)))
                   (add-mentions user mentions))))
           graph
           (map #(select-keys % [:text :from_user :profile_image_url]) tweet-maps)))

samples/twitterbuzz/src/twitterbuzz/showgraph.cljs

@@ -12,7 +12,6 @@
 
 ; Drawing configuration
 (def avatar-size 32) ; used for both x and y dimensions of avatars
-(def edge-widths [0 1 2 3 4]) ; More mentions == thicker edges
 (def anneal-skipping 10)
 (def cooling 1000)
 ; fail whale
@@ -25,10 +24,7 @@
 ; BAD HACK: don't change globals like this -- find a better way:
 ;(set! anim/TIMEOUT 500)
 
-(def edge-strokes
-  (vec (map #(graphics/Stroke. % "#009") edge-widths)))
-
-(def max-stroke (peek edge-strokes))
+(def edge-stroke (graphics/Stroke. 1 "#009"))
 
 (def g
   (doto (graphics/createGraphics "100%" "100%")
@@ -57,7 +53,7 @@
               y2 (unit-to-pixel uy2 (.height canvas-size))]
           (.drawPath g
                     (-> (. g (createPath)) (.moveTo x1 y1) (.lineTo x2 y2))
-                    (get edge-strokes mention-count max-stroke) nil))))
+                    edge-stroke nil))))
 
     ; Draw avatar nodes
     (doseq [[username {:keys [x y] :as foo}] locs]

samples/twitterbuzz/src/twitterbuzz/timeline.cljs

@@ -26,7 +26,7 @@
 (defn update-timeline [tweets]
   (let [status (dom/getElement "tweet-status")]
     (do (dom/setTextContent status (str (:tweet-count @buzz/state) " tweets"))
-        (doseq [tweet tweets]
+        (doseq [tweet (reverse tweets)]
           (add-timeline-tweet tweet)))))
 
 (buzz/register :track-clicked #(buzz/remove-children "timeline-content"))