feat(rendering): fixed issue with png rendering, recently introduced by profiler refactoring

torkelo · torkelo · commit 23aa614baff2 · 2016-06-17T08:49:11.000+02:00
diff --git a/public/app/core/profiler.ts b/public/app/core/profiler.ts
@@ -99,7 +99,9 @@ export class Profiler {
   }
 
   renderingCompleted(panelId, panelTimings) {
-    this.panelsRendered++;
+    // add render counter to root scope
+    // used by phantomjs render.js to know when panel has rendered
+    this.$rootScope.panelsRendered = this.panelsRendered++;
 
     if (this.enabled) {
       panelTimings.renderEnd = new Date().getTime();
diff --git a/vendor/phantomjs/render.js b/vendor/phantomjs/render.js
@@ -36,20 +36,18 @@
     // console.log('Loading a web page: ' + params.url + ' status: ' + status);
 
     function checkIsReady() {
-      var canvas = page.evaluate(function() {
+      var panelsRendered = page.evaluate(function() {
         if (!window.angular) { return false; }
         var body = window.angular.element(document.body);
         if (!body.injector) { return false; }
         if (!body.injector()) { return false; }
 
         var rootScope = body.injector().get('$rootScope');
         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 () {
           return document.getElementsByClassName("main-view")[0].getBoundingClientRect();
         });

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,9 @@ export class Profiler {`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`renderingCompleted(panelId, panelTimings) {`
`102`		`- this.panelsRendered++;`
	`102`	`+ // add render counter to root scope`
	`103`	`+ // used by phantomjs render.js to know when panel has rendered`
	`104`	`+ this.$rootScope.panelsRendered = this.panelsRendered++;`
`103`	`105`
`104`	`106`	`if (this.enabled) {`
`105`	`107`	`panelTimings.renderEnd = new Date().getTime();`