graph: disable zoom in non-timeseries modes (#9914)

This commit is contained in:
Alexander Zobnin 2017-11-20 12:06:34 +03:00 committed by Torkel Ödegaard
parent 66e4297816
commit f54547776d

View File

@ -688,7 +688,14 @@ function graphDirective($rootScope, timeSrv, popoverSrv, contextSrv) {
}
elem.bind("plotselected", function (event, ranges) {
if (panel.xaxis.mode !== 'time') {
// Skip if panel in histogram or series mode
plot.clearSelection();
return;
}
if ((ranges.ctrlKey || ranges.metaKey) && contextSrv.isEditor) {
// Add annotation
setTimeout(() => {
eventManager.updateTime(ranges.xaxis);
}, 100);
@ -703,6 +710,11 @@ function graphDirective($rootScope, timeSrv, popoverSrv, contextSrv) {
});
elem.bind("plotclick", function (event, pos, item) {
if (panel.xaxis.mode !== 'time') {
// Skip if panel in histogram or series mode
return;
}
if ((pos.ctrlKey || pos.metaKey) && contextSrv.isEditor) {
// Skip if range selected (added in "plotselected" event handler)
let isRangeSelection = pos.x !== pos.x1;