|
@@ -36,7 +36,7 @@
|
|
|
// console.log('Loading a web page: ' + params.url + ' status: ' + status);
|
|
// console.log('Loading a web page: ' + params.url + ' status: ' + status);
|
|
|
|
|
|
|
|
function checkIsReady() {
|
|
function checkIsReady() {
|
|
|
- var canvas = page.evaluate(function() {
|
|
|
|
|
|
|
+ var panelsRendered = page.evaluate(function() {
|
|
|
if (!window.angular) { return false; }
|
|
if (!window.angular) { return false; }
|
|
|
var body = window.angular.element(document.body);
|
|
var body = window.angular.element(document.body);
|
|
|
if (!body.injector) { return false; }
|
|
if (!body.injector) { return false; }
|
|
@@ -44,12 +44,10 @@
|
|
|
|
|
|
|
|
var rootScope = body.injector().get('$rootScope');
|
|
var rootScope = body.injector().get('$rootScope');
|
|
|
if (!rootScope) {return false;}
|
|
if (!rootScope) {return false;}
|
|
|
- if (!rootScope.performance) { return false; }
|
|
|
|
|
- var panelsToLoad = window.angular.element('div.panel').length;
|
|
|
|
|
- return rootScope.performance.panelsRendered >= panelsToLoad;
|
|
|
|
|
|
|
+ return rootScope.panelsRendered;
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
- if (canvas || tries === 1000) {
|
|
|
|
|
|
|
+ if (panelsRendered || tries === 1000) {
|
|
|
var bb = page.evaluate(function () {
|
|
var bb = page.evaluate(function () {
|
|
|
return document.getElementsByClassName("main-view")[0].getBoundingClientRect();
|
|
return document.getElementsByClassName("main-view")[0].getBoundingClientRect();
|
|
|
});
|
|
});
|