Просмотр исходного кода

Graph: fix for series tooltip when one series is hidden/disabled, #1199

Torkel Ödegaard 11 лет назад
Родитель
Сommit
69d56b8ed7
3 измененных файлов с 8 добавлено и 4 удалено
  1. 5 0
      CHANGELOG.md
  2. 3 3
      src/app/panels/graph/graph.tooltip.js
  3. 0 1
      src/vendor/angular/angular-dragdrop.js

+ 5 - 0
CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.9.1 (unreleased)
+
+**Fixes**
+- [Issue #1199](https://github.com/grafana/grafana/issues/1199). Graph: fix for series tooltip when one series is hidden/disabled
+
 # 1.9.0 (2014-12-02)
 
 **Enhancements**

+ 3 - 3
src/app/panels/graph/graph.tooltip.js

@@ -99,9 +99,9 @@ function ($) {
             lasthoverIndex = hoverIndex;
           }
 
-          results.push({ value: value, hoverIndex: newhoverIndex });
+          results.push({ value: value, hoverIndex: newhoverIndex, series: series });
         } else {
-          results.push({ value: value, hoverIndex: hoverIndex });
+          results.push({ value: value, hoverIndex: hoverIndex, series: series });
         }
       }
 
@@ -149,8 +149,8 @@ function ($) {
         timestamp = dashboard.formatDate(seriesHoverInfo.time);
 
         for (i = 0; i < seriesHoverInfo.length; i++) {
-          series = seriesList[i];
           hoverInfo = seriesHoverInfo[i];
+          series = hoverInfo.series;
           value = series.formatValue(hoverInfo.value);
 
           seriesHtml += '<div class="graph-tooltip-list-item"><div class="graph-tooltip-series-name">';

+ 0 - 1
src/vendor/angular/angular-dragdrop.js

@@ -39,7 +39,6 @@ angular.module("ang-drag-drop",[])
                 element.attr("draggable", false);
 
                 attrs.$observe("uiDraggable", function (newValue) {
-                  console.log(newValue);
                     if(newValue){
                         element.attr("draggable", newValue);
                     }