[Libreoffice-commits] online.git: loleaflet/src

[Henry Castro (via logerrit)]

 loleaflet/src/map/handler/Map.TouchGesture.js |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit e9f376132244efc2823293339dd86817f467067b
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Fri Jun 28 13:22:49 2019 -0400
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Tue Aug 20 16:18:51 2019 +0200

    loleaflet: mobile: avoid long press in graphic handler markers
    
    Change-Id: I4d526beb0114fae3298906aaf1a774d8915bf6eb
    Reviewed-on: https://gerrit.libreoffice.org/77830
    Reviewed-by: Henry Castro <hcastro at collabora.com>
    Tested-by: Henry Castro <hcastro at collabora.com>

diff --git a/loleaflet/src/map/handler/Map.TouchGesture.js b/loleaflet/src/map/handler/Map.TouchGesture.js
index db4f433aa..899cd6c2d 100644
--- a/loleaflet/src/map/handler/Map.TouchGesture.js
+++ b/loleaflet/src/map/handler/Map.TouchGesture.js
@@ -64,8 +64,6 @@ L.Map.TouchGesture = L.Handler.extend({
 			L.DomEvent.on(document, L.Draggable.END[events], this._onDocUp, this);
 		}
 
-		L.DomEvent.on(document, 'contextmenu', L.DomEvent.preventDefault);
-
 		/// $.contextMenu does not support touch events so,
 		/// attach 'touchend' menu clicks event handler
 		if (this._hammer.input instanceof Hammer.TouchInput) {
@@ -165,6 +163,10 @@ L.Map.TouchGesture = L.Handler.extend({
 		    latlng = this._map.layerPointToLatLng(layerPoint),
 		    mousePos = this._map._docLayer._latLngToTwips(latlng);
 
+		if (this._state === L.Map.TouchGesture.MARKER) {
+			return;
+		}
+
 		if (window.ThisIsTheiOSApp) {
 			// console.log('==> ' + e.timeStamp);
 			if (!this._toolbar._map && this._map._docLayer.containsSelection(latlng)) {