From 496fff06f36e9cc204d6d6d6f5338ead612a93f7 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Mon, 28 Feb 2022 09:24:03 +0100 Subject: [PATCH] wait #4508 @0.5 --- js/libs/fluidbook/fluidbook.links.js | 12 +++++++++++- js/libs/fluidbook/fluidbook.touch.js | 12 ++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.links.js b/js/libs/fluidbook/fluidbook.links.js index 8ddb88c1..c1f65e9f 100644 --- a/js/libs/fluidbook/fluidbook.links.js +++ b/js/libs/fluidbook/fluidbook.links.js @@ -786,9 +786,18 @@ FluidbookLinks.prototype = { }, to.delay * 1000); } else if (animation.type === 'draggable') { $(link).css('pointer-events', 'auto'); + var $this = this; var draggable = new Draggable(link, { - inertia: true, type: 'x', onRelease: function () { + inertia: true, type: 'x', + onDragStart: function () { + $this.fluidbook.touch.draggingFromOutside = true; + }, + onRelease: function () { var d = this; + setTimeout(function () { + $this.fluidbook.touch.draggingFromOutside = false; + }, 250); + if (animation.drop === 'clickhide') { $('#links .link a').each(function () { if (d.hitTest(this)) { @@ -802,6 +811,7 @@ FluidbookLinks.prototype = { } }); } + } }); } else { diff --git a/js/libs/fluidbook/fluidbook.touch.js b/js/libs/fluidbook/fluidbook.touch.js index 7c6a3899..e1646e75 100644 --- a/js/libs/fluidbook/fluidbook.touch.js +++ b/js/libs/fluidbook/fluidbook.touch.js @@ -12,6 +12,8 @@ function FluidbookTouch(fluidbook) { this.triggerOffset = this.fluidbook.mobilefirst.enabled ? 0.1 : 0.05; + this.draggingFromOutside = false; + this.init(); } @@ -257,10 +259,12 @@ FluidbookTouch.prototype = { } var ltr = this.fluidbook.l10n.dir === 'ltr'; - if ((this.offsetX < 0 && ltr) || (this.offsetX > 0 && !ltr)) { - this.fluidbook.goNextPage(); - } else { - this.fluidbook.goPreviousPage(); + if (!this.draggingFromOutside) { + if ((this.offsetX < 0 && ltr) || (this.offsetX > 0 && !ltr)) { + this.fluidbook.goNextPage(); + } else { + this.fluidbook.goPreviousPage(); + } } return true; } else { -- 2.39.5