updated to angular 1.4.10 and the routechangestart event

mjhea0 · mjhea0 · commit 20c677862d5d · 2016-04-17T11:41:33.000-06:00
diff --git a/project/static/app.js b/project/static/app.js
@@ -36,11 +36,12 @@ myApp.config(function ($routeProvider) {
 myApp.run(function ($rootScope, $location, $route, AuthService) {
   $rootScope.$on('$routeChangeStart',
     function (event, next, current) {
-      AuthService.getUserStatus();
-      if (next.access.restricted &&
-          !AuthService.isLoggedIn()) {
-        $location.path('/login');
-        $route.reload();
-      }
+      AuthService.getUserStatus()
+      .then(function(){
+        if (next.access.restricted && !AuthService.isLoggedIn()){
+          $location.path('/login');
+          $route.reload();
+        }
+      });
   });
 });
diff --git a/project/static/index.html b/project/static/index.html
@@ -13,8 +13,8 @@
     <!-- scripts -->
     <script src="//code.jquery.com/jquery-2.1.4.min.js" type="text/javascript"></script>
     <script src="//netdna.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" type="text/javascript"></script>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.9/angular.min.js" type="text/javascript"></script>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.9/angular-route.min.js" type="text/javascript"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.10/angular.min.js" type="text/javascript"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.10/angular-route.min.js" type="text/javascript"></script>
     <script src="static/app.js" type="text/javascript"></script>
     <script src="static/services.js" type="text/javascript"></script>
     <script src="static/controllers.js" type="text/javascript"></script>
diff --git a/project/static/services.js b/project/static/services.js
@@ -99,7 +99,7 @@ angular.module('myApp').factory('AuthService',
     }
 
     function getUserStatus() {
-      $http.get('/api/status')
+      return $http.get('/api/status')
       // handle success
       .success(function (data) {
         if(data.status){

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ angular.module('myApp').factory('AuthService',`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`function getUserStatus() {`
`102`		`- $http.get('/api/status')`
	`102`	`+ return $http.get('/api/status')`
`103`	`103`	`// handle success`
`104`	`104`	`.success(function (data) {`
`105`	`105`	`if(data.status){`