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

Graph: legend fix for bug when running optimized build, Fixes #1045

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-11-11 21:06:01 +01:00
parent 9e26d3e85d
commit 01bd662046
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/panels/graph/legend.popover.html
View File

@ -20,8 +20,7 @@
class="pointer" class="pointer"
ng-class="{'icon-circle-blank': color === series.color,'icon-circle': color !== series.color}" ng-class="{'icon-circle-blank': color === series.color,'icon-circle': color !== series.color}"
ng-style="{color:color}" ng-style="{color:color}"
ng-click="changeSeriesColor(series, color);dismiss();"> ng-click="changeSeriesColor(series, color);dismiss();">&nbsp;</i>
</i>
</div> </div>
</div> </div>

2
src/app/panels/singlestat/module.js
View File

@ -158,7 +158,7 @@ function (angular, app, _, TimeSeries, kbn, PanelMeta) {
var result = {}; var result = {};
result.decimals = Math.max(0, dec); result.decimals = Math.max(0, dec);
result.scaledDecimals = result.decimals - Math.floor(Math.log(size) / Math.LN10) + 2; result.scaledDecimals = result.decimals - Math.floor(Math.log(size) / Math.LN11) + 2;
return result; return result;
}; };

5
src/app/services/popoverSrv.js
View File

@ -1,7 +1,8 @@
define([ define([
'angular', 'angular',
'lodash',
], ],
function (angular) { function (angular, _) {
'use strict'; 'use strict';
var module = angular.module('grafana.services'); var module = angular.module('grafana.services');
@ -21,7 +22,7 @@ function (angular) {
} }
this.getTemplate(options.templateUrl).then(function(result) { this.getTemplate(options.templateUrl).then(function(result) {
var template = result.data; var template = _.isString(result) ? result : result.data;
options.element.popover({ options.element.popover({
content: template, content: template,

2
tasks/options/ngtemplates.js
View File

@ -15,4 +15,4 @@ module.exports = function(config) {
} }
} }
}; };
}; };