code formatting

matthiasn · matthiasn · commit b0819cb03679 · 2013-10-12T14:02:40.000+02:00
diff --git a/app/assets/javascripts/directives.js b/app/assets/javascripts/directives.js
@@ -61,7 +61,7 @@ angular.module('birdwatch.directives', ['charts.barchart', 'charts.wordcloud'])
             scope: { tsdata: "=tsdata", live: "=live", interval: "=interval", height: "=height" },
             link: function ($scope, elem, attrs) {
                 var graph = new Rickshaw.Graph( {
-                    element: elem.context,
+                    element: elem[0],
                     width: elem.width(),
                     height: $scope.height,
                     renderer: 'bar',
diff --git a/app/assets/javascripts/services/crossfilter.js b/app/assets/javascripts/services/crossfilter.js
@@ -20,10 +20,10 @@ angular.module('birdwatch.services').factory('cf', function (utils) {
 
     var rsMapper = function(el) { return { x: el.key, y: el.value }};
 
-    var parseDateRoundedByMin    = function(t) { return 60 * Math.floor(Date.parse(t.created_at) / 60000) };
-    var parseDateRoundedBy15Min  = function(t) { return 900 * Math.floor(Date.parse(t.created_at) / 900000) };
-    var parseDateRoundedByHour   = function(t) { return 3600 * Math.floor(Date.parse(t.created_at) / 3600000) };
-    var parseDateRoundedBy6Hour  = function(t) { return 6*3600 * Math.floor(Date.parse(t.created_at) / 3600000 / 6) };
+    var parseDateRoundedByMin    = function(t) { return      60 * Math.floor(Date.parse(t.created_at) / 60000) };
+    var parseDateRoundedBy15Min  = function(t) { return     900 * Math.floor(Date.parse(t.created_at) / 900000) };
+    var parseDateRoundedByHour   = function(t) { return    3600 * Math.floor(Date.parse(t.created_at) / 3600000) };
+    var parseDateRoundedBy6Hour  = function(t) { return  6*3600 * Math.floor(Date.parse(t.created_at) / 3600000 / 6) };
     var parseDateRoundedByDay    = function(t) { return 24*3600 * Math.floor(Date.parse(t.created_at) / 3600000 / 24) };
 
     var byMinGrp   = cf.dimension(parseDateRoundedByMin).group();
@@ -74,9 +74,7 @@ angular.module('birdwatch.services').factory('cf', function (utils) {
     // potentially mapped and filtered
     var fetchTweets = function(pageSize, order) {
       if      (order === "latest")    { return tweetIdDim.top(pageSize); }    // latest: desc order of tweets by ID
-      else if (order === "followers") {
-          return followersDim.top(pageSize).map(maxRetweets);
-      }   // desc order of tweets by followers
+      else if (order === "followers") { return followersDim.top(pageSize).map(maxRetweets); } // desc order of tweets by followers
       else if (order === "retweets") {  // descending order of tweets by total retweets of original message
           return _.first(               // filtered to be unique, would appear for each retweet in window otherwise
               _.uniq(retweetsDim.top(cf.size()).filter(retweeted).map(originalTweet), false, tweetId), pageSize);
diff --git a/app/views/index.scala.html b/app/views/index.scala.html
@@ -112,7 +112,7 @@
 
                     <!-- Tweet Cards inside frame -->
                     <div class="col-lg-4" id="tweet-frame">
-                        <div class="tweetCard" ng-repeat="tweet in cf.tweetPage(currentPage, pageSize, sortModel)"
+                        <div class="tweetCard" data-ng-repeat="tweet in cf.tweetPage(currentPage, pageSize, sortModel)"
                             data-tweet="tweet"></div>
                     </div>
 
@@ -164,12 +164,14 @@ <h6>Word Frequency</h6>
         
         <!-- Analytics, Todo: replace or remove in your own project. -->
         <script>
-            (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-            (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-            m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-            })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-            ga('create', 'UA-40261983-2', 'matthiasnehlsen.com');
-            ga('send', 'pageview');
+            if ( location.hostname === 'birdwatch.matthiasnehlsen.com' ) {
+                (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+                m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+                })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+                ga('create', 'UA-40261983-2', 'matthiasnehlsen.com');
+                ga('send', 'pageview');
+            }
         </script>
 
     </body>
