From ecb78e13b0e98018afd5912a69ab6f0543527c8d Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 10 May 2019 19:38:48 +0200
Subject: [PATCH] wip #2720 @1

---
 js/libs/fluidbook/fluidbook.links.js |  4 ++--
 js/libs/fluidbook/fluidbook.menu.js  | 14 ++++++++++----
 style/mobilefirst.less               | 17 ++++++++++++++++-
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/js/libs/fluidbook/fluidbook.links.js b/js/libs/fluidbook/fluidbook.links.js
index a75ed686..89c1ee03 100644
--- a/js/libs/fluidbook/fluidbook.links.js
+++ b/js/libs/fluidbook/fluidbook.links.js
@@ -178,7 +178,7 @@ FluidbookLinks.prototype = {
             lClass = 'right';
         }
 
-        if (!this.fluidbook.displayOnePage && pageNr % 2 === 1) {
+        if (pageNr % 2 === 1) {
             pageNr--;
         }
 
@@ -186,7 +186,7 @@ FluidbookLinks.prototype = {
 
         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, this.fluidbook.displayOnePage, this.fluidbook.displayOnePage));
+            links.append(this.fluidbook.bookmarks.getBookmarkForPage(pageNr, false, this.fluidbook.displayOnePage));
         }
 
         links.prepend('<div class="leftContainer"></div><div class="rightContainer"></div>');
diff --git a/js/libs/fluidbook/fluidbook.menu.js b/js/libs/fluidbook/fluidbook.menu.js
index f39585de..08e597fb 100644
--- a/js/libs/fluidbook/fluidbook.menu.js
+++ b/js/libs/fluidbook/fluidbook.menu.js
@@ -595,11 +595,18 @@ FluidbookMenu.prototype = {
                 fullscreen = (w >= ww * 0.9);
                 break;
             case 'index':
-                fullscreen = true;
+                var indexWidth = Math.floor(ww / 230) * 230;
+                $("#indexViewHolder").css('width', indexWidth);
                 if (this.fluidbook.mobilefirst.enabled) {
-                    this.fluidbook.mobilefirst.resizeIndex();
+                    var cw = 130 * this.fluidbook.datas.pages;
+                    fullscreen = (cw >= ww * 0.9);
+                    if (!fullscreen) {
+                        w = cw+30;
+                    }
                 } else {
-                    $("#indexViewHolder").css('width', Math.floor(ww / 230) * 230);
+                    fullscreen = true;
+                    this.fluidbook.mobilefirst.resizeIndex();
+
                 }
                 break;
             case 'share':
@@ -844,7 +851,6 @@ FluidbookMenu.prototype = {
                 if (!this.fluidbook.datas.printFullBrochure) {
                     w = 560;
                 }
-
                 if (m.find('.print-dialogue').hasClass('compact')) {
                     w = 500;
                 }
diff --git a/style/mobilefirst.less b/style/mobilefirst.less
index 0b94341f..328209b4 100644
--- a/style/mobilefirst.less
+++ b/style/mobilefirst.less
@@ -36,7 +36,21 @@
 
   #links {
     &.right {
-      left: 0;
+      .bookmark {
+        &.right {
+          right: -@book-page-width;
+        }
+      }
+
+      .leftContainer {
+        display: none;
+      }
+    }
+
+    &.left {
+      .rightContainer {
+        display: none;
+      }
     }
   }
 
@@ -92,6 +106,7 @@
 
   .print-dialogue {
     margin-bottom: 20px;
+
     .print-option {
       flex-basis: 100%;
     }
-- 
2.39.5