From 212e98ccdb2f4671da54aab045db93da141ad1e5 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Thu, 19 Feb 2015 11:45:05 +0000 Subject: [PATCH] Fix in mobile theme not able to dismiss the context menu: - touch and open entries and swip (left/right) over any rows on the next match list will dismiss the context menu --- etemplate/js/et2_dataview_view_aoi.js | 4 +++- phpgwapi/js/egw_action/egw_action_popup.js | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/etemplate/js/et2_dataview_view_aoi.js b/etemplate/js/et2_dataview_view_aoi.js index 8cbefc99cf..b7a6621b9c 100644 --- a/etemplate/js/et2_dataview_view_aoi.js +++ b/etemplate/js/et2_dataview_view_aoi.js @@ -77,6 +77,8 @@ function et2_dataview_rowAOI(_node) case "left": case "right": state = 1; + // Hide context menu on swip actions + if(_egw_active_menu) _egw_active_menu.hide(); break; } } @@ -106,7 +108,7 @@ function et2_dataview_rowAOI(_node) click: function (event) { selectHandler(event); - }, + } }); } else { diff --git a/phpgwapi/js/egw_action/egw_action_popup.js b/phpgwapi/js/egw_action/egw_action_popup.js index 02cf677e90..f15b5f9f70 100644 --- a/phpgwapi/js/egw_action/egw_action_popup.js +++ b/phpgwapi/js/egw_action/egw_action_popup.js @@ -150,6 +150,9 @@ function egwPopupActionImplementation() e.stopPropagation(); e.cancelBubble = true; + // remove context menu if we are in mobile theme + // and intended to open the entry + if (_egw_active_menu && e.which == 1) _egw_active_menu.hide(); return false; };