From f27b836d0ae15e7b49db1b53bbd567788d3ca205 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 19 May 2017 11:43:48 +0200 Subject: Disable context menu when popup is opened --- chimere/static/chimere/js/jquery.chimere.js | 10 ++++++++++ version.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js index d70b870..a47f792 100644 --- a/chimere/static/chimere/js/jquery.chimere.js +++ b/chimere/static/chimere/js/jquery.chimere.js @@ -452,6 +452,16 @@ function transformCoordToLonLat(coord) { default_items: false, items: contextmenu_items }); + + contextmenu.on('beforeopen', function(evt){ + // disable when popup is visible + if ($(".popover").is(":visible")) { + contextmenu.disable(); + } else { + contextmenu.enable(); + } + }); + settings.map.addControl(contextmenu); } diff --git a/version.py b/version.py index 0a1f59c..deb7ab4 100644 --- a/version.py +++ b/version.py @@ -1,4 +1,4 @@ -VERSION = (2, 99, 11) +VERSION = (2, 99, 12) def get_version(): -- cgit v1.2.3