fix #2774 @0.5

diff --git a/js/libs/fluidbook/fluidbook.bookmarks.js b/js/libs/fluidbook/fluidbook.bookmarks.js
index fbcf492e6dda99af3fb7498e8dc82d736e887548..146553e70df4d62a71419fb8e412128df98ccbe9 100644 (file)
--- 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 b547f7eba52e35425d24870608558f873150a12d..f348c3cd7042a924b90bda9941d4a0eece704c26 100644 (file)
--- 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('<div class="leftContainer"></div><div class="rightContainer"></div>');

diff --git a/js/libs/fluidbook/fluidbook.mobilefirst.js b/js/libs/fluidbook/fluidbook.mobilefirst.js
index dbf915b4af62a915f6c0179a96eed6a3a06672be..ca4eea0a15256c032a0eed226ac21ae62aaaf2e8 100644 (file)
--- 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('<div id="scroll"></div>');
         this.init();
         this.slider = new FluidbookMobileFirstSlider(this);