javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

amend(loading): simpler/more clean fix for #1914

Browse Source
This commit is contained in:
Perry Govier
2014-08-20 13:04:48 -05:00
parent 120f99ee79
commit 25ee658e8b
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
js/angular/service/loading.js vendored
View File

@@ -145,7 +145,7 @@ function($ionicLoadingConfig, $document, $ionicTemplateLoader, $ionicBackdrop, $
self.element.addClass('visible');
ionic.requestAnimationFrame(function() {
self.isShown && self.element.addClass('active');
$document[0].body.classList.add('loading-active');
self.isShown && $document[0].body.classList.add('loading-active');
});
}
});
@@ -158,11 +158,8 @@ function($ionicLoadingConfig, $document, $ionicTemplateLoader, $ionicBackdrop, $
$ionicBackdrop.release();
$ionicBackdrop.getElement().removeClass('backdrop-loading');
}
// wrapping in a timeout to make process asyncronous
$timeout(function(){
self.element.removeClass('active');
$document[0].body.classList.remove('loading-active');
}, 10);
self.element.removeClass('active');
$document[0].body.classList.remove('loading-active');
setTimeout(function() {
!self.isShown && self.element.removeClass('visible');
}, 200);

1
test/unit/angular/service/loading.unit.js
View File

@@ -89,7 +89,6 @@ 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);
}));