Merged recent changes in master back into 1.6.x

tuanha · Mar 16, 2013 · 894df6d · 894df6d
2 parents f226567 + 99f9c7e
commit 894df6d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/jquery.touchSwipe.js b/jquery.touchSwipe.js
@@ -94,7 +94,7 @@
 
 
 (function ($) {
-+  "use strict";
+	"use strict";
 
 	//Constants
 	var LEFT = "left",
@@ -355,13 +355,14 @@
 
 
 		//touch properties
-		var distance = 0;
-		var direction = null;
-		var duration = 0;
-		var startTouchesDistance=0;
-		var endTouchesDistance=0;
-		var pinchZoom = 1;
-		var pinchDirection=0;
+		var distance = 0,
+			direction = null,
+			duration = 0,
+			startTouchesDistance = 0,
+			endTouchesDistance = 0,
+			pinchZoom = 1,
+			pinchDistance = 0,
+			pinchDirection = 0;
 
 
 		//jQuery wrapped element for this instance
@@ -377,10 +378,10 @@
 		var fingerData=null;
 
 		//track times
-		var startTime = 0;
-		var endTime = 0;
-		var previousTouchEndTime=0;
-		var previousTouchFingerCount=0;
+		var startTime = 0,
+			endTime = 0,
+			previousTouchEndTime=0,
+			previousTouchFingerCount=0;
 
 		// Add gestures to all swipable areas if supported
 		try {

diff --git a/jquery.touchSwipe.min.js b/jquery.touchSwipe.min.js