Merge pull request #1598 from bpavot/webview-click-fix

Android webview fix : Use originalEvent when needed to find timestamp
Leaflet · Apr 15, 2013 · 49091c0 · 49091c0
2 parents 5925a43 + fd080ab
commit 49091c0
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/dom/DomEvent.js b/src/dom/DomEvent.js
@@ -190,7 +190,8 @@ L.DomEvent = {
 
 	// this solves a bug in Android WebView where a single touch triggers two click events.
 	_filterClick: function (e, handler) {
-		var elapsed = L.DomEvent._lastClick && (e.timeStamp - L.DomEvent._lastClick);
+		var timeStamp = (e.timeStamp || e.originalEvent.timeStamp);
+		var elapsed = L.DomEvent._lastClick && (timeStamp - L.DomEvent._lastClick);
 
 		// are they closer together than 400ms yet more than 100ms?
 		// Android typically triggers them ~300ms apart while multiple listeners
@@ -200,7 +201,7 @@ L.DomEvent = {
 			L.DomEvent.stop(e);
 			return;
 		}
-		L.DomEvent._lastClick = e.timeStamp;
+		L.DomEvent._lastClick = timeStamp;
 
 		return handler(e);
 	}