IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-30 20:54:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into alerting

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-07-29 15:07:47 +02:00
commit f9ddfb4337
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/core/profiler.ts
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();