ajax + analytics

azlan187 · Feb 11, 2014 · 1093064 · 1093064
1 parent e3c3022
commit 1093064
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 8 deletions.
diff --git a/app/auth.js b/app/auth.js
@@ -181,9 +181,11 @@ Balanced.Auth = (function() {
 	}.observes('user', 'user.admin');
 
 	auth.on('signInTransition', function() {
-		Ember.run.next(function() {
-			auth.loadAdminExtension();
-		});
+		auth.set('signInTransitionCalled', true);
+
+		// Delay it for 500ms to give time for any
+		// transition to finish loading
+		Ember.run.next(_.delay(_.bind(auth.loadAdminExtension, auth), 500));
 	});
 
 	auth.request = function(opts, eventName, successFn) {
@@ -305,7 +307,8 @@ Balanced.Auth = (function() {
 
 		auth.setProperties({
 			lastLoginUri: null,
-			OTPSecret: null
+			OTPSecret: null,
+			signInTransitionCalled: false
 		});
 
 		auth.unsetAPIKey();

diff --git a/app/lib/ajax.js b/app/lib/ajax.js
@@ -11,6 +11,15 @@ Balanced.NET = (function() {
 				Balanced.NET.csrfToken = response.csrf;
 			});
 		},
+		loadCSRFTokenIfNotLoaded: function(fn) {
+			fn = fn || function() {};
+
+			if (!Balanced.NET.csrfToken) {
+				return this.loadCSRFToken().success(fn);
+			} else {
+				return fn();
+			}
+		},
 		csrfToken: $.cookie(Balanced.COOKIE.CSRF_TOKEN),
 		defaultApiKey: null,
 

diff --git a/app/lib/analytics.js b/app/lib/analytics.js
@@ -22,7 +22,7 @@ Balanced.Analytics = (function() {
 
 	return {
 		init: function(settings) {
-			if (window.TESTING) {
+			if (window.TESTING || !window.mixpanel.init) {
 				return;
 			}
 
@@ -69,7 +69,7 @@ Balanced.Analytics = (function() {
 		},
 		trackPage: _.debounce(function(page) {
 			var currentLocation = page + location.hash;
-			if (window.TESTING) {
+			if (window.TESTING || !window.mixpanel.track_pageview) {
 				return;
 			}
 			window._gaq.push(['_trackPageview', currentLocation]);
@@ -78,7 +78,7 @@ Balanced.Analytics = (function() {
 		trackEvent: function(name, data) {
 			data = data || {};
 
-			if (window.TESTING) {
+			if (window.TESTING || !window.mixpanel.track) {
 				return;
 			}
 

diff --git a/app/routes/application.js b/app/routes/application.js
@@ -11,7 +11,7 @@ Balanced.ApplicationRoute = Balanced.Route.extend({
 			return;
 		}
 
-		return Balanced.NET.loadCSRFToken().then(function(response, status, jqxhr) {
+		return Balanced.NET.loadCSRFTokenIfNotLoaded(function() {
 			return Balanced.Auth.rememberMeSignIn();
 		});
 	},

diff --git a/app/routes/auth_route.js b/app/routes/auth_route.js
@@ -4,6 +4,7 @@ Balanced.AuthRoute = Ember.Route.extend({
 		if (Balanced.Auth.get('signedIn')) {
 			return;
 		}
+
 		Balanced.Auth.set('attemptedTransition', transition);
 		this.transitionTo('login');
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ Balanced.ApplicationRoute = Balanced.Route.extend({ @@
     			return;
     		}
-    		return Balanced.NET.loadCSRFToken().then(function(response, status, jqxhr) {
+    		return Balanced.NET.loadCSRFTokenIfNotLoaded(function() {
     			return Balanced.Auth.rememberMeSignIn();
     		});
     	},
@@ Expand Down @@