]> _ Git - fluidbook-html5.git/commitdiff
fix #1391 @1
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Thu, 4 May 2017 16:34:36 +0000 (18:34 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Thu, 4 May 2017 16:34:36 +0000 (18:34 +0200)
js/libs/fluidbook/fluidbook.touch.js

index b54d1f9148e52cd52d80e17ef3154e5b971c248d..7c632e541c88278a38fe560180b21e59015ef29b 100644 (file)
@@ -27,13 +27,12 @@ FluidbookTouch.prototype = {
             },
             onmove: function (event) {
                 var ds = event.ds;
-                //if ($this.fluidbook.support.iOS) {
+
                 if (ds > 0) {
                     ds *= 0.25;
                 } else {
                     ds *= 0.75;
                 }
-                //}
                 var s = $this.fluidbook.zoom.zoom * (1 + ds);
                 $this.pinchZoom(s);
                 return false;
@@ -41,7 +40,9 @@ FluidbookTouch.prototype = {
             onend: function (event) {
                 return false;
             },
-        }).draggable({
+        });
+
+        interact(document.getElementById("z")).ignoreFrom('.link a').draggable({
             inertia: true,
             onmove: function (event) {
                 return $this.dragzoom(event);
@@ -51,6 +52,16 @@ FluidbookTouch.prototype = {
             }
         });
 
+        interact(document.getElementById("background")).ignoreFrom('.link a').draggable({
+            inertia: true,
+            onmove: function (event) {
+
+            },
+            onend: function (event) {
+
+            }
+        });
+
         // Double tap
         interact(document).on('doubletap', function (event) {
             if ($this.fluidbook.zoom.zoom > 1) {