diff --git a/datalets/leafletjs-datalet/leafletjs-datalet.html b/datalets/leafletjs-datalet/leafletjs-datalet.html
index 45f0d45..5e85879 100755
--- a/datalets/leafletjs-datalet/leafletjs-datalet.html
+++ b/datalets/leafletjs-datalet/leafletjs-datalet.html
@@ -85,42 +85,41 @@ Example:
attribution: 'Map data © OpenStreetMap contributors'
}).addTo(this._component.map);
-// setTimeout(function() {
- L.Icon.Default.imagePath = 'http://services.routetopa.eu/DEEalerProvider/COMPONENTS/datalets/leafletjs-datalet/leafletsjs/images';
+ L.Icon.Default.imagePath = 'http://services.routetopa.eu/DEEalerProvider/COMPONENTS/datalets/leafletjs-datalet/leafletsjs/images';
- var coordinates = [];
- var isArray = t.data[0].data[0].constructor === Array;
+ var coordinates = [];
+ var isArray = t.data[0].data[0].constructor === Array;
- for(var i=0; i 2)
+ if(t.data.length > 2)
+ {
+ var popupText = "";
+ for(var j=2; j
';
- else
- popupText += '' + t.data[j].data[i] + '
'
- }
-
- var popup = L.popup().setContent(popupText);
- marker.bindPopup(popup);
+ if(t.data[j].data[i].toString().match(new RegExp("^(http[s]?:\\/\\/(www\\.)?|ftp:\\/\\/(www\\.)?|www\\.){1}([0-9A-Za-z-\\.@:%_\+~#=]+)+((\\.[a-zA-Z]{2,3})+)(/(.)*)?(\\?(.)*)?")))
+ popupText += '
';
+ else
+ popupText += '' + t.data[j].data[i] + '
'
}
+
+ var popup = L.popup().setContent(popupText);
+ marker.bindPopup(popup);
}
+ }
+
+ t._component.map._onResize();
+ t._component.map.invalidateSize(false);
+ t._component.map.fitBounds(coordinates);
- t._component.map._onResize();
- t._component.map.invalidateSize(false);
- t._component.map.fitBounds(coordinates);
-// }, 0)
}
};
@@ -172,8 +171,7 @@ Example:
*/
ready: function(){
this.behavior = $.extend(true, {}, BaseDataletBehavior, WorkcycleBehavior, AjaxJsonAlasqlBehavior, leafletjsBehavior);
-// this.behavior.init(this);
- this.async(function(){this.behavior.init(this)},0);
+ this.async(function(){this.behavior.init(this)},100);
}
});