minor fix to previous commit

inkstak · Apr 4, 2016 · 7db32ae · 7db32ae
1 parent 3b2b934
commit 7db32ae
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/build/loading-bar.js b/build/loading-bar.js
@@ -100,9 +100,9 @@ angular.module('cfp.loadingBarInterceptor', ['cfp.loadingBar'])
           // Check to make sure this request hasn't already been cached and that
           // the requester didn't explicitly ask us to ignore this request:
           if (!config.ignoreLoadingBar && !isCached(config)) {
+            $rootScope.$broadcast('cfpLoadingBar:loading', {url: config.url});
             if (reqsTotal === 0) {
               startTimeout = $timeout(function() {
-                $rootScope.$broadcast('cfpLoadingBar:loading', {url: config.url});
                 cfpLoadingBar.start();
               }, latencyThreshold);
             }
@@ -307,9 +307,7 @@ angular.module('cfp.loadingBar', [])
           $animate = $injector.get('$animate');
         }
 
-        $rootScope.$broadcast('cfpLoadingBar:completed');
         _set(1);
-
         $timeout.cancel(completeTimeout);
 
         // Attempt to aggregate any start/complete calls within 500ms:
@@ -319,6 +317,7 @@ angular.module('cfp.loadingBar', [])
             promise.then(_completeAnimation);
           }
           $animate.leave(spinner);
+          $rootScope.$broadcast('cfpLoadingBar:completed');
         }, 500);
       }
 

diff --git a/build/loading-bar.min.js b/build/loading-bar.min.js
diff --git a/src/loading-bar.js b/src/loading-bar.js
@@ -94,9 +94,9 @@ angular.module('cfp.loadingBarInterceptor', ['cfp.loadingBar'])
           // Check to make sure this request hasn't already been cached and that
           // the requester didn't explicitly ask us to ignore this request:
           if (!config.ignoreLoadingBar && !isCached(config)) {
+            $rootScope.$broadcast('cfpLoadingBar:loading', {url: config.url});
             if (reqsTotal === 0) {
               startTimeout = $timeout(function() {
-                $rootScope.$broadcast('cfpLoadingBar:loading', {url: config.url});
                 cfpLoadingBar.start();
               }, latencyThreshold);
             }
@@ -301,9 +301,7 @@ angular.module('cfp.loadingBar', [])
           $animate = $injector.get('$animate');
         }
 
-        $rootScope.$broadcast('cfpLoadingBar:completed');
         _set(1);
-
         $timeout.cancel(completeTimeout);
 
         // Attempt to aggregate any start/complete calls within 500ms:
@@ -313,6 +311,7 @@ angular.module('cfp.loadingBar', [])
             promise.then(_completeAnimation);
           }
           $animate.leave(spinner);
+          $rootScope.$broadcast('cfpLoadingBar:completed');
         }, 500);
       }
 

diff --git a/test/loading-bar-interceptor.coffee b/test/loading-bar-interceptor.coffee
@@ -376,8 +376,8 @@ describe 'loadingBarInterceptor Service', ->
     expect(startedEventCalled).toBe true
 
     cfpLoadingBar.complete()
-    expect(completedEventCalled).toBe true
     $timeout.flush()
+    expect(completedEventCalled).toBe true
 
   it 'should debounce the calls to start()', inject (cfpLoadingBar, $rootScope) ->
     startedEventCalled = 0