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

update build

Browse Source
This commit is contained in:
Vladimir Agafonkin 2012-11-14 15:13:08 +02:00
parent c33a4013a2
commit b2d6575445
3 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dist/leaflet-src.js vendored
View File

@ -6011,9 +6011,10 @@ L.Map.ScrollWheelZoom = L.Handler.extend({
_performZoom: function () { _performZoom: function () {
var map = this._map, var map = this._map,
delta = Math.round(this._delta), delta = this._delta,
zoom = map.getZoom(); zoom = map.getZoom();
delta = delta > 0 ? Math.ceil(delta) : Math.round(delta);
delta = Math.max(Math.min(delta, 4), -4); delta = Math.max(Math.min(delta, 4), -4);
delta = map._limitZoom(zoom + delta) - zoom; delta = map._limitZoom(zoom + delta) - zoom;
@ -7034,12 +7035,20 @@ L.Control.Zoom = L.Control.extend({
this._map = map; this._map = map;
this._createButton('+', 'Zoom in', className + '-in', container, this._zoomIn, this); this._zoomInButton = this._createButton(
this._createButton('-', 'Zoom out', className + '-out', container, this._zoomOut, this); '+', 'Zoom in', className + '-in', container, this._zoomIn, this);
this._zoomOutButton = this._createButton(
'-', 'Zoom out', className + '-out', container, this._zoomOut, this);
map.on('zoomend', this._updateDisabled, this);
return container; return container;
}, },
onRemove: function (map) {
map.off('zoomend', this._updateDisabled, this);
},
_zoomIn: function (e) { _zoomIn: function (e) {
this._map.zoomIn(e.shiftKey ? 3 : 1); this._map.zoomIn(e.shiftKey ? 3 : 1);
}, },
@ -7062,6 +7071,21 @@ L.Control.Zoom = L.Control.extend({
.on(link, 'click', fn, context); .on(link, 'click', fn, context);
return link; return link;
},
_updateDisabled: function () {
var map = this._map,
className = 'leaflet-control-zoom-disabled';
L.DomUtil.removeClass(this._zoomInButton, className);
L.DomUtil.removeClass(this._zoomOutButton, className);
if (map._zoom === map.getMinZoom()) {
L.DomUtil.addClass(this._zoomOutButton, className);
}
if (map._zoom === map.getMaxZoom()) {
L.DomUtil.addClass(this._zoomInButton, className);
}
} }
}); });
@ -7647,7 +7671,7 @@ L.Map.include({
L.DomUtil.addClass(this._mapPane, 'leaflet-pan-anim'); L.DomUtil.addClass(this._mapPane, 'leaflet-pan-anim');
var newPos = L.DomUtil.getPosition(this._mapPane).subtract(offset); var newPos = L.DomUtil.getPosition(this._mapPane).subtract(offset)._round();
this._panAnim.run(this._mapPane, newPos, duration || 0.25, easeLinearity); this._panAnim.run(this._mapPane, newPos, duration || 0.25, easeLinearity);
return this; return this;

2
dist/leaflet.js vendored
View File

File diff suppressed because one or more lines are too long

2
src/control/Control.Zoom.js
View File

@ -51,7 +51,7 @@ L.Control.Zoom = L.Control.extend({
var map = this._map, var map = this._map,
className = 'leaflet-control-zoom-disabled'; className = 'leaflet-control-zoom-disabled';
L.DomUtil.removeClass(this._zoomInButton, className) L.DomUtil.removeClass(this._zoomInButton, className);
L.DomUtil.removeClass(this._zoomOutButton, className); L.DomUtil.removeClass(this._zoomOutButton, className);
if (map._zoom === map.getMinZoom()) { if (map._zoom === map.getMinZoom()) {