From: Vincent Vanwaelscappel Date: Thu, 4 May 2017 16:34:36 +0000 (+0200) Subject: fix #1391 @1 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=2bb92f2bc9294d7ca01e9aa7026bb8208934553f;p=fluidbook-html5.git fix #1391 @1 --- diff --git a/js/libs/fluidbook/fluidbook.touch.js b/js/libs/fluidbook/fluidbook.touch.js index b54d1f91..7c632e54 100644 --- a/js/libs/fluidbook/fluidbook.touch.js +++ b/js/libs/fluidbook/fluidbook.touch.js @@ -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) {