From: Vincent Vanwaelscappel Date: Fri, 17 May 2019 16:40:14 +0000 (+0200) Subject: fix #2775 @0:05 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=1c2553e9f482ac7d3ab124943e88742c18cbcd6e;p=fluidbook-html5.git fix #2775 @0:05 --- diff --git a/js/libs/fluidbook/fluidbook.menu.js b/js/libs/fluidbook/fluidbook.menu.js index 7256c8a9..1243320b 100644 --- a/js/libs/fluidbook/fluidbook.menu.js +++ b/js/libs/fluidbook/fluidbook.menu.js @@ -607,7 +607,7 @@ FluidbookMenu.prototype = { var cw = 10 + 130 * this.fluidbook.datas.pages; fullscreen = (cw >= ww * 0.9); if (!fullscreen) { - w = cw + 30; + w = Math.max(400, cw + 30); } } else { fullscreen = true; @@ -666,7 +666,7 @@ FluidbookMenu.prototype = { var cw = 10 + 130 * this.fluidbook.bookmarks.getBookmarkedGroups(true).length; fullscreen = (cw >= ww * 0.9); if (!fullscreen) { - w = cw + 30; + w = Math.max(400, cw + 30); } } else { fullscreen = true; diff --git a/js/libs/fluidbook/fluidbook.mobilefirst.js b/js/libs/fluidbook/fluidbook.mobilefirst.js index f80ef4fc..dbf915b4 100644 --- a/js/libs/fluidbook/fluidbook.mobilefirst.js +++ b/js/libs/fluidbook/fluidbook.mobilefirst.js @@ -147,7 +147,6 @@ FluidbookMobileFirst.prototype = { }, resizeIndex: function (repeat) { - if (!this.enabled) { return; } @@ -175,7 +174,6 @@ FluidbookMobileFirst.prototype = { var scrollAmount = Math.max(0, (indexHeight + funcHeight) - maxHeight); if (!isNaN(scrollAmount) && scrollAmount > 0) { - var cutHeight = tallerHeight - scrollAmount; $(".indexViewHolder .pageholder img").each(function () { var holder = $(this).closest('.pageholder'); @@ -209,11 +207,13 @@ FluidbookMobileFirst.prototype = { setTimeout(function () { $(".indexViewHolder").perfectScrollbar('update'); $(".indexViewHolder").find('.ps__rail-x').addClass('ps--clicking'); - }, 500) + }, 500); + $(".indexViewHolder").perfectScrollbar({ suppressScrollY: true, useBothWheelAxes: true }); + $(".indexViewHolder").find('.ps__rail-x').addClass('ps--clicking'); if (repeat) {