better fix for #41

geoman-io · Aug 17, 2016 · 4a0417d · 4a0417d
1 parent cccb4b0
commit 4a0417d
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 15 deletions.
diff --git a/dist/leaflet.pm.js b/dist/leaflet.pm.js
@@ -459,9 +459,26 @@ L.PM.Edit.Poly = L.Class.extend({
         rightM._middleMarkerLeft = middleMarker;
 
         middleMarker.on('click', function() {
+
+            // TODO: move the next two lines inside _addMarker() as soon as
+            // https://github.com/Leaflet/Leaflet/issues/4484
+            // is fixed
+            var icon = L.divIcon({className: 'marker-icon'});
+            middleMarker.setIcon(icon);
+
             self._addMarker(middleMarker, leftM, rightM);
         });
         middleMarker.on('movestart', function() {
+
+            // TODO: This is a workaround. Remove the moveend listener and callback as soon as this is fixed:
+            // https://github.com/Leaflet/Leaflet/issues/4484
+            middleMarker.on('moveend', function() {
+                var icon = L.divIcon({className: 'marker-icon'});
+                middleMarker.setIcon(icon);
+
+                middleMarker.off('moveend');
+            });
+
             self._addMarker(middleMarker, leftM, rightM);
         });
 
@@ -475,13 +492,6 @@ L.PM.Edit.Poly = L.Class.extend({
         newM.off('movestart');
         newM.off('click');
 
-        // TODO: This is a workaround. Remove this event do the callback right here when when this issue is fixed:
-        // https://github.com/Leaflet/Leaflet/issues/4484
-        newM.on('moveend', function() {
-            var icon = L.divIcon({className: 'marker-icon'})
-            newM.setIcon(icon);
-        });
-
         // now, create the polygon coordinate point for that marker
         var latlng = newM.getLatLng();
         var coords = this._poly._latlngs[0];

diff --git a/dist/leaflet.pm.min.js b/dist/leaflet.pm.min.js
diff --git a/src/js/L.PM.Edit.Poly.js b/src/js/L.PM.Edit.Poly.js
@@ -102,9 +102,26 @@ L.PM.Edit.Poly = L.Class.extend({
         rightM._middleMarkerLeft = middleMarker;
 
         middleMarker.on('click', function() {
+
+            // TODO: move the next two lines inside _addMarker() as soon as
+            // https://github.com/Leaflet/Leaflet/issues/4484
+            // is fixed
+            var icon = L.divIcon({className: 'marker-icon'});
+            middleMarker.setIcon(icon);
+
             self._addMarker(middleMarker, leftM, rightM);
         });
         middleMarker.on('movestart', function() {
+
+            // TODO: This is a workaround. Remove the moveend listener and callback as soon as this is fixed:
+            // https://github.com/Leaflet/Leaflet/issues/4484
+            middleMarker.on('moveend', function() {
+                var icon = L.divIcon({className: 'marker-icon'});
+                middleMarker.setIcon(icon);
+
+                middleMarker.off('moveend');
+            });
+
             self._addMarker(middleMarker, leftM, rightM);
         });
 
@@ -118,13 +135,6 @@ L.PM.Edit.Poly = L.Class.extend({
         newM.off('movestart');
         newM.off('click');
 
-        // TODO: This is a workaround. Remove this event do the callback right here when when this issue is fixed:
-        // https://github.com/Leaflet/Leaflet/issues/4484
-        newM.on('moveend', function() {
-            var icon = L.divIcon({className: 'marker-icon'})
-            newM.setIcon(icon);
-        });
-
         // now, create the polygon coordinate point for that marker
         var latlng = newM.getLatLng();
         var coords = this._poly._latlngs[0];