previous JavaScript implementation of wordcount barchart and dependencies removed

matthiasn · matthiasn · commit 641c1f86d8bf · 2014-12-15T19:43:46.000+01:00
Underscore.js and regression.js also removed, functionality now implemented in ClojureScript.
diff --git a/Clojure-Websockets/MainApp/bower.json b/Clojure-Websockets/MainApp/bower.json
@@ -20,8 +20,6 @@
     "react": "~0.11.2",
     "pure": "~0.5.0",
     "d3": "~3.3.11",
-    "momentjs": "~2.4.0",
-    "underscore": "~1.5.2",
-    "regression-js": "*"
+    "momentjs": "~2.4.0"
   }
 }
diff --git a/Clojure-Websockets/MainApp/resources/public/index.html b/Clojure-Websockets/MainApp/resources/public/index.html
@@ -49,8 +49,6 @@
                     <h5>word frequency</h5>
                     <div id="wordcount-barchart" class="barchart" ></div>
                     <hr />
-                    <div id="react-bar-chart" class="barchart" ></div>
-                    <hr />
                     <div id="users-count"></div>
                     <div id="total-tweet-count"></div>
                 </div>
@@ -63,11 +61,8 @@ <h5>word frequency</h5>
 
     <script src="/bower_components/d3/d3.min.js"></script>
     <script src="/bower_components/momentjs/min/moment.min.js"></script>
-    <script src="/bower_components/underscore/underscore-min.js"></script>
     <script src="/bower_components/react/react.js"></script>
-    <script src="/bower_components/regression-js/build/regression.min.js"></script>
     <script src="/js/vendor/d3.layout.cloud.js"></script>
-    <script src="/js/barchart.js"></script>
     <script src="/js/wordcloud.js"></script>
     <script type="text/javascript" src="//platform.twitter.com/widgets.js"></script>
 
diff --git a/Clojure-Websockets/MainApp/resources/public/js/barchart.js b/Clojure-Websockets/MainApp/resources/public/js/barchart.js
diff --git a/Clojure-Websockets/MainApp/src/cljs/birdwatch/core.cljs b/Clojure-Websockets/MainApp/src/cljs/birdwatch/core.cljs
@@ -36,7 +36,6 @@
 
 ; update the cheap charts every second
 (go-loop [] (<! (timeout 1000))
-         (.updateBarchart js/BirdWatch (clj->js (wc/get-words state/app 25)))
          (wc-c/update-words (wc/get-words2 state/app 25))
          (ts/update-ts state/app)
          (recur))

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,6 @@`
`20`	`20`	`"react": "~0.11.2",`
`21`	`21`	`"pure": "~0.5.0",`
`22`	`22`	`"d3": "~3.3.11",`
`23`		`- "momentjs": "~2.4.0",`
`24`		`- "underscore": "~1.5.2",`
`25`		`- "regression-js": "*"`
	`23`	`+ "momentjs": "~2.4.0"`
`26`	`24`	`}`
`27`	`25`	`}`