fix zoom anim freeze race condition, close #2693, close #2478

2015-03-02 15:26:05 +02:00 · 2015-03-02 15:26:05 +02:00 · bbc3f2fab1
commit bbc3f2fab1
parent 4c8ffadf30
1 changed files with 8 additions and 0 deletions
--- a/src/map/anim/Map.ZoomAnimation.js
+++ b/src/map/anim/Map.ZoomAnimation.js
@ -34,7 +34,15 @@ L.Map.include(!zoomAnimated ? {} : {
 		this._panes.mapPane.appendChild(proxy);

 		this.on('zoomanim', function (e) {
+			var prop = L.DomUtil.TRANSFORM,
+				transform = proxy.style[prop];
+
 			L.DomUtil.setTransform(proxy, this.project(e.center, e.zoom), this.getZoomScale(e.zoom, 1));
+
+			// workaround for case when transform is the same and so transitionend event is not fired
+			if (transform === proxy.style[prop] & this._animatingZoom) {
+				this._onZoomTransitionEnd();
+			}
 		}, this);

 		this.on('load moveend', function () {