From 017901a3175566160f14bb977742eebdcd15338c Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Mon, 30 May 2022 16:07:26 +0200 Subject: [PATCH] Add allowScrolling for action popup and do not popup context menu when more than one touch is used --- api/js/egw_action/egw_action_popup.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/api/js/egw_action/egw_action_popup.js b/api/js/egw_action/egw_action_popup.js index 888bba7d69..74ebd60f66 100644 --- a/api/js/egw_action/egw_action_popup.js +++ b/api/js/egw_action/egw_action_popup.js @@ -291,8 +291,10 @@ export function egwPopupActionImplementation() let tap = new tapAndSwipe(_node, { // this threshold must be the same as the one set in et2_dataview_view_aoi tapHoldThreshold: 600, - tapAndHold: function(event) + allowScrolling: "both", + tapAndHold: function(event, fingercount) { + if (fingercount >= 2) return; // don't trigger contextmenu if sorting is happening if (document.querySelector('.sortable-drag')) return;