Skip to content

Commit 14a7312

Browse files
committed
Deprecated "marker" property
1 parent a7b6e64 commit 14a7312

File tree

8 files changed

+607
-1624
lines changed

8 files changed

+607
-1624
lines changed

Gruntfile.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ module.exports = function(grunt) {
120120
'src/directives/geojson.js',
121121
'src/directives/layers.js',
122122
'src/directives/bounds.js',
123-
'src/directives/marker.js',
124123
'src/directives/markers.js',
125124
'src/directives/paths.js',
126125
'src/directives/eventBroadcast.js',

dist/angular-leaflet-directive.js

Lines changed: 4 additions & 772 deletions
Large diffs are not rendered by default.

dist/angular-leaflet-directive.min.js

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/main-marker-example.html renamed to examples/marker-example.html

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,22 @@
1717
lng: -0.09,
1818
zoom: 8
1919
},
20-
main_marker: {
21-
lat: 51,
22-
lng: 0,
23-
focus: true,
24-
message: "Hey, drag me if you want",
25-
title: "Marker",
26-
draggable: true
20+
markers: {
21+
main_marker: {
22+
lat: 51,
23+
lng: 0,
24+
focus: true,
25+
message: "Hey, drag me if you want",
26+
title: "Marker",
27+
draggable: true
28+
}
2729
}
2830
});
2931
};
3032
</script>
3133
</head>
3234
<body ng-controller="DemoController">
33-
<leaflet center="london" marker="main_marker" height="480px" width="640px">
35+
<leaflet center="london" markers="markers" height="480px" width="640px">
3436
</leaflet>
3537
</body>
3638
</html>

src/directives/leaflet.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ angular.module("leaflet-directive", []).directive('leaflet', function ($log, $q,
5151
}
5252
}
5353

54+
if (isDefined(attrs.marker)) {
55+
$log.warn("[AngularJS - Leaflet] The 'marker' property is currently deprecated, please use the 'markers' property instead.");
56+
}
57+
5458
// Create the Leaflet Map Object with the options
5559
var map = new L.Map(element[0], {
5660
maxZoom: defaults.maxZoom,

src/directives/marker.js

Lines changed: 0 additions & 771 deletions
This file was deleted.

test/unit/markerDirectiveSpec.js

Lines changed: 0 additions & 69 deletions
This file was deleted.

0 commit comments

Comments
 (0)