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 packaging_refactoring

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-04-10 17:45:01 +02:00
commit cc427b1307
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/app/panels/graph/graph.tooltip.js
View File

@ -82,14 +82,17 @@ function ($) {
};
elem.mouseleave(function () {
if (scope.panel.tooltip.shared || dashboard.sharedCrosshair) {
if (scope.panel.tooltip.shared) {
var plot = elem.data().plot;
if (plot) {
$tooltip.detach();
plot.unhighlight();
scope.appEvent('clearCrosshair');
}
}
if (dashboard.sharedCrosshair) {
scope.appEvent('clearCrosshair');
}
});
elem.bind("plothover", function (event, pos, item) {

2
public/app/partials/help_modal.html
View File

@ -2,7 +2,7 @@
<div class="gf-box-header">
<div class="gf-box-title">
<i class="fa fa-keyboard-o"></i>
Keyboard shutcuts
Keyboard shortcuts
</div>
<button class="gf-box-header-close-btn" ng-click="dismiss();">

3
public/app/plugins/datasource/influxdb/datasource.js
View File

@ -105,6 +105,9 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) {
case 'TAG_VALUES':
var tagValues = _.flatten(series.values);
return _.map(tagValues, function(tagValue) { return { text: tagValue, expandable: true }; });
default: // template values service does not pass in a a query type
var flattenedValues = _.flatten(series.values);
return _.map(flattenedValues, function(value) { return { text: value, expandable: true }; });
}
});
};