should reduce #32 impact a lot

Leaflet · Apr 13, 2011 · 8c970cc · 8c970cc
1 parent 47ada8f
commit 8c970cc
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/src/handler/TouchZoom.js b/src/handler/TouchZoom.js
@@ -16,7 +16,7 @@ L.Handler.TouchZoom = L.Handler.extend({
 	},
 
 	_onTouchStart: function(e) {
-		if (!e.touches || e.touches.length != 2 || this._animatingZoom) { return; }
+		if (!e.touches || e.touches.length != 2 || this._map._animatingZoom) { return; }
 
 		var p1 = this._map.mouseEventToLayerPoint(e.touches[0]),
 			p2 = this._map.mouseEventToLayerPoint(e.touches[1]),
@@ -65,10 +65,7 @@ L.Handler.TouchZoom = L.Handler.extend({
 	},
 
 	_onTouchEnd: function(e) {
-		if (!e.touches || e.touches.length >= 2 || !this._moved) { return; }
-
-		// prevent touchEnd from firing twice
-		if (!this._zooming)  { return; }
+		if (!this._moved || !this._zooming) { return; }
 		this._zooming = false;
 
 		var oldZoom = this._map.getZoom(),