IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into valuepanel

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-10-15 15:48:09 -04:00
commit 123faa6f8e
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/components/settings.js
View File

@ -17,6 +17,7 @@ function (_, crypto) {
window_title_prefix : 'Grafana - ', window_title_prefix : 'Grafana - ',
panels : { panels : {
'graph': { path: 'panels/graph' }, 'graph': { path: 'panels/graph' },
'stats': { path: 'panels/stats' },
'text': { path: 'panels/text' } 'text': { path: 'panels/text' }
}, },
plugins : {}, plugins : {},

2
src/app/directives/grafanaGraph.js
View File

@ -207,6 +207,8 @@ function (angular, $, kbn, moment, _, GraphTooltip) {
} }
if (shouldDelayDraw(panel)) { if (shouldDelayDraw(panel)) {
// temp fix for legends on the side, need to render twice to get dimensions right
callPlot();
setTimeout(callPlot, 50); setTimeout(callPlot, 50);
legendSideLastValue = panel.legend.rightSide; legendSideLastValue = panel.legend.rightSide;
} }