summaryrefslogtreecommitdiff
path: root/loleaflet
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2020-09-09 15:08:20 +0200
committerJan Holesovsky <kendy@collabora.com>2020-09-17 15:03:01 +0200
commit284e8ce308f2e8a3ea124f93fb7f8c27fbed0910 (patch)
treea04b08247dcc9d3f5b3988f92a5bfaebbcbf9220 /loleaflet
parent26e87932aee04b2bf23e4af9dc53755ac0e27c02 (diff)
Don't block handling of touch events
This is partial revert of 901ecca313. Handles (Markers) 'down' handler disabled main TouchGesture handler what caused taps to be ignored. Eg. double click didn't enter edit mode for a Calc cell. Change-Id: Id7097e9ad513e56a71423a6d6a8ac5105c373f77
Diffstat (limited to 'loleaflet')
-rw-r--r--loleaflet/src/layer/marker/Marker.Drag.js6
-rw-r--r--loleaflet/src/layer/marker/Marker.js7
2 files changed, 0 insertions, 13 deletions
diff --git a/loleaflet/src/layer/marker/Marker.Drag.js b/loleaflet/src/layer/marker/Marker.Drag.js
index 179408e9b..1df958e52 100644
--- a/loleaflet/src/layer/marker/Marker.Drag.js
+++ b/loleaflet/src/layer/marker/Marker.Drag.js
@@ -16,7 +16,6 @@ L.Handler.MarkerDrag = L.Handler.extend({
}
this._draggable.on({
- down: this._onDown,
dragstart: this._onDragStart,
drag: this._onDrag,
dragend: this._onDragEnd,
@@ -28,7 +27,6 @@ L.Handler.MarkerDrag = L.Handler.extend({
removeHooks: function () {
this._draggable.off({
- down: this._onDown,
dragstart: this._onDragStart,
drag: this._onDrag,
dragend: this._onDragEnd,
@@ -54,10 +52,6 @@ L.Handler.MarkerDrag = L.Handler.extend({
this._draggable.freezeY(boolChoice);
},
- _onDown: function (e) {
- this._marker.fire('down', e);
- },
-
_onDragStart: function (e) {
this._marker
.closePopup()
diff --git a/loleaflet/src/layer/marker/Marker.js b/loleaflet/src/layer/marker/Marker.js
index a73c1826d..10e8038ad 100644
--- a/loleaflet/src/layer/marker/Marker.js
+++ b/loleaflet/src/layer/marker/Marker.js
@@ -23,7 +23,6 @@ L.Marker = L.Layer.extend({
initialize: function (latlng, options) {
L.setOptions(this, options);
this._latlng = L.latLng(latlng);
- this.on('down', this.onDown);
},
setDraggable: function(val) {
@@ -55,12 +54,6 @@ L.Marker = L.Layer.extend({
this._removeShadow();
},
- onDown: function () {
- if (this._map && this._map.touchGesture) {
- this._map.touchGesture.disable();
- }
- },
-
getEvents: function () {
var events = {viewreset: this.update};