Merged with upstream.

robashton · May 6, 2012 · c01c6ea · c01c6ea
2 parents 6bf4f56 + 0059897
commit c01c6ea
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 45 deletions.
diff --git a/site/index.html b/site/index.html
@@ -1,10 +1,11 @@
 <html>
-  <script type="text/javascript" src="socket.io/socket.io.js"></script>
-  <script type="text/javascript" src="jquery-1.7.2.min.js"></script>
-  <script type="text/javascript" src="hammer.js"></script>
-  <link rel="stylesheet" type="text/css" href="style.css"></script>
+  <head>
+    <script type="text/javascript" src="socket.io/socket.io.js"></script>
+    <script type="text/javascript" src="jquery-1.7.2.min.js"></script>
+    <script type="text/javascript" src="hammer.js"></script>
+    <link rel="stylesheet" type="text/css" href="style.css"></script>
 
-  <script type="text/javascript">
+    <script type="text/javascript">
 
     var BUCKET_WIDTH = 600;
     var lastScale = 1.0;
@@ -143,49 +144,66 @@
         mouseIsInside=false;
       });
 
-      $("body").click(function(){ 
+      var bodyHammer = new Hammer(document.body);
+      bodyHammer.ontap = function() {
         if (!mouseIsInside)
           hideEvent();
-      });
+      };
     });
 
-    var recalculateScale = function() {
-      var container = $('#container');
-      var doc = $(window);
-
-      var containerHeight = 0;
-      var containerWidth = 0;
-      var totalItems = 0;
-
-      for(var i in buckets) {
-        var bucket = buckets[i];
-        totalItems += bucket.count();
-      }
-      if(totalItems === 0) return;
-
-      for(var i in buckets) {
-        var bucket = buckets[i];
-        var bucketHeight = bucket.height();
-        containerHeight = Math.max(containerHeight,  bucketHeight);
-        containerWidth += bucket.width();
-      }
-      containerWidth += BUCKET_WIDTH; 
-
-      var x = doc.width() / containerWidth;
-      var y = doc.height() / containerHeight;
-      var scale = Math.min(x, y);
-      scale = Math.min(scale, 0.3);
-
-      var scaleDifference = lastScale - scale;
-      if(scaleDifference < 0.05) return;
-
-      lastScale = scale;
-      container.css('-webkit-transform', 'scale(' + scale + ')'); 
-    };
-
-    setInterval(recalculateScale, 300);
-
-  </script>
+     var recalculateScale = function() {
+        var container = $('#container');
+        var doc = $(window);
+
+        var containerHeight = 0;
+        var containerWidth = 0;
+        var totalItems = 0;
+
+        for(var i in buckets) {
+          var bucket = buckets[i];
+          totalItems += bucket.count();
+        }
+        if(totalItems === 0) return;
+
+        for(var i in buckets) {
+          var bucket = buckets[i];
+          var bucketHeight = bucket.height();
+          containerHeight = Math.max(containerHeight,  bucketHeight);
+          containerWidth += bucket.width();
+        }
+        containerWidth += BUCKET_WIDTH; 
+
+        var x = doc.width() / containerWidth;
+        var y = doc.height() / containerHeight;
+        var scale = Math.min(x, y);
+        scale = Math.min(scale, 0.3);
+
+        var scaleDifference = lastScale - scale;
+        if(Math.abs(scaleDifference) < 0.05) return;
+
+        lastScale = scale;
+        container.css({
+          '-webkit-transform': 'scale(' + scale + ')',
+          '-moz-transform': 'scale(' + scale + ')',
+        }); 
+      };
+
+      setInterval(recalculateScale, 500);
+
+    </script>
+    <script type="text/javascript">
+      var _gaq = _gaq || [];
+      _gaq.push(['_setAccount', 'UA-11207442-11']);
+      _gaq.push(['_trackPageview']);
+
+      (function() {
+        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+      })();
+
+    </script>
+  </head>
   <body>
     <h1 class="title">Github Live</h1>
     <div id="outerContainer">

diff --git a/site/style.css b/site/style.css
@@ -18,6 +18,10 @@ body {
   -webkit-transform: scale(1.0);
   -webkit-transition: -webkit-transform 0.5s linear;
   -webkit-backface-visibility: hidden;
+  -moz-transform-origin: 0px 0px;
+  -moz-transform: scale(1.0);
+  -moz-transition: -moz-transform 0.5s linear;
+  -moz-backface-visibility: hidden;
 }
 
 .bucket {
@@ -56,11 +60,14 @@ h1.title {
 .push {
   -webkit-transition: -webkit-transform 0.5s linear;
   -webkit-backface-visibility: hidden;
+  -moz-transition: -moz-transform 0.5s linear;
+  -moz-backface-visibility: hidden;
   cursor: pointer;
 }
 
 .highlighted {
   -webkit-transform: scale(0.001);
+  -moz-transform: scale(0.001);
 }
 
 .boxShadow {
@@ -71,8 +78,10 @@ h1.title {
 
 .selected {
   -webkit-transform-origin: 90% 90%;
+  -moz-transform-origin: 90% 90%;
   z-index: -10;
   -webkit-transform: scale(2.0);
+  -moz-transform: scale(2.0);
 }
 
 #dialog-container {
@@ -90,7 +99,9 @@ h1.title {
   width: 400px;
   border: 1px solid #EEE;
   -webkit-box-shadow: 3px 3px 4px #000;
-   border-radius: 15px;
+  -moz-box-shadow: 3px 3px 4px #000;
+  box-shadow: 3px 3px 4px #000;
+  border-radius: 15px;
   -moz-border-radius: 15px;
   padding: 10px 10px 10px 10px;
   pointer-events: all;