nakarte

commit 2e943f8b945c61fde22f3a75b39cb2edabe486e7
parent de3fcd5bdad3649d89815e509d44af7608be0751
Author: Sergey Orlov <wladimirych@gmail.com>
Date:   Mon,  4 May 2020 18:33:34 +0200

drag events: remove eventsTarget argument, it is not needed

Related to #16

Diffstat:
M
src/lib/leaflet.control.elevation-profile/index.js
 | 
2
+-
M
src/lib/leaflet.events.drag/index.js
 | 
15
+++++----------

2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/src/lib/leaflet.control.elevation-profile/index.js b/src/lib/leaflet.control.elevation-profile/index.js
@@ -197,7 +197,7 @@ const ElevationProfile = L.Class.extend({
             L.DomEvent.on(svg, 'mousemove', this.onSvgEnter, this);
             L.DomEvent.on(svg, 'mouseleave', this.onSvgLeave, this);
             L.DomEvent.on(svg, 'mousewheel', this.onSvgMouseWheel, this);
-            this.svgDragEvents = new DragEvents(this.svg, null, {dragButtons: [0, 2]});
+            this.svgDragEvents = new DragEvents(this.svg, {dragButtons: [0, 2]});
             this.svgDragEvents.on('dragstart', this.onSvgDragStart, this);
             this.svgDragEvents.on('dragend', this.onSvgDragEnd, this);
             this.svgDragEvents.on('drag', this.onSvgDrag, this);
diff --git a/src/lib/leaflet.events.drag/index.js b/src/lib/leaflet.events.drag/index.js
@@ -21,7 +21,7 @@ function movementFromEvents(e1, e2) {
     };
 }
 
-var DragEvents = L.Class.extend({
+const DragEvents = L.Class.extend({
         options: {
             dragTolerance: 2,
             dragButtons: [0]
@@ -29,13 +29,8 @@ var DragEvents = L.Class.extend({
 
         includes: L.Mixin.Events,
 
-        initialize: function(eventsSource, eventsTarget, options) {
+        initialize: function(eventsSource, options) {
             L.setOptions(this, options);
-            if (eventsTarget) {
-                this.eventsTarget = eventsTarget;
-            } else {
-                this.eventsTarget = this;
-            }
             this.dragStartPos = [];
             this.prevEvent = [];
             this.isDragging = [];
@@ -91,18 +86,18 @@ var DragEvents = L.Class.extend({
             for (i = 0; i < dragButtons.length; i++) {
                 button = dragButtons[i];
                 if (this.isDragging[button]) {
-                    this.eventsTarget.fire('drag', L.extend({dragButton: button, origEvent: e},
+                    this.fire('drag', L.extend({dragButton: button, origEvent: e},
                         offestFromEvent(e), movementFromEvents(this.prevEvent[button], e)
                         )
                     );
                 } else if (this.dragStartPos[button] && exceedsTolerance(button)) {
                     this.isDragging[button] = true;
-                    this.eventsTarget.fire('dragstart', L.extend(
+                    this.fire('dragstart', L.extend(
                         {dragButton: button, origEvent: this.dragStartPos[button]},
                         this.dragStartPos[button]._offset
                         )
                     );
-                    this.eventsTarget.fire('drag', L.extend({
+                    this.fire('drag', L.extend({
                             dragButton: button,
                             origEvent: e,
                             startEvent: that.dragStartPos[button]