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

fix($ionicLoading): do not flicker when showing long loading messages

Browse Source 
Closes #1252
This commit is contained in:
Andrew Joslin
2014-05-14 10:48:43 -06:00
parent efa6184486
commit 90e7395e62
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -118,6 +118,7 @@ function($document, $ionicTemplateLoader, $ionicBackdrop, $timeout, $q, $log, $c
ionic.DomUtil.centerElementByMarginTwice(self.element[0]);
ionic.requestAnimationFrame(function() {
self.isShown && self.element.addClass('active');
ionic.DomUtil.centerElementByMarginTwice(self.element[0]);
});
}
});

5
js/utils/dom.js
View File

@@ -204,8 +204,11 @@
centerElementByMarginTwice: function(el) {
ionic.requestAnimationFrame(function() {
ionic.DomUtil.centerElementByMargin(el);
ionic.requestAnimationFrame(function() {
setTimeout(function() {
ionic.DomUtil.centerElementByMargin(el);
setTimeout(function() {
ionic.DomUtil.centerElementByMargin(el);
});
});
});
},

4
test/html/loading.html
View File

@@ -18,9 +18,9 @@
.controller('LoadingCtrl', function($scope, $ionicLoading) {
$scope.startLoading = function() {
$ionicLoading.show({
template: 'Getting current location...',
template: '<div>Connection problem.</div><br/><div>Please check your internet connection!</div>',
delay: 100,
duration: 500
duration: 3000
});
};
});