Merge remote-tracking branch 'origin/gh-pages' into dev

Hextris · Aug 19, 2014 · 6e1fc24 · 6e1fc24
2 parents 7fd1f83 + 5490729
commit 6e1fc24
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/index.html b/index.html
@@ -1,5 +1,8 @@
 <!DOCTYPE html>
 <html lang='en'>
+ <!-- start Mixpanel --><script type="text/javascript">(function(f,b){if(!b.__SV){var a,e,i,g;window.mixpanel=b;b._i=[];b.init=function(a,e,d){function f(b,h){var a=h.split(".");2==a.length&&(b=b[a[0]],h=a[1]);b[h]=function(){b.push([h].concat(Array.prototype.slice.call(arguments,0)))}}var c=b;"undefined"!==typeof d?c=b[d]=[]:d="mixpanel";c.people=c.people||[];c.toString=function(b){var a="mixpanel";"mixpanel"!==d&&(a+="."+d);b||(a+=" (stub)");return a};c.people.toString=function(){return c.toString(1)+".people (stub)"};i="disable track track_pageview track_links track_forms register register_once alias unregister identify name_tag set_config people.set people.set_once people.increment people.append people.track_charge people.clear_charges people.delete_user".split(" ");
+ for(g=0;g<i.length;g++)f(c,i[g]);b._i.push([a,e,d])};b.__SV=1.2;a=f.createElement("script");a.type="text/javascript";a.async=!0;a.src="//cdn.mxpnl.com/libs/mixpanel-2.2.min.js";e=f.getElementsByTagName("script")[0];e.parentNode.insertBefore(a,e)}})(document,window.mixpanel||[]);
+ mixpanel.init("883204b8a40c5693d608bcf489405ecc");</script><!-- end Mixpanel -->
  <head>
  <title>Hextris</title>
  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0, minimal-ui"/>

diff --git a/js_prod_v3/main.js b/js_prod_v3/main.js
@@ -67,6 +67,7 @@ function hideUIElements() {
 
 function init(b) {
  if (b) {
+ mixpanel.track("Restart");
  hidebottombar();
 
 
@@ -80,6 +81,10 @@ function init(b) {
  }, 7000);
  clearSaveState();
  }
+ else{
+ mixpanel.track("Game Started");
+ }
+
 
  $("#pauseBtnInner").html('<i class="fa fa-pause fa-2x"></i>');
  hideUIElements();

diff --git a/js_prod_v3/view.js b/js_prod_v3/view.js
@@ -132,7 +132,7 @@ function showText(text) {
  }
  }
  }
- messages['gameover'] += "<div class='fltrt' id='tweetStuff'><a class='tweet' href='https://twitter.com/intent/tweet?text=Can you beat my score of "+ score +" points in &url=http://hextris.github.io/hextris&button_hashtag=hextris' data-lang='en' data-related='hextris:hextris'>Share Your Score on Twitter!!!</a></div>"
+ messages['gameover'] += "<div class='fltrt' id='tweetStuff'><a class='tweet' href='https://twitter.com/intent/tweet?text=Can you beat my &button_hashtag=hextris score of "+ score +" points on http://hextris.github.io/hextris?' data-lang='en' data-related='hextris:hextris'>Share Your Score on Twitter!!!</a></div>"
  $("#overlay").html(messages[text]);
  $("#overlay").fadeIn("1000", "swing");