');
- this.destroy = function() {
+ this.destroy = () => {
$tooltip.remove();
};
- this.findHoverIndexFromDataPoints = function(posX, series, last) {
+ this.findHoverIndexFromDataPoints = (posX, series, last) => {
const ps = series.datapoints.pointsize;
const initial = last * ps;
const len = series.datapoints.points.length;
@@ -30,7 +30,7 @@ export default function GraphTooltip(this: any, elem, dashboard, scope, getSerie
return j / ps - 1;
};
- this.findHoverIndexFromData = function(posX, series) {
+ this.findHoverIndexFromData = (posX, series) => {
let lower = 0;
let upper = series.data.length - 1;
let middle;
@@ -49,7 +49,7 @@ export default function GraphTooltip(this: any, elem, dashboard, scope, getSerie
}
};
- this.renderAndShow = function(absoluteTime, innerHtml, pos, xMode) {
+ this.renderAndShow = (absoluteTime, innerHtml, pos, xMode) => {
if (xMode === 'time') {
innerHtml = '
' + absoluteTime + '
' + innerHtml;
}
@@ -147,7 +147,7 @@ export default function GraphTooltip(this: any, elem, dashboard, scope, getSerie
return results;
};
- elem.mouseleave(function() {
+ elem.mouseleave(() => {
if (panel.tooltip.shared) {
const plot = elem.data().plot;
if (plot) {
@@ -158,7 +158,7 @@ export default function GraphTooltip(this: any, elem, dashboard, scope, getSerie
appEvents.emit('graph-hover-clear');
});
- elem.bind('plothover', function(event, pos, item) {
+ elem.bind('plothover', (event, pos, item) => {
self.show(pos, item);
// broadcast to other graph panels that we are hovering!
@@ -166,17 +166,17 @@ export default function GraphTooltip(this: any, elem, dashboard, scope, getSerie
appEvents.emit('graph-hover', { pos: pos, panel: panel });
});
- elem.bind('plotclick', function(event, pos, item) {
+ elem.bind('plotclick', (event, pos, item) => {
appEvents.emit('graph-click', { pos: pos, panel: panel, item: item });
});
- this.clear = function(plot) {
+ this.clear = plot => {
$tooltip.detach();
plot.clearCrosshair();
plot.unhighlight();
};
- this.show = function(pos, item) {
+ this.show = (pos, item) => {
const plot = elem.data().plot;
const plotData = plot.getData();
const xAxes = plot.getXAxes();
@@ -232,11 +232,11 @@ export default function GraphTooltip(this: any, elem, dashboard, scope, getSerie
// Dynamically reorder the hovercard for the current time point if the
// option is enabled.
if (panel.tooltip.sort === 2) {
- seriesHoverInfo.sort(function(a, b) {
+ seriesHoverInfo.sort((a, b) => {
return b.value - a.value;
});
} else if (panel.tooltip.sort === 1) {
- seriesHoverInfo.sort(function(a, b) {
+ seriesHoverInfo.sort((a, b) => {
return a.value - b.value;
});
}
diff --git a/public/app/plugins/panel/graph/jquery.flot.events.ts b/public/app/plugins/panel/graph/jquery.flot.events.ts
index f0600bdcd40..ed2b2dab92a 100644
--- a/public/app/plugins/panel/graph/jquery.flot.events.ts
+++ b/public/app/plugins/panel/graph/jquery.flot.events.ts
@@ -12,11 +12,11 @@ export function createAnnotationToolip(element, event, plot) {
injector.invoke([
'$compile',
'$rootScope',
- function($compile, $rootScope) {
+ ($compile, $rootScope) => {
const eventManager = plot.getOptions().events.manager;
const tmpScope = $rootScope.$new(true);
tmpScope.event = event;
- tmpScope.onEdit = function() {
+ tmpScope.onEdit = () => {
eventManager.editEvent(event);
};
@@ -38,8 +38,8 @@ export function createAnnotationToolip(element, event, plot) {
drop.open();
- drop.on('close', function() {
- setTimeout(function() {
+ drop.on('close', () => {
+ setTimeout(() => {
drop.destroy();
});
});
@@ -65,7 +65,7 @@ export function createEditPopover(element, event, plot) {
markerElementToAttachTo = element;
// wait for element to be attached and positioned
- setTimeout(function() {
+ setTimeout(() => {
const injector = angular.element(document).injector();
const content = document.createElement('div');
content.innerHTML = '
';
@@ -73,13 +73,13 @@ export function createEditPopover(element, event, plot) {
injector.invoke([
'$compile',
'$rootScope',
- function($compile, $rootScope) {
+ ($compile, $rootScope) => {
const scope = $rootScope.$new(true);
let drop;
scope.event = event;
scope.panelCtrl = eventManager.panelCtrl;
- scope.close = function() {
+ scope.close = () => {
drop.close();
};
@@ -100,9 +100,9 @@ export function createEditPopover(element, event, plot) {
drop.open();
eventManager.editorOpened();
- drop.on('close', function() {
+ drop.on('close', () => {
// need timeout here in order call drop.destroy
- setTimeout(function() {
+ setTimeout(() => {
eventManager.editorClosed();
scope.$destroy();
drop.destroy();
@@ -428,7 +428,7 @@ export class EventMarkers {
createEditPopover(marker, event.editModel, that._plot);
}
- const mouseleave = function() {
+ const mouseleave = () => {
that._plot.clearSelection();
};
@@ -443,10 +443,10 @@ export class EventMarkers {
function drawFunc(obj) {
obj.show();
},
- function(obj) {
+ obj => {
obj.remove();
},
- function(obj, position) {
+ (obj, position) => {
obj.css({
top: position.top,
left: position.left,
@@ -549,7 +549,7 @@ export class EventMarkers {
createEditPopover(region, event.editModel, that._plot);
}
- const mouseleave = function() {
+ const mouseleave = () => {
that._plot.clearSelection();
};
@@ -563,10 +563,10 @@ export class EventMarkers {
function drawFunc(obj) {
obj.show();
},
- function(obj) {
+ obj => {
obj.remove();
},
- function(obj, position) {
+ (obj, position) => {
obj.css({
top: position.top,
left: position.left,
@@ -601,11 +601,11 @@ export function init(this: any, plot) {
const that = this;
const eventMarkers = new EventMarkers(plot);
- plot.getEvents = function() {
+ plot.getEvents = () => {
return eventMarkers._events;
};
- plot.hideEvents = function() {
+ plot.hideEvents = () => {
$.each(eventMarkers._events, (index, event) => {
event
.visual()
@@ -614,7 +614,7 @@ export function init(this: any, plot) {
});
};
- plot.showEvents = function() {
+ plot.showEvents = () => {
plot.hideEvents();
$.each(eventMarkers._events, (index, event) => {
event.hide();
@@ -624,20 +624,20 @@ export function init(this: any, plot) {
};
// change events on an existing plot
- plot.setEvents = function(events) {
+ plot.setEvents = events => {
if (eventMarkers.eventsEnabled) {
eventMarkers.setupEvents(events);
}
};
- plot.hooks.processOptions.push(function(plot, options) {
+ plot.hooks.processOptions.push((plot, options) => {
// enable the plugin
if (options.events.data != null) {
eventMarkers.eventsEnabled = true;
}
});
- plot.hooks.draw.push(function(plot) {
+ plot.hooks.draw.push(plot => {
const options = plot.getOptions();
if (eventMarkers.eventsEnabled) {
diff --git a/public/app/plugins/panel/graph/legend.ts b/public/app/plugins/panel/graph/legend.ts
index ef5da3e296a..cf317389941 100644
--- a/public/app/plugins/panel/graph/legend.ts
+++ b/public/app/plugins/panel/graph/legend.ts
@@ -5,9 +5,9 @@ import baron from 'baron';
const module = angular.module('grafana.directives');
-module.directive('graphLegend', function(popoverSrv, $timeout) {
+module.directive('graphLegend', (popoverSrv, $timeout) => {
return {
- link: function(scope, elem) {
+ link: (scope, elem) => {
let firstRender = true;
const ctrl = scope.ctrl;
const panel = ctrl.panel;
@@ -18,7 +18,7 @@ module.directive('graphLegend', function(popoverSrv, $timeout) {
const legendRightDefaultWidth = 10;
const legendElem = elem.parent();
- scope.$on('$destroy', function() {
+ scope.$on('$destroy', () => {
destroyScrollbar();
});
@@ -44,7 +44,7 @@ module.directive('graphLegend', function(popoverSrv, $timeout) {
const index = getSeriesIndexForElement(el);
const series = seriesList[index];
- $timeout(function() {
+ $timeout(() => {
popoverSrv.show({
element: el[0],
position: 'bottom left',
@@ -55,10 +55,10 @@ module.directive('graphLegend', function(popoverSrv, $timeout) {
openOn: 'hover',
model: {
series: series,
- toggleAxis: function() {
+ toggleAxis: () => {
ctrl.toggleAxis(series);
},
- colorSelected: function(color) {
+ colorSelected: color => {
ctrl.changeSeriesColor(series, color);
},
},
@@ -154,7 +154,7 @@ module.directive('graphLegend', function(popoverSrv, $timeout) {
}
if (panel.legend.sort) {
- seriesList = _.sortBy(seriesList, function(series) {
+ seriesList = _.sortBy(seriesList, series => {
let sort = series.stats[panel.legend.sort];
if (sort === null) {
sort = -Infinity;
diff --git a/public/app/plugins/panel/graph/series_overrides_ctrl.ts b/public/app/plugins/panel/graph/series_overrides_ctrl.ts
index 15e67f3083a..deb7bd8ba61 100644
--- a/public/app/plugins/panel/graph/series_overrides_ctrl.ts
+++ b/public/app/plugins/panel/graph/series_overrides_ctrl.ts
@@ -7,13 +7,13 @@ export function SeriesOverridesCtrl($scope, $element, popoverSrv) {
$scope.currentOverrides = [];
$scope.override = $scope.override || {};
- $scope.addOverrideOption = function(name, propertyName, values) {
+ $scope.addOverrideOption = (name, propertyName, values) => {
const option = {
text: name,
propertyName: propertyName,
index: $scope.overrideMenu.lenght,
values: values,
- submenu: _.map(values, function(value) {
+ submenu: _.map(values, value => {
return { text: String(value), value: value };
}),
};
@@ -21,7 +21,7 @@ export function SeriesOverridesCtrl($scope, $element, popoverSrv) {
$scope.overrideMenu.push(option);
};
- $scope.setOverride = function(item, subItem) {
+ $scope.setOverride = (item, subItem) => {
// handle color overrides
if (item.propertyName === 'color') {
$scope.openColorSelector($scope.override['color']);
@@ -41,13 +41,13 @@ export function SeriesOverridesCtrl($scope, $element, popoverSrv) {
$scope.ctrl.render();
};
- $scope.colorSelected = function(color) {
+ $scope.colorSelected = color => {
$scope.override['color'] = color;
$scope.updateCurrentOverrides();
$scope.ctrl.render();
};
- $scope.openColorSelector = function(color) {
+ $scope.openColorSelector = color => {
const fakeSeries = { color: color };
popoverSrv.show({
element: $element.find('.dropdown')[0],
@@ -59,27 +59,27 @@ export function SeriesOverridesCtrl($scope, $element, popoverSrv) {
colorSelected: $scope.colorSelected,
series: fakeSeries,
},
- onClose: function() {
+ onClose: () => {
$scope.ctrl.render();
},
});
};
- $scope.removeOverride = function(option) {
+ $scope.removeOverride = option => {
delete $scope.override[option.propertyName];
$scope.updateCurrentOverrides();
$scope.ctrl.refresh();
};
- $scope.getSeriesNames = function() {
- return _.map($scope.ctrl.seriesList, function(series) {
+ $scope.getSeriesNames = () => {
+ return _.map($scope.ctrl.seriesList, series => {
return series.alias;
});
};
- $scope.updateCurrentOverrides = function() {
+ $scope.updateCurrentOverrides = () => {
$scope.currentOverrides = [];
- _.each($scope.overrideMenu, function(option) {
+ _.each($scope.overrideMenu, option => {
const value = $scope.override[option.propertyName];
if (_.isUndefined(value)) {
return;
diff --git a/public/app/plugins/panel/graph/threshold_manager.ts b/public/app/plugins/panel/graph/threshold_manager.ts
index 0a35d282b5e..46ec9e61854 100644
--- a/public/app/plugins/panel/graph/threshold_manager.ts
+++ b/public/app/plugins/panel/graph/threshold_manager.ts
@@ -61,7 +61,7 @@ export class ThresholdManager {
handleElem.off('mouseleave', dragging);
// trigger digest and render
- panelCtrl.$scope.$apply(function() {
+ panelCtrl.$scope.$apply(() => {
panelCtrl.render();
panelCtrl.events.emit('threshold-changed', {
threshold: model,
diff --git a/public/app/plugins/panel/graph/thresholds_form.ts b/public/app/plugins/panel/graph/thresholds_form.ts
index fa3f3c7d114..5f1edb8aa9a 100644
--- a/public/app/plugins/panel/graph/thresholds_form.ts
+++ b/public/app/plugins/panel/graph/thresholds_form.ts
@@ -138,7 +138,7 @@ const template = `