mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Merge branch 'create-annotations' of github.com:grafana/grafana into create-annotations
This commit is contained in:
commit
78f4bd2de9
@ -84,7 +84,8 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv) {
|
|||||||
let thisPanelEvent = event.panel.id === ctrl.panel.id;
|
let thisPanelEvent = event.panel.id === ctrl.panel.id;
|
||||||
|
|
||||||
// Select time for new annotation
|
// Select time for new annotation
|
||||||
if (ctrl.inAddAnnotationMode && thisPanelEvent) {
|
let createAnnotation = ctrl.inAddAnnotationMode || event.pos.ctrlKey || event.pos.metaKey;
|
||||||
|
if (createAnnotation && thisPanelEvent) {
|
||||||
let timeRange = {
|
let timeRange = {
|
||||||
from: event.pos.x,
|
from: event.pos.x,
|
||||||
to: null
|
to: null
|
||||||
@ -95,22 +96,6 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv) {
|
|||||||
}
|
}
|
||||||
}, scope);
|
}, scope);
|
||||||
|
|
||||||
// Add keybinding for Add Annotation mode
|
|
||||||
$(document).keydown(onCtrlKeyDown);
|
|
||||||
$(document).keyup(onCtrlKeyUp);
|
|
||||||
|
|
||||||
function onCtrlKeyDown(event) {
|
|
||||||
if (event.key === 'Control') {
|
|
||||||
ctrl.inAddAnnotationMode = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function onCtrlKeyUp(event) {
|
|
||||||
if (event.key === 'Control') {
|
|
||||||
ctrl.inAddAnnotationMode = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function getLegendHeight(panelHeight) {
|
function getLegendHeight(panelHeight) {
|
||||||
if (!panel.legend.show || panel.legend.rightSide) {
|
if (!panel.legend.show || panel.legend.rightSide) {
|
||||||
return 0;
|
return 0;
|
||||||
@ -671,8 +656,8 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
elem.bind("plotselected", function (event, ranges) {
|
elem.bind("plotselected", function (event, ranges) {
|
||||||
if (ctrl.inAddAnnotationMode) {
|
if (ctrl.inAddAnnotationMode || ranges.ctrlKey || ranges.metaKey) {
|
||||||
// Select time range for new annotation
|
// Create new annotation from time range
|
||||||
let timeRange = ranges.xaxis;
|
let timeRange = ranges.xaxis;
|
||||||
ctrl.showAddAnnotationModal(timeRange);
|
ctrl.showAddAnnotationModal(timeRange);
|
||||||
plot.clearSelection();
|
plot.clearSelection();
|
||||||
|
4
public/vendor/flot/jquery.flot.js
vendored
4
public/vendor/flot/jquery.flot.js
vendored
@ -2972,6 +2972,10 @@ Licensed under the MIT license.
|
|||||||
pos.pageX = event.pageX;
|
pos.pageX = event.pageX;
|
||||||
pos.pageY = event.pageY;
|
pos.pageY = event.pageY;
|
||||||
|
|
||||||
|
// Add ctrlKey and metaKey to event
|
||||||
|
pos.ctrlKey = event.ctrlKey;
|
||||||
|
pos.metaKey = event.metaKey;
|
||||||
|
|
||||||
var item = findNearbyItem(canvasX, canvasY, seriesFilter);
|
var item = findNearbyItem(canvasX, canvasY, seriesFilter);
|
||||||
|
|
||||||
if (item) {
|
if (item) {
|
||||||
|
8
public/vendor/flot/jquery.flot.selection.js
vendored
8
public/vendor/flot/jquery.flot.selection.js
vendored
@ -145,7 +145,7 @@ The plugin allso adds the following methods to the plot object:
|
|||||||
updateSelection(e);
|
updateSelection(e);
|
||||||
|
|
||||||
if (selectionIsSane())
|
if (selectionIsSane())
|
||||||
triggerSelectedEvent();
|
triggerSelectedEvent(e);
|
||||||
else {
|
else {
|
||||||
// this counts as a clear
|
// this counts as a clear
|
||||||
plot.getPlaceholder().trigger("plotunselected", [ ]);
|
plot.getPlaceholder().trigger("plotunselected", [ ]);
|
||||||
@ -180,9 +180,13 @@ The plugin allso adds the following methods to the plot object:
|
|||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
function triggerSelectedEvent() {
|
function triggerSelectedEvent(event) {
|
||||||
var r = getSelection();
|
var r = getSelection();
|
||||||
|
|
||||||
|
// Add ctrlKey and metaKey to event
|
||||||
|
r.ctrlKey = event.ctrlKey;
|
||||||
|
r.metaKey = event.metaKey;
|
||||||
|
|
||||||
plot.getPlaceholder().trigger("plotselected", [ r ]);
|
plot.getPlaceholder().trigger("plotselected", [ r ]);
|
||||||
|
|
||||||
// backwards-compat stuff, to be removed in future
|
// backwards-compat stuff, to be removed in future
|
||||||
|
Loading…
Reference in New Issue
Block a user