IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexander Zobnin 2017-11-20 12:06:34 +03:00 committed by Torkel Ödegaard
parent 66e4297816
commit f54547776d
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/app/plugins/panel/graph/graph.ts
View File

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