diff --git a/public/app/plugins/panel/graph/graph_tooltip.js b/public/app/plugins/panel/graph/graph_tooltip.js
deleted file mode 100644
index 89197717e42..00000000000
--- a/public/app/plugins/panel/graph/graph_tooltip.js
+++ /dev/null
@@ -1,292 +0,0 @@
-define([
- 'jquery',
- 'app/core/core',
-],
-function ($, core) {
- 'use strict';
-
- var appEvents = core.appEvents;
-
- function GraphTooltip(elem, dashboard, scope, getSeriesFn) {
- var self = this;
- var ctrl = scope.ctrl;
- var panel = ctrl.panel;
-
- var $tooltip = $('
');
-
- this.destroy = function() {
- $tooltip.remove();
- };
-
- this.findHoverIndexFromDataPoints = function(posX, series, last) {
- var ps = series.datapoints.pointsize;
- var initial = last*ps;
- var len = series.datapoints.points.length;
- for (var j = initial; j < len; j += ps) {
- // Special case of a non stepped line, highlight the very last point just before a null point
- if ((!series.lines.steps && series.datapoints.points[initial] != null && series.datapoints.points[j] == null)
- //normal case
- || series.datapoints.points[j] > posX) {
- return Math.max(j - ps, 0)/ps;
- }
- }
- return j/ps - 1;
- };
-
- this.findHoverIndexFromData = function(posX, series) {
- var lower = 0;
- var upper = series.data.length - 1;
- var middle;
- while (true) {
- if (lower > upper) {
- return Math.max(upper, 0);
- }
- middle = Math.floor((lower + upper) / 2);
- if (series.data[middle][0] === posX) {
- return middle;
- } else if (series.data[middle][0] < posX) {
- lower = middle + 1;
- } else {
- upper = middle - 1;
- }
- }
- };
-
- this.renderAndShow = function(absoluteTime, innerHtml, pos, xMode) {
- if (xMode === 'time') {
- innerHtml = '
'+ absoluteTime + '
' + innerHtml;
- }
- $tooltip.html(innerHtml).place_tt(pos.pageX + 20, pos.pageY);
- };
-
- this.getMultiSeriesPlotHoverInfo = function(seriesList, pos) {
- var value, i, series, hoverIndex, hoverDistance, pointTime, yaxis;
- // 3 sub-arrays, 1st for hidden series, 2nd for left yaxis, 3rd for right yaxis.
- var results = [[],[],[]];
-
- //now we know the current X (j) position for X and Y values
- var last_value = 0; //needed for stacked values
-
- var minDistance, minTime;
-
- for (i = 0; i < seriesList.length; i++) {
- series = seriesList[i];
-
- if (!series.data.length || (panel.legend.hideEmpty && series.allIsNull)) {
- // Init value so that it does not brake series sorting
- results[0].push({ hidden: true, value: 0 });
- continue;
- }
-
- if (!series.data.length || (panel.legend.hideZero && series.allIsZero)) {
- // Init value so that it does not brake series sorting
- results[0].push({ hidden: true, value: 0 });
- continue;
- }
-
- hoverIndex = this.findHoverIndexFromData(pos.x, series);
- hoverDistance = pos.x - series.data[hoverIndex][0];
- pointTime = series.data[hoverIndex][0];
-
- // Take the closest point before the cursor, or if it does not exist, the closest after
- if (! minDistance
- || (hoverDistance >=0 && (hoverDistance < minDistance || minDistance < 0))
- || (hoverDistance < 0 && hoverDistance > minDistance)) {
- minDistance = hoverDistance;
- minTime = pointTime;
- }
-
- if (series.stack) {
- if (panel.tooltip.value_type === 'individual') {
- value = series.data[hoverIndex][1];
- } else if (!series.stack) {
- value = series.data[hoverIndex][1];
- } else {
- last_value += series.data[hoverIndex][1];
- value = last_value;
- }
- } else {
- value = series.data[hoverIndex][1];
- }
-
- // Highlighting multiple Points depending on the plot type
- if (series.lines.steps || series.stack) {
- // stacked and steppedLine plots can have series with different length.
- // Stacked series can increase its length on each new stacked serie if null points found,
- // to speed the index search we begin always on the last found hoverIndex.
- hoverIndex = this.findHoverIndexFromDataPoints(pos.x, series, hoverIndex);
- }
-
- // Be sure we have a yaxis so that it does not brake series sorting
- yaxis = 0;
- if (series.yaxis) {
- yaxis = series.yaxis.n;
- }
-
- results[yaxis].push({
- value: value,
- hoverIndex: hoverIndex,
- color: series.color,
- label: series.aliasEscaped,
- time: pointTime,
- distance: hoverDistance,
- index: i
- });
- }
-
- // Contat the 3 sub-arrays
- results = results[0].concat(results[1],results[2]);
-
- // Time of the point closer to pointer
- results.time = minTime;
-
- return results;
- };
-
- elem.mouseleave(function () {
- if (panel.tooltip.shared) {
- var plot = elem.data().plot;
- if (plot) {
- $tooltip.detach();
- plot.unhighlight();
- }
- }
- appEvents.emit('graph-hover-clear');
- });
-
- elem.bind("plothover", function (event, pos, item) {
- self.show(pos, item);
-
- // broadcast to other graph panels that we are hovering!
- pos.panelRelY = (pos.pageY - elem.offset().top) / elem.height();
- appEvents.emit('graph-hover', {pos: pos, panel: panel});
- });
-
- elem.bind("plotclick", function (event, pos, item) {
- appEvents.emit('graph-click', {pos: pos, panel: panel, item: item});
- });
-
- this.clear = function(plot) {
- $tooltip.detach();
- plot.clearCrosshair();
- plot.unhighlight();
- };
-
- this.show = function(pos, item) {
- var plot = elem.data().plot;
- var plotData = plot.getData();
- var xAxes = plot.getXAxes();
- var xMode = xAxes[0].options.mode;
- var seriesList = getSeriesFn();
- var allSeriesMode = panel.tooltip.shared;
- var group, value, absoluteTime, hoverInfo, i, series, seriesHtml, tooltipFormat;
-
- // if panelRelY is defined another panel wants us to show a tooltip
- // get pageX from position on x axis and pageY from relative position in original panel
- if (pos.panelRelY) {
- var pointOffset = plot.pointOffset({x: pos.x});
- if (Number.isNaN(pointOffset.left) || pointOffset.left < 0 || pointOffset.left > elem.width()) {
- self.clear(plot);
- return;
- }
- pos.pageX = elem.offset().left + pointOffset.left;
- pos.pageY = elem.offset().top + elem.height() * pos.panelRelY;
- var isVisible = pos.pageY >= $(window).scrollTop() && pos.pageY <= $(window).innerHeight() + $(window).scrollTop();
- if (!isVisible) {
- self.clear(plot);
- return;
- }
- plot.setCrosshair(pos);
- allSeriesMode = true;
-
- if (dashboard.sharedCrosshairModeOnly()) {
- // if only crosshair mode we are done
- return;
- }
- }
-
- if (seriesList.length === 0) {
- return;
- }
-
- if (seriesList[0].hasMsResolution) {
- tooltipFormat = 'YYYY-MM-DD HH:mm:ss.SSS';
- } else {
- tooltipFormat = 'YYYY-MM-DD HH:mm:ss';
- }
-
- if (allSeriesMode) {
- plot.unhighlight();
-
- var seriesHoverInfo = self.getMultiSeriesPlotHoverInfo(plotData, pos);
-
- seriesHtml = '';
-
- absoluteTime = dashboard.formatDate(seriesHoverInfo.time, tooltipFormat);
-
- // Dynamically reorder the hovercard for the current time point if the
- // option is enabled.
- if (panel.tooltip.sort === 2) {
- seriesHoverInfo.sort(function(a, b) {
- return b.value - a.value;
- });
- } else if (panel.tooltip.sort === 1) {
- seriesHoverInfo.sort(function(a, b) {
- return a.value - b.value;
- });
- }
-
- for (i = 0; i < seriesHoverInfo.length; i++) {
- hoverInfo = seriesHoverInfo[i];
-
- if (hoverInfo.hidden) {
- continue;
- }
-
- var highlightClass = '';
- if (item && hoverInfo.index === item.seriesIndex) {
- highlightClass = 'graph-tooltip-list-item--highlight';
- }
-
- series = seriesList[hoverInfo.index];
-
- value = series.formatValue(hoverInfo.value);
-
- seriesHtml += '
';
- plot.highlight(hoverInfo.index, hoverInfo.hoverIndex);
- }
-
- self.renderAndShow(absoluteTime, seriesHtml, pos, xMode);
- }
- // single series tooltip
- else if (item) {
- series = seriesList[item.seriesIndex];
- group = '
';
- group += ' ' + series.aliasEscaped + ':
';
-
- if (panel.stack && panel.tooltip.value_type === 'individual') {
- value = item.datapoint[1] - item.datapoint[2];
- }
- else {
- value = item.datapoint[1];
- }
-
- value = series.formatValue(value);
-
- absoluteTime = dashboard.formatDate(item.datapoint[0], tooltipFormat);
-
- group += '
' + value + '
';
-
- self.renderAndShow(absoluteTime, group, pos, xMode);
- }
- // no hit
- else {
- $tooltip.detach();
- }
- };
- }
-
- return GraphTooltip;
-});
diff --git a/public/app/plugins/panel/graph/graph_tooltip.ts b/public/app/plugins/panel/graph/graph_tooltip.ts
new file mode 100644
index 00000000000..846a165bbaf
--- /dev/null
+++ b/public/app/plugins/panel/graph/graph_tooltip.ts
@@ -0,0 +1,290 @@
+import $ from 'jquery';
+import { appEvents } from 'app/core/core';
+
+//var appEvents = appEvents;
+
+export default function GraphTooltip(elem, dashboard, scope, getSeriesFn) {
+ let self = this;
+ let ctrl = scope.ctrl;
+ let panel = ctrl.panel;
+
+ let $tooltip = $('
');
+
+ this.destroy = function() {
+ $tooltip.remove();
+ };
+
+ this.findHoverIndexFromDataPoints = function(posX, series, last) {
+ var ps = series.datapoints.pointsize;
+ var initial = last * ps;
+ var len = series.datapoints.points.length;
+ for (var j = initial; j < len; j += ps) {
+ // Special case of a non stepped line, highlight the very last point just before a null point
+ if (
+ (!series.lines.steps && series.datapoints.points[initial] != null && series.datapoints.points[j] == null) ||
+ //normal case
+ series.datapoints.points[j] > posX
+ ) {
+ return Math.max(j - ps, 0) / ps;
+ }
+ }
+ return j / ps - 1;
+ };
+
+ this.findHoverIndexFromData = function(posX, series) {
+ var lower = 0;
+ var upper = series.data.length - 1;
+ var middle;
+ while (true) {
+ if (lower > upper) {
+ return Math.max(upper, 0);
+ }
+ middle = Math.floor((lower + upper) / 2);
+ if (series.data[middle][0] === posX) {
+ return middle;
+ } else if (series.data[middle][0] < posX) {
+ lower = middle + 1;
+ } else {
+ upper = middle - 1;
+ }
+ }
+ };
+
+ this.renderAndShow = function(absoluteTime, innerHtml, pos, xMode) {
+ if (xMode === 'time') {
+ innerHtml = '
' + absoluteTime + '
' + innerHtml;
+ }
+ $tooltip.html(innerHtml).place_tt(pos.pageX + 20, pos.pageY);
+ };
+
+ this.getMultiSeriesPlotHoverInfo = function(seriesList, pos) {
+ var value, i, series, hoverIndex, hoverDistance, pointTime, yaxis;
+ // 3 sub-arrays, 1st for hidden series, 2nd for left yaxis, 3rd for right yaxis.
+ var results: any = [[], [], []];
+
+ //now we know the current X (j) position for X and Y values
+ var last_value = 0; //needed for stacked values
+
+ var minDistance, minTime;
+
+ for (i = 0; i < seriesList.length; i++) {
+ series = seriesList[i];
+
+ if (!series.data.length || (panel.legend.hideEmpty && series.allIsNull)) {
+ // Init value so that it does not brake series sorting
+ results[0].push({ hidden: true, value: 0 });
+ continue;
+ }
+
+ if (!series.data.length || (panel.legend.hideZero && series.allIsZero)) {
+ // Init value so that it does not brake series sorting
+ results[0].push({ hidden: true, value: 0 });
+ continue;
+ }
+
+ hoverIndex = this.findHoverIndexFromData(pos.x, series);
+ hoverDistance = pos.x - series.data[hoverIndex][0];
+ pointTime = series.data[hoverIndex][0];
+
+ // Take the closest point before the cursor, or if it does not exist, the closest after
+ if (
+ !minDistance ||
+ (hoverDistance >= 0 && (hoverDistance < minDistance || minDistance < 0)) ||
+ (hoverDistance < 0 && hoverDistance > minDistance)
+ ) {
+ minDistance = hoverDistance;
+ minTime = pointTime;
+ }
+
+ if (series.stack) {
+ if (panel.tooltip.value_type === 'individual') {
+ value = series.data[hoverIndex][1];
+ } else if (!series.stack) {
+ value = series.data[hoverIndex][1];
+ } else {
+ last_value += series.data[hoverIndex][1];
+ value = last_value;
+ }
+ } else {
+ value = series.data[hoverIndex][1];
+ }
+
+ // Highlighting multiple Points depending on the plot type
+ if (series.lines.steps || series.stack) {
+ // stacked and steppedLine plots can have series with different length.
+ // Stacked series can increase its length on each new stacked serie if null points found,
+ // to speed the index search we begin always on the last found hoverIndex.
+ hoverIndex = this.findHoverIndexFromDataPoints(pos.x, series, hoverIndex);
+ }
+
+ // Be sure we have a yaxis so that it does not brake series sorting
+ yaxis = 0;
+ if (series.yaxis) {
+ yaxis = series.yaxis.n;
+ }
+
+ results[yaxis].push({
+ value: value,
+ hoverIndex: hoverIndex,
+ color: series.color,
+ label: series.aliasEscaped,
+ time: pointTime,
+ distance: hoverDistance,
+ index: i,
+ });
+ }
+
+ // Contat the 3 sub-arrays
+ results = results[0].concat(results[1], results[2]);
+
+ // Time of the point closer to pointer
+ results.time = minTime;
+
+ return results;
+ };
+
+ elem.mouseleave(function() {
+ if (panel.tooltip.shared) {
+ var plot = elem.data().plot;
+ if (plot) {
+ $tooltip.detach();
+ plot.unhighlight();
+ }
+ }
+ appEvents.emit('graph-hover-clear');
+ });
+
+ elem.bind('plothover', function(event, pos, item) {
+ self.show(pos, item);
+
+ // broadcast to other graph panels that we are hovering!
+ pos.panelRelY = (pos.pageY - elem.offset().top) / elem.height();
+ appEvents.emit('graph-hover', { pos: pos, panel: panel });
+ });
+
+ elem.bind('plotclick', function(event, pos, item) {
+ appEvents.emit('graph-click', { pos: pos, panel: panel, item: item });
+ });
+
+ this.clear = function(plot) {
+ $tooltip.detach();
+ plot.clearCrosshair();
+ plot.unhighlight();
+ };
+
+ this.show = function(pos, item) {
+ var plot = elem.data().plot;
+ var plotData = plot.getData();
+ var xAxes = plot.getXAxes();
+ var xMode = xAxes[0].options.mode;
+ var seriesList = getSeriesFn();
+ var allSeriesMode = panel.tooltip.shared;
+ var group, value, absoluteTime, hoverInfo, i, series, seriesHtml, tooltipFormat;
+
+ // if panelRelY is defined another panel wants us to show a tooltip
+ // get pageX from position on x axis and pageY from relative position in original panel
+ if (pos.panelRelY) {
+ var pointOffset = plot.pointOffset({ x: pos.x });
+ if (Number.isNaN(pointOffset.left) || pointOffset.left < 0 || pointOffset.left > elem.width()) {
+ self.clear(plot);
+ return;
+ }
+ pos.pageX = elem.offset().left + pointOffset.left;
+ pos.pageY = elem.offset().top + elem.height() * pos.panelRelY;
+ var isVisible =
+ pos.pageY >= $(window).scrollTop() && pos.pageY <= $(window).innerHeight() + $(window).scrollTop();
+ if (!isVisible) {
+ self.clear(plot);
+ return;
+ }
+ plot.setCrosshair(pos);
+ allSeriesMode = true;
+
+ if (dashboard.sharedCrosshairModeOnly()) {
+ // if only crosshair mode we are done
+ return;
+ }
+ }
+
+ if (seriesList.length === 0) {
+ return;
+ }
+
+ if (seriesList[0].hasMsResolution) {
+ tooltipFormat = 'YYYY-MM-DD HH:mm:ss.SSS';
+ } else {
+ tooltipFormat = 'YYYY-MM-DD HH:mm:ss';
+ }
+
+ if (allSeriesMode) {
+ plot.unhighlight();
+
+ var seriesHoverInfo = self.getMultiSeriesPlotHoverInfo(plotData, pos);
+
+ seriesHtml = '';
+
+ absoluteTime = dashboard.formatDate(seriesHoverInfo.time, tooltipFormat);
+
+ // Dynamically reorder the hovercard for the current time point if the
+ // option is enabled.
+ if (panel.tooltip.sort === 2) {
+ seriesHoverInfo.sort(function(a, b) {
+ return b.value - a.value;
+ });
+ } else if (panel.tooltip.sort === 1) {
+ seriesHoverInfo.sort(function(a, b) {
+ return a.value - b.value;
+ });
+ }
+
+ for (i = 0; i < seriesHoverInfo.length; i++) {
+ hoverInfo = seriesHoverInfo[i];
+
+ if (hoverInfo.hidden) {
+ continue;
+ }
+
+ var highlightClass = '';
+ if (item && hoverInfo.index === item.seriesIndex) {
+ highlightClass = 'graph-tooltip-list-item--highlight';
+ }
+
+ series = seriesList[hoverInfo.index];
+
+ value = series.formatValue(hoverInfo.value);
+
+ seriesHtml +=
+ '
';
+ plot.highlight(hoverInfo.index, hoverInfo.hoverIndex);
+ }
+
+ self.renderAndShow(absoluteTime, seriesHtml, pos, xMode);
+ } else if (item) {
+ // single series tooltip
+ series = seriesList[item.seriesIndex];
+ group = '