From f7d5bbaf9cc22a554046d2a0fbdfdb1884666850 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Fri, 17 May 2019 18:52:15 +0200 Subject: [PATCH] fix #2774 @0.5 --- js/libs/fluidbook/fluidbook.bookmarks.js | 2 ++ js/libs/fluidbook/fluidbook.links.js | 15 +++++++++------ js/libs/fluidbook/fluidbook.mobilefirst.js | 1 + 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.bookmarks.js b/js/libs/fluidbook/fluidbook.bookmarks.js index fbcf492e..146553e7 100644 --- a/js/libs/fluidbook/fluidbook.bookmarks.js +++ b/js/libs/fluidbook/fluidbook.bookmarks.js @@ -361,6 +361,8 @@ FluidbookBookmarks.prototype = { to++; } + console.log(onlyOne, pageNr, to); + var bookmarks = ""; for (var i = pageNr; i <= to; i++) { if (i > 0 && i <= this.fluidbook.contentlock.getMaxPage()) { diff --git a/js/libs/fluidbook/fluidbook.links.js b/js/libs/fluidbook/fluidbook.links.js index b547f7eb..f348c3cd 100644 --- a/js/libs/fluidbook/fluidbook.links.js +++ b/js/libs/fluidbook/fluidbook.links.js @@ -174,19 +174,22 @@ FluidbookLinks.prototype = { } var lClass = 'left'; - if (this.fluidbook.displayOnePage && pageNr % 2 === 1) { - lClass = 'right'; + if (this.fluidbook.displayOnePage) { + if (pageNr % 2 === 1) { + lClass = 'right'; + } + } else { + if (pageNr % 2 === 1) { + pageNr--; + } } - if (pageNr % 2 === 1) { - pageNr--; - } var links = $("#links"); links.removeClass('left').removeClass('right').addClass(lClass).html(this.fluidbook.datas.links[pageNr]).show(); if (this.fluidbook.datas.bookmark) { - links.append(this.fluidbook.bookmarks.getBookmarkForPage(pageNr, false, this.fluidbook.displayOnePage)); + links.append(this.fluidbook.bookmarks.getBookmarkForPage(pageNr, this.fluidbook.displayOnePage, this.fluidbook.displayOnePage)); } links.prepend('
'); diff --git a/js/libs/fluidbook/fluidbook.mobilefirst.js b/js/libs/fluidbook/fluidbook.mobilefirst.js index dbf915b4..ca4eea0a 100644 --- a/js/libs/fluidbook/fluidbook.mobilefirst.js +++ b/js/libs/fluidbook/fluidbook.mobilefirst.js @@ -2,6 +2,7 @@ function FluidbookMobileFirst(fluidbook) { this.fluidbook = fluidbook; this.enabled = this.fluidbook.datas.mobileNavigationType === 'mobilefirst'; if (this.enabled) { + this.fluidbook.displayOnePage = true; $("#fluidbook").wrap('
'); this.init(); this.slider = new FluidbookMobileFirstSlider(this); -- 2.39.5