jinql
/
blur-admin
mirror of https://github.com/akveo/blur-admin
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(preloader): wait while amChart is loading

pull/3/head
alex 2016-03-05 17:31:07 +03:00
parent 61cb13de2f
commit e6100f4b28
3 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/theme/directives/zoomIn.js
View File

@ -14,7 +14,7 @@
link: function ($scope, elem) {
var delay = 1000;
if ($rootScope.$pageLoaded) {
if ($rootScope.$pageFinishedLoading) {
delay = 100;
}

16
src/app/theme/services/preloader.js
View File

@ -11,11 +11,23 @@
/** @ngInject */
function preloader($q) {
return {
load: function (src) {
loadImg: function (src) {
var d = $q.defer();
var img = new Image();
img.src = src;
img.onload = d.resolve;
img.onload = function(){
console.log("img " + src + " loaded");
d.resolve();
};
return d.promise;
},
loadAmCharts : function(){
var d = $q.defer();
console.log("amchart");
AmCharts.ready(function(){
console.log("amchart loaded");
d.resolve();
});
return d.promise;
}
}

19
src/app/theme/theme.run.js
View File

@ -12,28 +12,19 @@
function themeRun($timeout, $rootScope, layoutSizes, layoutPaths, preloader, $q) {
$q.all([
preloader.load(layoutPaths.images.root + 'blur-bg.jpg'),
preloader.load(layoutPaths.images.root + 'blur-bg-blurred.jpg')
preloader.loadImg(layoutPaths.images.root + 'blur-bg.jpg'),
preloader.loadImg(layoutPaths.images.root + 'blur-bg-blurred.jpg'),
preloader.loadAmCharts(),
$timeout(3000)
]).then(function(){
if(!$rootScope.$pageFinishedLoading){
$rootScope.$pageFinishedLoading = true;
}
if(!$rootScope.$pageLoaded){
$rootScope.$pageLoaded = true;
}
});
$timeout(function () {
if(!$rootScope.$pageFinishedLoading){
$rootScope.$pageFinishedLoading = true;
}
}, 2000);
$timeout(function () {
if(!$rootScope.$pageLoaded){
$rootScope.$pageLoaded = true;
}
}, 4000);
}, 7000);
$rootScope.$isMenuCollapsed = window.innerWidth <= layoutSizes.resWidthCollapseSidebar;
}