Merge pull request tombatossals#259 from skalb/marker-draggable

tombatossals · tombatossals · commit 4fee0ea07ae4 · 2014-01-26T10:51:37.000-08:00
Fix assertion on marker.dragging
diff --git a/src/services/leafletMarkersHelpers.js b/src/services/leafletMarkersHelpers.js
@@ -163,7 +163,7 @@ angular.module("leaflet-directive").factory('leafletMarkersHelpers', function ($
                 }
 
                 // Update the draggable property
-                if (markerData.draggable !== true && oldMarkerData.draggable === true && marker.dragging === true) {
+                if (markerData.draggable !== true && oldMarkerData.draggable === true && (marker.dragging !== undefined && marker.dragging !== null)) {
                     marker.dragging.disable();
                 }
                 if (markerData.draggable === true && oldMarkerData.draggable !== true) {

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ angular.module("leaflet-directive").factory('leafletMarkersHelpers', function ($`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`// Update the draggable property`
`166`		`- if (markerData.draggable !== true && oldMarkerData.draggable === true && marker.dragging === true) {`
	`166`	`+ if (markerData.draggable !== true && oldMarkerData.draggable === true && (marker.dragging !== undefined && marker.dragging !== null)) {`
`167`	`167`	`marker.dragging.disable();`
`168`	`168`	`}`
`169`	`169`	`if (markerData.draggable === true && oldMarkerData.draggable !== true) {`