IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-03 12:11:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: firefox can now create region annotations, fixes #9638

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-10-26 10:55:48 +02:00
parent b80b5e0317
commit 0c2aa91e61
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/vendor/flot/jquery.flot.js vendored
View File

@ -2962,8 +2962,11 @@ Licensed under the MIT license.
}
function onClick(e) {
triggerClickHoverEvent("plotclick", e,
function (s) { return s["clickable"] != false; });
if (plot.isSelecting) {
return;
}
triggerClickHoverEvent("plotclick", e, function (s) { return s["clickable"] != false; });
}
// trigger click or hover event (they send the same parameters

5
public/vendor/flot/jquery.flot.selection.js vendored
View File

@ -152,6 +152,10 @@ The plugin allso adds the following methods to the plot object:
plot.getPlaceholder().trigger("plotselecting", [ null ]);
}
setTimeout(function() {
plot.isSelecting = false;
}, 10);
return false;
}
@ -218,6 +222,7 @@ The plugin allso adds the following methods to the plot object:
setSelectionPos(selection.second, pos);
if (selectionIsSane()) {
plot.isSelecting = true;
selection.show = true;
plot.triggerRedrawOverlay();
}