From 8a17d8af8e4f34070342854f3d2e6bb5010c8749 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 17 Dec 2019 15:02:29 +0100 Subject: [PATCH] fix #3261 @0.5 --- js/libs/fluidbook/fluidbook.bookmarks.js | 10 +++++++++- js/libs/fluidbook/fluidbook.links.js | 6 +++--- style/fluidbook.less | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.bookmarks.js b/js/libs/fluidbook/fluidbook.bookmarks.js index ccf6f344..e82148c0 100644 --- a/js/libs/fluidbook/fluidbook.bookmarks.js +++ b/js/libs/fluidbook/fluidbook.bookmarks.js @@ -348,7 +348,10 @@ FluidbookBookmarks.prototype = { isBookmarked: function (page) { return this.bookmarks.indexOf(page) > -1; }, - getBookmarkForPage: function (pageNr, allwaysAtRight) { + getBookmarkForPage: function (pageNr, allwaysAtRight, permanentIcon) { + if (permanentIcon === undefined) { + permanentIcon = false; + } if (allwaysAtRight === undefined) { allwaysAtRight = false; } @@ -368,6 +371,10 @@ FluidbookBookmarks.prototype = { return ''; } + if (permanentIcon) { + side += ' permanent'; + } + bookmarks += "'; return bookmarks; diff --git a/js/libs/fluidbook/fluidbook.links.js b/js/libs/fluidbook/fluidbook.links.js index 32e75423..99c0263b 100644 --- a/js/libs/fluidbook/fluidbook.links.js +++ b/js/libs/fluidbook/fluidbook.links.js @@ -187,8 +187,8 @@ FluidbookLinks.prototype = { leftContainer.html(this.fluidbook.datas.links[leftPage]); if (this.fluidbook.datas.bookmark) { - leftContainer.append(this.fluidbook.bookmarks.getBookmarkForPage(leftPage, this.fluidbook.displayOnePage)); - rightContainer.append(this.fluidbook.bookmarks.getBookmarkForPage(rightPage, this.fluidbook.displayOnePage)); + leftContainer.append(this.fluidbook.bookmarks.getBookmarkForPage(leftPage, this.fluidbook.displayOnePage, this.fluidbook.datas.bookmarkPermanentIcon)); + rightContainer.append(this.fluidbook.bookmarks.getBookmarkForPage(rightPage, this.fluidbook.displayOnePage, this.fluidbook.datas.bookmarkPermanentIcon)); } if (this.fluidbook.displayOnePage) { @@ -579,7 +579,7 @@ FluidbookLinks.prototype = { containerHeight = iframeHeight; } iframe.attr('height', height); - iframe.closest('.multimediaScale').css('height',height); + iframe.closest('.multimediaScale').css('height', height); container.css({maxHeight: Math.min(iframeHeight, containerHeight)}); if (!Modernizr.ftouch) { container.perfectScrollbar('update'); diff --git a/style/fluidbook.less b/style/fluidbook.less index 5ab214d9..d876fef1 100644 --- a/style/fluidbook.less +++ b/style/fluidbook.less @@ -1332,7 +1332,7 @@ html.ios body.portrait #interface { display: block; cursor: pointer; - &[data-enabled], &:hover { + &[data-enabled], &:hover, &.permanent { opacity: 1 !important; transition: none; } -- 2.39.5