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

Merge branch 'master' of git@github.com:CloudMade/Leaflet.git

Browse Source
This commit is contained in:
Mourner 2011-07-29 12:40:48 +03:00
commit 8a39ac9524
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/layer/Popup.js
View File

@ -3,6 +3,7 @@ L.Popup = L.Class.extend({
includes: L.Mixin.Events,
options: {
minWidth: 50,
maxWidth: 300,
autoPan: true,
closeButton: true,
@ -113,7 +114,7 @@ L.Popup = L.Class.extend({
var width = this._container.offsetWidth;
this._container.style.width = (width > this.options.maxWidth ? this.options.maxWidth : width) + 'px';
this._container.style.width = (width > this.options.maxWidth ? this.options.maxWidth : (width < this.options.minWidth ? this.options.minWidth : width ) ) + 'px';
this._container.style.whiteSpace = '';
this._containerWidth = this._container.offsetWidth;
@ -163,4 +164,4 @@ L.Popup = L.Class.extend({
this._close();
L.DomEvent.stop(e);
}
});
});

1
src/layer/marker/Marker.js
View File

@ -54,6 +54,7 @@ L.Marker = L.Class.extend({
this.options.icon = icon;
this._initIcon();
this._reset();
},
_initIcon: function() {