upgrade mixpanel lib to v2

2 files changed, 13 insertions, 20 deletions

diff --git a/includes/header.php b/includes/header.php
index 8beac75..3f83530 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -36,8 +36,6 @@ function htmlFooter() {
 		}

 	};

 

-	var mpq=[];

-	mpq.push(['init','24743c6567f831ddfcbbbd3f397e11e4']);

 	(function() {

 		var proto = document.location.protocol,

 		    s = document.getElementsByTagName('script')[0].parentNode;

@@ -48,23 +46,6 @@ function htmlFooter() {
 		wf.async = 'true';

 		s.appendChild(wf, s);

 

-		var b,e,d,c;

-		b=document.createElement('script');

-		b.type='text/javascript';

-		b.async=true;

-		b.src=(proto==='https:'?'https':'http')+'://api.mixpanel.com/site_media/js/api/mixpanel.js';

-		s.appendChild(b);

-		e=function(f){return function(){mpq.push([f].concat(Array.prototype.slice.call(arguments,0)))}};

-		d=['init','track','track_links','track_forms','register','register_once','identify','name_tag','set_config'];

-		for(c=0;c<d.length;c++){mpq[d[c]]=e(d[c])};

-	<?php

-	if ($_SESSION['accepted'] == 1) {

-		if ($_SESSION['displayName'] != 'noname')

-			echo 'mpq.name_tag(' . json_encode($_SESSION['displayName']) . ');';

-		if ($_SERVER['HTTP_HOST'] == 'www.pathery.com')

-			echo 'mpq.identify(' . json_encode($_SESSION['userID']) . ');';

-	}

-	?>

 

 		var ga = document.createElement('script');

 		ga.type = 'text/javascript';

@@ -72,6 +53,18 @@ function htmlFooter() {
         ga.src = ('https:' == proto ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';

 		s.parentNode.appendChild(ga, s);

     })();

+

+	(function(d,c){var a,b,g,e;a=d.createElement("script");a.type="text/javascript";a.async=!0;a.src=("https:"===d.location.protocol?"https:":"http:")+'//api.mixpanel.com/site_media/js/api/mixpanel.2.js';b=d.getElementsByTagName("script")[0];b.parentNode.insertBefore(a,b);c._i=[];c.init=function(a,d,f){var b=c;"undefined"!==typeof f?b=c[f]=[]:f="mixpanel";g="disable track track_pageview track_links track_forms register register_once unregister identify name_tag set_config".split(" ");

+	for(e=0;e<g.length;e++)(function(a){b[a]=function(){b.push([a].concat(Array.prototype.slice.call(arguments,0)))}})(g[e]);c._i.push([a,d,f])};window.mixpanel=c})(document,[]);

+	mixpanel.init("24743c6567f831ddfcbbbd3f397e11e4");

+	<?php

+	if ($_SESSION['accepted'] == 1) {

+		if ($_SESSION['displayName'] != 'noname')

+			echo 'mixpanel.name_tag(' . json_encode($_SESSION['displayName']) . ');';

+		if ($_SERVER['HTTP_HOST'] == 'www.pathery.com')

+			echo 'mixpanel.identify(' . json_encode($_SESSION['userID']) . ');';

+	}

+	?>

 	</script>

 

 </body>

diff --git a/js/mapspecs.js b/js/mapspecs.js
index f6a1791..c767db7 100644
--- a/js/mapspecs.js
+++ b/js/mapspecs.js
@@ -203,7 +203,7 @@ function doSend(mapid) {
 	var speedbox = document.getElementById(mapid+',speed'),

 	    speed = speedbox.options[speedbox.selectedIndex].text,

 		mute = !checkSound(mapid);

-	mpq.track('click go', {

+	mixpanel.track('click go', {

 			'speed': speed,

 			'mute': mute,

 			'mapid': mapid