restore click on barchart to add word in search

matthiasn · matthiasn · commit b4bea9438fe0 · 2014-12-18T02:16:36.000+01:00
diff --git a/Clojure-Websockets/MainApp/project.clj b/Clojure-Websockets/MainApp/project.clj
@@ -10,7 +10,7 @@
                  [org.clojure/tools.namespace "0.2.7"]
                  [ch.qos.logback/logback-classic "1.1.1"]
                  [com.taoensso/sente "1.2.0" :exclusions [org.clojure/clojure com.taoensso/encore]]
-                 [org.clojure/core.match "0.2.1"]
+                 [org.clojure/core.match "0.3.0-alpha3"]
                  [http-kit "2.1.19"]
                  [compojure "1.2.1"]
                  [ring "1.3.1"]
diff --git a/Clojure-Websockets/MainApp/src/cljs/birdwatch/charts/wordcount_chart.cljs b/Clojure-Websockets/MainApp/src/cljs/birdwatch/charts/wordcount_chart.cljs
@@ -2,6 +2,7 @@
   (:require [birdwatch.util :as util]
             [birdwatch.stats.regression :as reg]
             [birdwatch.charts.shapes :as s]
+            [birdwatch.state :as state]
             [reagent.core :as r :refer [atom]]))
 
 (enable-console-print!)
@@ -19,7 +20,7 @@
 (defn bar [text cnt y h w idx]
   (let [pos-slope (get @pos-trends text)
         ratio-slope (get @ratio-trends text)]
-    [:g
+    [:g {:on-click #(state/append-search-text text)}
      [:text {:y (+ y 8) :x 138 :stroke "none" :fill "black" :dy ".35em" :textAnchor "end"} text]
      [s/arrow 146 y (cond (pos? pos-slope)   :UP       (neg? pos-slope )   :DOWN       :else :RIGHT)]
      [s/arrow 160 y (cond (pos? ratio-slope) :RIGHT-UP (neg? ratio-slope ) :RIGHT-DOWN :else :RIGHT)]
diff --git a/Clojure-Websockets/MainApp/src/cljs/birdwatch/core.cljs b/Clojure-Websockets/MainApp/src/cljs/birdwatch/core.cljs
@@ -18,13 +18,10 @@
 ;;; Reagent components for the application are initialized here.
 (ui/init-views)
 
-(defn ^:export append-search-text [s]
-  (swap! state/app assoc :search-text (str (:search-text @state/app) " " s)))
-
 ;;; WordCloud element (implemented externally in JavaScript)
 (def cloud-elem (.getElementById js/document "wordCloud"))
 (def cloud-w (aget cloud-elem "offsetWidth"))
-(def word-cloud (.WordCloud js/BirdWatch cloud-w (* cloud-w 0.7) 250 append-search-text "#wordCloud"))
+(def word-cloud (.WordCloud js/BirdWatch cloud-w (* cloud-w 0.7) 250 state/append-search-text "#wordCloud"))
 
 ; update the cheap charts every second
 (go-loop [] (<! (timeout 1000))
diff --git a/Clojure-Websockets/MainApp/src/cljs/birdwatch/state.cljs b/Clojure-Websockets/MainApp/src/cljs/birdwatch/state.cljs
@@ -39,3 +39,6 @@
          (let [ttc (<! c/total-tweets-count-chan)]
            (swap! app assoc :total-tweet-count ttc)
            (recur)))
+
+(defn append-search-text [s]
+  (swap! app assoc :search-text (str (:search-text @app) " " s)))
