fix(preloader): wait while amChart is loading
parent
61cb13de2f
commit
e6100f4b28
|
@ -14,7 +14,7 @@
|
||||||
link: function ($scope, elem) {
|
link: function ($scope, elem) {
|
||||||
var delay = 1000;
|
var delay = 1000;
|
||||||
|
|
||||||
if ($rootScope.$pageLoaded) {
|
if ($rootScope.$pageFinishedLoading) {
|
||||||
delay = 100;
|
delay = 100;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -11,11 +11,23 @@
|
||||||
/** @ngInject */
|
/** @ngInject */
|
||||||
function preloader($q) {
|
function preloader($q) {
|
||||||
return {
|
return {
|
||||||
load: function (src) {
|
loadImg: function (src) {
|
||||||
var d = $q.defer();
|
var d = $q.defer();
|
||||||
var img = new Image();
|
var img = new Image();
|
||||||
img.src = src;
|
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;
|
return d.promise;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,28 +12,19 @@
|
||||||
function themeRun($timeout, $rootScope, layoutSizes, layoutPaths, preloader, $q) {
|
function themeRun($timeout, $rootScope, layoutSizes, layoutPaths, preloader, $q) {
|
||||||
|
|
||||||
$q.all([
|
$q.all([
|
||||||
preloader.load(layoutPaths.images.root + 'blur-bg.jpg'),
|
preloader.loadImg(layoutPaths.images.root + 'blur-bg.jpg'),
|
||||||
preloader.load(layoutPaths.images.root + 'blur-bg-blurred.jpg')
|
preloader.loadImg(layoutPaths.images.root + 'blur-bg-blurred.jpg'),
|
||||||
|
preloader.loadAmCharts(),
|
||||||
|
$timeout(3000)
|
||||||
]).then(function(){
|
]).then(function(){
|
||||||
if(!$rootScope.$pageFinishedLoading){
|
|
||||||
$rootScope.$pageFinishedLoading = true;
|
$rootScope.$pageFinishedLoading = true;
|
||||||
}
|
|
||||||
if(!$rootScope.$pageLoaded){
|
|
||||||
$rootScope.$pageLoaded = true;
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
$timeout(function () {
|
$timeout(function () {
|
||||||
if(!$rootScope.$pageFinishedLoading){
|
if(!$rootScope.$pageFinishedLoading){
|
||||||
$rootScope.$pageFinishedLoading = true;
|
$rootScope.$pageFinishedLoading = true;
|
||||||
}
|
}
|
||||||
}, 2000);
|
}, 7000);
|
||||||
|
|
||||||
$timeout(function () {
|
|
||||||
if(!$rootScope.$pageLoaded){
|
|
||||||
$rootScope.$pageLoaded = true;
|
|
||||||
}
|
|
||||||
}, 4000);
|
|
||||||
|
|
||||||
$rootScope.$isMenuCollapsed = window.innerWidth <= layoutSizes.resWidthCollapseSidebar;
|
$rootScope.$isMenuCollapsed = window.innerWidth <= layoutSizes.resWidthCollapseSidebar;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue