cartodb/Leaflet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent recursion on map.setMaxBounds

Browse Source
This commit is contained in:
Iván Sánchez Ortega 2015-04-29 11:02:51 +02:00
parent 6abcdb9751
commit 286f192ca9
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debug/map/max-bounds.html
View File

@ -33,6 +33,8 @@
var latlngs = L.rectangle(bounds).getLatLngs(); var latlngs = L.rectangle(bounds).getLatLngs();
L.polyline(latlngs.concat([latlngs[0]])).addTo(map); L.polyline(latlngs.concat([latlngs[0]])).addTo(map);
map.setMaxBounds(bounds); // Should not enter infinite recursion
</script> </script>
</body> </body>
</html> </html>

6
src/map/Map.js
View File

@ -138,12 +138,14 @@ L.Map = L.Evented.extend({
setMaxBounds: function (bounds) { setMaxBounds: function (bounds) {
bounds = L.latLngBounds(bounds); bounds = L.latLngBounds(bounds);
this.options.maxBounds = bounds;
if (!bounds) { if (!bounds) {
return this.off('moveend', this._panInsideMaxBounds); return this.off('moveend', this._panInsideMaxBounds);
} else if (this.options.maxBounds) {
this.off('moveend', this._panInsideMaxBounds);
} }
this.options.maxBounds = bounds;
if (this._loaded) { if (this._loaded) {
this._panInsideMaxBounds(); this._panInsideMaxBounds();
} }