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

Mihai Varga mihai.varga at collabora.com
Fri Jun 26 02:44:20 PDT 2015


 loleaflet/dist/leaflet.css            |    3 +++
 loleaflet/src/layer/tile/TileLayer.js |   12 ++++++++++++
 2 files changed, 15 insertions(+)

New commits:
commit e901c6fe3460e2fb7a489cb35dda78e484d88df4
Author: Mihai Varga <mihai.varga at collabora.com>
Date:   Fri Jun 26 12:43:57 2015 +0300

    Set marker not clickable during mouse selection

diff --git a/loleaflet/dist/leaflet.css b/loleaflet/dist/leaflet.css
index f161094..3c03665 100644
--- a/loleaflet/dist/leaflet.css
+++ b/loleaflet/dist/leaflet.css
@@ -504,6 +504,9 @@
 	border: 1px solid #999;
 	}
 
+.leaflet-not-clickable {
+	pointer-events: none;
+	}
 
 /* div icon */
 
diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index 8b58104..15b2d8b 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -693,6 +693,12 @@ L.TileLayer = L.GridLayer.extend({
 			this._postMouseEvent('buttonup', mousePos.x, mousePos.y, 1);
 
 			this._editMode = true;
+			if (this._startMarker._icon) {
+				L.DomUtil.removeClass(this._startMarker._icon, 'leaflet-not-clickable');
+			}
+			if (this._endMarker._icon) {
+				L.DomUtil.removeClass(this._endMarker._icon, 'leaflet-not-clickable');
+			}
 		}
 		else if (e.type === 'mousemove' && this._selecting) {
 			if (this._holdStart) {
@@ -704,6 +710,12 @@ L.TileLayer = L.GridLayer.extend({
 			}
 			mousePos = this._latLngToTwips(e.latlng);
 			this._postMouseEvent('move', mousePos.x, mousePos.y, 1);
+			if (this._startMarker._icon) {
+				L.DomUtil.addClass(this._startMarker._icon, 'leaflet-not-clickable');
+			}
+			if (this._endMarker._icon) {
+				L.DomUtil.addClass(this._endMarker._icon, 'leaflet-not-clickable');
+			}
 		}
 		else if (e.type === 'dblclick') {
 			mousePos = this._latLngToTwips(e.latlng);


More information about the Libreoffice-commits mailing list