hover detail

matthiasn · matthiasn · commit 160ee0336da8 · 2013-10-01T00:47:29.000+02:00
diff --git a/app/assets/javascripts/controllers.js b/app/assets/javascripts/controllers.js
@@ -1,4 +1,4 @@
-//'use strict';
+'use strict';
 
 /** Controllers */
 angular.module('birdwatch.controllers', ['birdwatch.services', 'charts.barchart', 'charts.wordcloud', 'ui.bootstrap']).
@@ -28,10 +28,10 @@ angular.module('birdwatch.controllers', ['birdwatch.services', 'charts.barchart'
             $scope.search();
         };
 
-        /** update UI every second to keep time ago for tweets accurate */
+        /** update UI every two seconds to keep time ago for tweets accurate */
         var onTimeout = function () {
             $scope.tsdata1 = cf.timeseries();
-            updateTimeout = $timeout(onTimeout, 1000);
+            updateTimeout = $timeout(onTimeout, 2000);
         };
         var updateTimeout = onTimeout();
 
diff --git a/app/assets/javascripts/directives.js b/app/assets/javascripts/directives.js
@@ -67,12 +67,19 @@ angular.module('birdwatch.directives', ['charts.barchart', 'charts.wordcloud'])
                     renderer: 'bar',
                     series: [ {
                         color: 'steelblue',
-                        data: [ { x: 0, y: 0 } ]
+                        name: 'Tweets',
+                        data: [{ x: 0, y: 0 }, { x: 12*60*60, y: 0 }]
                     } ]
                 } );
                 new Rickshaw.Graph.Axis.Time({ graph: graph });
                 graph.render();
 
+                new Rickshaw.Graph.HoverDetail({
+                    graph: graph,
+                    xFormatter: function(x) { return x/3600+ "" },
+                    yFormatter: function(y) { return y === null ? y : y.toFixed(0); }
+                });
+
                 $scope.$watch("tsdata", function() {
                     if ($scope.tsdata.length > 0) {
                         graph.series[0].data = $scope.tsdata;
diff --git a/app/assets/javascripts/services/crossfilter.js b/app/assets/javascripts/services/crossfilter.js
@@ -1,11 +1,9 @@
-//'use strict';
+'use strict';
 
 // crossfilter service
 angular.module('birdwatch.services').factory('cf', function (utils) {
     var exports = {};
 
-    var df = d3.time.format.utc("%a %b %d %H:%M:%S %Z %Y");
-
     // crossfilter object: browser side analytics library, holds array type data (w/incremental updates).
     // dimensions are fast queries on data, e.g. view sorted by followers_count or retweet_count of the original message
     var cf = crossfilter([]);
