Fix error with mixpanel loading

4 files changed, 16 insertions, 45 deletions

diff --git a/theme/javascript/app.js b/theme/javascript/app.js
index d623e58..8fdd114 100644
--- a/theme/javascript/app.js
+++ b/theme/javascript/app.js
@@ -17,9 +17,6 @@ require([
         // Initialize storage
         storage.setBaseKey(state.githubId);
 
-        // Tract page view
-        analytic.track("View");
-
         // Init sidebar
         sidebar.init();
 
diff --git a/theme/javascript/utils/analytic.js b/theme/javascript/utils/analytic.js
index f5aa9a8..cfd0dac 100644
--- a/theme/javascript/utils/analytic.js
+++ b/theme/javascript/utils/analytic.js
@@ -1,18 +1,26 @@
 define([
+    "lodash",
     "mixpanel"
-], function(mixpanel) {
-    mixpanel.init("01eb2b950ae09a5fdb15a98dcc5ff20e");
+], function(_, mixpanel) {
+    mixpanel.init("01eb2b950ae09a5fdb15a98dcc5ff20e", {
+        loaded: function() {
+            track("View");
+        }
+    });
 
     var isAvailable = function() {
         return (typeof mixpanel !== "undefined");
     };
 
-    var track = function(event, data) {
+    var track = function(e, data) {
         if (!isAvailable()) {
-            console.log("tracking not available!");
+            console.warn("tracking not available!");
             return;
         }
-        mixpanel.track(event, data);
+        console.log("track", e);
+        mixpanel.track(e, _.extend(data || {}, {
+            'domain': window.location.host
+        }));
     };
 
     return {
diff --git a/theme/javascript/utils/storage.js b/theme/javascript/utils/storage.js
index 14275c6..57f5878 100644
--- a/theme/javascript/utils/storage.js
+++ b/theme/javascript/utils/storage.js
@@ -14,6 +14,7 @@ define(function(){
         },
         get: function(key, def) {
             key = baseKey+":"+key;
+            if (localStorage[key] === undefined) return def;
             try {
                 var v = JSON.parse(localStorage[key]);
                 return v == null ? def : v;;
diff --git a/theme/javascript/vendors/mixpanel.js b/theme/javascript/vendors/mixpanel.js
index e7dbfaa..763a573 100644
--- a/theme/javascript/vendors/mixpanel.js
+++ b/theme/javascript/vendors/mixpanel.js
@@ -1,37 +1,2 @@
-(function(e, b) {
-    if (!b.__SV) {
-        var a, f, 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 = e.createElement("script");
-        a.type = "text/javascript";
-        a.src = ("https:" === e.location.protocol ? "https:" : "http:") + '//cdn.mxpnl.com/libs/mixpanel-2.2.min.js';
-        f = e.getElementsByTagName("script")[0];
-        f.parentNode.insertBefore(a, f)
-    }
-})(document, window.mixpanel || []);
\ No newline at end of file
+(function(e,b){if(!b.__SV){var a,f,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=e.createElement("script");a.type="text/javascript";a.async=!0;a.src=("https:"===e.location.protocol?"https:":"http:")+'//cdn.mxpnl.com/libs/mixpanel-2.2.min.js';f=e.getElementsByTagName("script")[0];f.parentNode.insertBefore(a,f)}})(document,window.mixpanel||[]);
\ No newline at end of file