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

[Dennis Francis (via logerrit)]

 loleaflet/src/layer/tile/TileLayer.js         |    3 +++
 loleaflet/src/map/handler/Map.TouchGesture.js |    9 +++++++++
 2 files changed, 12 insertions(+)

New commits:
commit 485e849459f998a6aea0e5978562a9b05f458c85
Author:     Dennis Francis <dennis.francis at collabora.com>
AuthorDate: Thu Apr 30 18:07:06 2020 +0530
Commit:     Dennis Francis <dennis.francis at collabora.com>
CommitDate: Fri May 1 04:22:31 2020 +0200

    The validity dropdown button should react to taps too
    
    Change-Id: I5c689106a2d995c37f28d652e8b0e39c0644ec8b
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93212
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Dennis Francis <dennis.francis at collabora.com>

diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index 2918f8bf0..9836590ba 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -338,6 +338,9 @@ L.TileLayer = L.GridLayer.extend({
 		this._cellResizeMarkerEnd.on('dragstart drag dragend', this._onCellResizeMarkerDrag, this);
 		this._cellAutofillMarker.on('dragstart drag dragend', this._onCellResizeMarkerDrag, this);
 		this._dropDownButton.on('click', this._onDropDownButtonClick, this);
+		// The 'tap' events are not broadcasted by L.Map.TouchGesture, A specialized 'dropdownmarkertapped' event is
+		// generated just for the validity-dropdown-icon.
+		map.on('dropdownmarkertapped', this._onDropDownButtonClick, this);
 
 		map.setPermission(this.options.permission);
 
diff --git a/loleaflet/src/map/handler/Map.TouchGesture.js b/loleaflet/src/map/handler/Map.TouchGesture.js
index 6120a8d1a..cff7eeffe 100644
--- a/loleaflet/src/map/handler/Map.TouchGesture.js
+++ b/loleaflet/src/map/handler/Map.TouchGesture.js
@@ -311,6 +311,15 @@ L.Map.TouchGesture = L.Handler.extend({
 
 		this._map.fire('closepopups');
 		this._map.fire('closemobilewizard');
+
+		// The validity dropdown marker icon (exists only in calc) needs to be notified of tap events if it is the target.
+		var dropDownMarkers = document.getElementsByClassName('leaflet-marker-icon spreadsheet-drop-down-marker');
+		if (dropDownMarkers.length == 1 && dropDownMarkers[0] && e.target && e.target == dropDownMarkers[0]) {
+			this._map.fire('dropdownmarkertapped');
+			// don't send the mouse-event to core
+			return;
+		}
+
 		this._map.fire('editorgotfocus');
 
 		var docLayer = this._map._docLayer;