stop panning/fly animations when necessary

Leaflet · Oct 21, 2014 · d93e828 · d93e828
1 parent 23998c1
commit d93e828
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/map/anim/Map.PanAnimation.js b/src/map/anim/Map.PanAnimation.js
@@ -10,9 +10,7 @@ L.Map.include({
 		center = this._limitCenter(L.latLng(center), zoom, this.options.maxBounds);
 		options = options || {};
 
-		if (this._panAnim) {
-			this._panAnim.stop();
-		}
+		this.stop();
 
 		if (this._loaded && !options.reset && options !== true) {
 

diff --git a/src/map/handler/Map.ScrollWheelZoom.js b/src/map/handler/Map.ScrollWheelZoom.js
@@ -48,6 +48,8 @@ L.Map.ScrollWheelZoom = L.Handler.extend({
 		    delta = this._delta,
 		    zoom = map.getZoom();
 
+		map.stop(); // stop panning and fly animations if any
+
 		delta = delta > 0 ? Math.ceil(delta) : Math.floor(delta);
 		delta = Math.max(Math.min(delta, 4), -4);
 		delta = map._limitZoom(zoom + delta) - zoom;