From 289f9a0644cf848458574308599002cdfac3e80f Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Wed, 27 May 2020 12:43:21 +0200 Subject: [PATCH] Give bound click handlers on widgets a chance to get executed --- api/js/egw_action/egw_action_popup.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/api/js/egw_action/egw_action_popup.js b/api/js/egw_action/egw_action_popup.js index 3b7870d676..3a5e9940af 100644 --- a/api/js/egw_action/egw_action_popup.js +++ b/api/js/egw_action/egw_action_popup.js @@ -168,8 +168,12 @@ function egwPopupActionImplementation() sel.removeAllRanges(); } - _callback.call(_context, "default", ai); - + if (!(_context.manager.getActionsByAttr('singleClick', true).length > 0 && + e.originalEvent.target.classList.contains('et2_clickable'))) + { + _callback.call(_context, "default", ai); + } + // Stop action from bubbling up to parents e.stopPropagation(); e.cancelBubble = true;