Public-Repositories/contao-leaflet-maps
1
0
Fork 0
forked from Snck3rs/contao-leaflet-maps
Code Pull Requests Activity

Refactor popup handling

Browse Source
This commit is contained in:
David Molineus
2015-01-07 10:33:35 +01:00
parent 37c3c56b98
commit 84ede62132
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
module/assets/js/contao-leaflet.js
View File

@@ -104,7 +104,8 @@ L.Contao = L.Class.extend( {
pointToLayer: function(feature, latlng) {
var marker = L.marker(latlng, feature.properties.options);
if (feature.properties && feature.properties.icon) {
if (feature.properties) {
if (feature.properties.icon) {
var icon = this.getIcon(feature.properties.icon);
if (icon) {
@@ -112,24 +113,28 @@ L.Contao = L.Class.extend( {
}
}
this.applyFeatureMethods(marker, feature);
this.bindPopupFromFeature(marker, feature);
}
this.fire('marker:created', { marker: marker, feature: feature, latlng: latlng });
return marker;
},
/**
* Apply feature methods.
* Bind popup from feature definitions.
*
* @param obj
* @param feature
* It accepts popup or popupContent as property.
*
* @param obj The object
* @param feature The geo json feature.
*/
applyFeatureMethods: function(obj, feature) {
if (feature.properties && feature.properties.methods) {
for (var i=0; i < feature.properties.methods.length; i++) {
var method = feature.properties.methods[i];
obj[method[0]].apply(obj, method[1]);
bindPopupFromFeature: function (obj, feature) {
if (feature.properties) {
if (feature.properties.popup) {
obj.bindPopup(feature.properties.popup);
} else if (feature.properties.popupContent) {
obj.bindPopup(feature.properties.popupContent);
}
}
}