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

Author: stuarthalloway

samples/twitterbuzz/src/twitterbuzz/core.cljs

@@ -179,3 +179,18 @@
 
   )
 
+(defn dom-element
+  "Create a dom element using a keyword for the element name and a map
+  for the attributes."
+  [element attrs]
+  (dom/createDom (name element)
+                 (.strobj (reduce (fn [m [k v]]
+                                    (assoc m k v))
+                                  {}
+                                  (map #(vector (name %1) %2) (keys attrs) (vals attrs))))))
+
+(defn remove-children
+  "Remove all children from the element with the passed id."
+  [id]
+  (let [parent (dom/getElement (name id))]
+    (do (dom/removeChildren parent))))

samples/twitterbuzz/src/twitterbuzz/leaderboard.cljs

@@ -1,24 +1,25 @@
+;   Copyright (c) Rich Hickey. All rights reserved.
+;   The use and distribution terms for this software are covered by the
+;   Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+;   which can be found in the file epl-v10.html at the root of this distribution.
+;   By using this software in any fashion, you are agreeing to be bound by
+;   the terms of this license.
+;   You must not remove this notice, or any other, from this software.
+
 (ns twitterbuzz.leaderboard
   (:require [twitterbuzz.core :as buzz]
             [goog.dom :as dom]))
 
-(defn dom-element [element attrs]
-  (dom/createDom element
-                 (.strobj (reduce (fn [m [k v]]
-                                    (assoc m k v))
-                                  {}
-                                  (map #(vector (name %1) %2) (keys attrs) (vals attrs))))))
-
 (defn add-leaderboard-node [node]
   (let [user (first node)
         user-info (second node)
         parent (dom/getElement "leaderboard-content")
-        child (dom-element "div" {:class "tweet"})
-        details (dom-element "div" {:class "tweet-details"})
-        user-e (dom-element "div" {:class "user-name"})
-        text (dom-element "div" {:class "tweet-text"})
-        pic (dom-element "img" {:src (:image-url user-info) :class "profile-pic"})
-        num-mentions (dom-element "div")]
+        child (buzz/dom-element :div {:class "tweet"})
+        details (buzz/dom-element :div {:class "tweet-details"})
+        user-e (buzz/dom-element :div {:class "user-name"})
+        text (buzz/dom-element :div {:class "tweet-text"})
+        pic (buzz/dom-element :img {:src (:image-url user-info) :class "profile-pic"})
+        num-mentions (buzz/dom-element "div")]
     (do (dom/insertChildAt text (dom/htmlToDocumentFragment (:last-tweet user-info)) 0) ;; (dom/setTextContent text (:last-tweet user-info))
         (dom/setTextContent user-e user)
         (dom/setTextContent num-mentions (str (buzz/num-mentions user-info)))
@@ -29,16 +30,13 @@
         (dom/appendChild details num-mentions)
         (dom/appendChild parent child 0))))
 
-(defn clear-leaderboard []
-  (let [parent (dom/getElement "leaderboard-content")]
-    (do (dom/removeChildren parent))))
-
 (defn leaders [nodes]
   (reverse (sort-by #(buzz/num-mentions (second %)) nodes)))
 
 (defn update-leaderboard [graph]
-  (do (clear-leaderboard)
+  (do (buzz/remove-children "leaderboard-content")
       (doseq [next-node (take 5 (leaders (seq graph)))]
         (add-leaderboard-node next-node))))
 
+(buzz/register :track-clicked #(buzz/remove-children "leaderboard-content"))
 (buzz/register :graph-update update-leaderboard)

samples/twitterbuzz/src/twitterbuzz/showgraph.cljs

@@ -40,6 +40,9 @@
 (defn unit-to-pixel [unit-arg canvas-size]
   (+ (* unit-arg (- canvas-size avatar-size)) (/ avatar-size 2)))
 
+(defn log [& args]
+  (js* "console.log(~{})" (apply pr-str args)))
+
 (defn draw-graph [{:keys [locs mentions]} text]
   (let [canvas-size (. g (getPixelSize))]
     (. g (clear))
@@ -57,7 +60,8 @@
                     (get edge-strokes mention-count max-stroke) nil))))
 
     ; Draw avatar nodes
-    (doseq [[username {:keys [x y]}] locs]
+    (doseq [[username {:keys [x y] :as foo}] locs]
+      ;(log (pr-str foo))
       (.drawImage g
                   (- (unit-to-pixel x (.width canvas-size))  (/ avatar-size 2))
                   (- (unit-to-pixel y (.height canvas-size)) (/ avatar-size 2))
@@ -71,31 +75,10 @@
         (.drawTextOnLine g text 5 20 (.width canvas-size) 20
                         "left" font nil fill)))))
 
-(def users (atom nil))
-(buzz/register :graph-update #(reset! users %))
+(buzz/register :graph-update #(draw-graph (layout/radial %) nil))
 
 (def animation (atom nil))
 
-(set! (.cycle animation)
-  (fn [t]
-    (let [a (first @animation)]
-      (draw-graph (:best a) (debug a))
-      (swap! animation #(drop anneal-skipping %))
-      (when (= (:best a) (:best (first @animation)))
-        ; no better graph in the last 'anneal-skipping' steps, so quit trying.
-        (anim/unregisterAnimation animation)))))
-
-(defn start-anneal []
-  (reset! animation
-    (ann/anneal
-      layout/score
-      (ann/linear-cooling cooling)
-      layout/permute-move
-      ann/standard-prob
-      (layout/init-state @users)))
-  (anim/registerAnimation animation))
-
-(events/listen
-  (dom/getElement "network") (array events/EventType.CLICK) start-anneal)
-(buzz/register :track-clicked start-anneal)
-(buzz/register :refresh-clicked start-anneal)
+;(events/listen (dom/getElement "network") events/EventType.CLICK start-anneal)
+(buzz/register :track-clicked #(. g (clear)))
+;(buzz/register :refresh-clicked start-anneal)

samples/twitterbuzz/src/twitterbuzz/timeline.cljs

@@ -7,22 +7,15 @@
 ;   You must not remove this notice, or any other, from this software.
 
 (ns twitterbuzz.timeline
-  (:require [twitterbuzz.core :as core]
+  (:require [twitterbuzz.core :as buzz]
             [goog.dom :as dom]))
 
-(defn dom-element [element attrs]
-  (dom/createDom (name element)
-                 (.strobj (reduce (fn [m [k v]]
-                                    (assoc m k v))
-                                  {}
-                                  (map #(vector (name %1) %2) (keys attrs) (vals attrs))))))
-
 (defn add-timeline-tweet [tweet]
   (let [parent (dom/getElement "timeline-content")
-        child (dom-element :div {:class "tweet"})
-        user (dom-element :div {:class "user-name"})
-        text (dom-element :div {:class "tweet-text"})
-        pic (dom-element :img {:src (:profile_image_url tweet) :class "profile-pic"})]
+        child (buzz/dom-element :div {:class "tweet"})
+        user (buzz/dom-element :div {:class "user-name"})
+        text (buzz/dom-element :div {:class "tweet-text"})
+        pic (buzz/dom-element :img {:src (:profile_image_url tweet) :class "profile-pic"})]
     (do (dom/insertChildAt text (dom/htmlToDocumentFragment (:text tweet)) 0) ;;(dom/setTextContent text (:text tweet))
         (dom/setTextContent user (:from_user tweet))
         (dom/appendChild child pic)
@@ -32,8 +25,9 @@
 
 (defn update-timeline [tweets]
   (let [status (dom/getElement "tweet-status")]
-    (do (dom/setTextContent status (str (:tweet-count @core/state) " tweets"))
+    (do (dom/setTextContent status (str (:tweet-count @buzz/state) " tweets"))
         (doseq [tweet tweets]
           (add-timeline-tweet tweet)))))
 
-(core/register :new-tweets update-timeline)
+(buzz/register :track-clicked #(buzz/remove-children "timeline-content"))
+(buzz/register :new-tweets update-timeline)