Merge branch 'master' of https://github.com/Fodoj/iscroll into Fodoj-…

…master Conflicts: dist/iscroll-lite-min.js dist/iscroll-min.js dist/iscroll-probe-min.js dist/iscroll-zoom-min.js
piaowenjie · Dec 6, 2013 · 05375ba · 05375ba
2 parents 4f65f04 + 068b2e2
commit 05375ba
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/build/iscroll-lite.js b/build/iscroll-lite.js
@@ -813,8 +813,8 @@ IScroll.prototype = {
 			x = +(matrix[12] || matrix[4]);
 			y = +(matrix[13] || matrix[5]);
 		} else {
-			x = +matrix.left.replace(/[^-\d]/g, '');
-			y = +matrix.top.replace(/[^-\d]/g, '');
+			x = +matrix.left.replace(/[^-\d.]/g, '');
+			y = +matrix.top.replace(/[^-\d.]/g, '');
 		}
 
 		return { x: x, y: y };

diff --git a/build/iscroll-probe.js b/build/iscroll-probe.js
@@ -887,8 +887,8 @@ IScroll.prototype = {
 			x = +(matrix[12] || matrix[4]);
 			y = +(matrix[13] || matrix[5]);
 		} else {
-			x = +matrix.left.replace(/[^-\d]/g, '');
-			y = +matrix.top.replace(/[^-\d]/g, '');
+			x = +matrix.left.replace(/[^-\d.]/g, '');
+			y = +matrix.top.replace(/[^-\d.]/g, '');
 		}
 
 		return { x: x, y: y };

diff --git a/build/iscroll-zoom.js b/build/iscroll-zoom.js
@@ -881,8 +881,8 @@ IScroll.prototype = {
 			x = +(matrix[12] || matrix[4]);
 			y = +(matrix[13] || matrix[5]);
 		} else {
-			x = +matrix.left.replace(/[^-\d]/g, '');
-			y = +matrix.top.replace(/[^-\d]/g, '');
+			x = +matrix.left.replace(/[^-\d.]/g, '');
+			y = +matrix.top.replace(/[^-\d.]/g, '');
 		}
 
 		return { x: x, y: y };

diff --git a/build/iscroll.js b/build/iscroll.js
@@ -878,8 +878,8 @@ IScroll.prototype = {
 			x = +(matrix[12] || matrix[4]);
 			y = +(matrix[13] || matrix[5]);
 		} else {
-			x = +matrix.left.replace(/[^-\d]/g, '');
-			y = +matrix.top.replace(/[^-\d]/g, '');
+			x = +matrix.left.replace(/[^-\d.]/g, '');
+			y = +matrix.top.replace(/[^-\d.]/g, '');
 		}
 
 		return { x: x, y: y };

diff --git a/dist/iscroll-lite-min.js b/dist/iscroll-lite-min.js
diff --git a/dist/iscroll-min.js b/dist/iscroll-min.js
diff --git a/dist/iscroll-probe-min.js b/dist/iscroll-probe-min.js
diff --git a/dist/iscroll-zoom-min.js b/dist/iscroll-zoom-min.js
diff --git a/src/core.js b/src/core.js
@@ -579,8 +579,8 @@ IScroll.prototype = {
 			x = +(matrix[12] || matrix[4]);
 			y = +(matrix[13] || matrix[5]);
 		} else {
-			x = +matrix.left.replace(/[^-\d]/g, '');
-			y = +matrix.top.replace(/[^-\d]/g, '');
+			x = +matrix.left.replace(/[^-\d.]/g, '');
+			y = +matrix.top.replace(/[^-\d.]/g, '');
 		}
 
 		return { x: x, y: y };