fix(loading): potential race condition with showing and hiding loadin…

…g in same watch cycle
ionic-team · Aug 19, 2014 · 65aece2 · 65aece2
1 parent 840c014
commit 65aece2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/js/angular/service/loading.js b/js/angular/service/loading.js
@@ -158,8 +158,11 @@ function($ionicLoadingConfig, $document, $ionicTemplateLoader, $ionicBackdrop, $
               $ionicBackdrop.release();
               $ionicBackdrop.getElement().removeClass('backdrop-loading');
             }
-            self.element.removeClass('active');
-            $document[0].body.classList.remove('loading-active');
+            // wrapping in a timeout to make process asyncronous
+            $timeout(function(){
+              self.element.removeClass('active');
+              $document[0].body.classList.remove('loading-active');
+            }, 10);
             setTimeout(function() {
               !self.isShown && self.element.removeClass('visible');
             }, 200);

diff --git a/test/unit/angular/service/loading.unit.js b/test/unit/angular/service/loading.unit.js
@@ -89,6 +89,7 @@ describe('$ionicLoading service', function() {
       $timeout.flush();
       expect(angular.element(document.body).hasClass('loading-active')).toBe(true);
       loader.hide();
+      $timeout.flush();
       expect(angular.element(document.body).hasClass('loading-active')).toBe(false);
     }));