js/playscreen.js
changeset 12 81a8bb1d872a
parent 11 9833f3e24105
child 14 3aa6b9963de0
--- a/js/playscreen.js	Thu Mar 21 18:48:12 2013 +0100
+++ b/js/playscreen.js	Fri Mar 22 17:03:53 2013 +0100
@@ -795,8 +795,19 @@
 	.on("touch", function(e) {
 		startLevel = currentlevel;
 	})
-	.on("pinchin", function(e) {
-		var newlevel = Math.max(0, Math.min(zoomlevels.length - 1, startLevel + Math.round(Math.log(e.gesture.scale)*scaleStep)));
+	.on("pinchin pinchout", function(e) {
+		var x = e.gesture.center.pageX - $(this).offset().left;
+		if (x > 380) {
+			return;
+		}
+		var newlevel = Math.max(
+			0,
+			Math.min(
+				zoomlevels.length - 1,
+				startLevel + Math.round(Math.log(e.gesture.scale)*scaleStep) * (x > 140 ? 1 : -1)
+			)
+		);
+		//$("#konsole").text(e.gesture.scale + " => " + newlevel);
 		if (newlevel !== currentlevel) {
 			currentlevel = newlevel;
 			localduration = zoomlevels[currentlevel];