Merge branch 'v3.1.x'

This commit is contained in:
Torkel Ödegaard 2016-07-29 15:07:17 +02:00
commit 79138e211f

View File

@ -101,7 +101,8 @@ export class Profiler {
renderingCompleted(panelId, panelTimings) {
// add render counter to root scope
// used by phantomjs render.js to know when panel has rendered
this.$rootScope.panelsRendered = this.panelsRendered + 1;
this.panelsRendered = (this.panelsRendered || 0) + 1;
this.$rootScope.panelsRendered = this.panelsRendered;
if (this.enabled) {
panelTimings.renderEnd = new Date().getTime();