From 81af55b6ab764b33e4c0eae7a208cbf806982be4 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Tue, 28 May 2019 21:39:08 +0200
Subject: [PATCH] wip #2806 @3

---
 js/libs/fluidbook/fluidbook.links.js | 29 ++++++++++++++--------------
 style/fluidbook.less                 | 19 ++++++++++++++----
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/js/libs/fluidbook/fluidbook.links.js b/js/libs/fluidbook/fluidbook.links.js
index d97b2b91..18fc30be 100644
--- a/js/libs/fluidbook/fluidbook.links.js
+++ b/js/libs/fluidbook/fluidbook.links.js
@@ -169,31 +169,32 @@ FluidbookLinks.prototype = {
 
     },
     initLinks: function (pageNr) {
+
         if (pageNr === undefined) {
             pageNr = this.fluidbook.currentPage;
         }
 
-        var lClass = 'left';
-        if (this.fluidbook.displayOnePage) {
-            if (pageNr % 2 === 1) {
-                lClass = 'right';
-            }
+        var rightPage, leftPage;
+        if (pageNr % 2 === 0) {
+            leftPage = pageNr;
+            rightPage = pageNr + 1;
         } else {
-            if (pageNr % 2 === 1) {
-                pageNr--;
-            }
+            rightPage = pageNr;
+            leftPage = pageNr - 1;
         }
 
-        var links = $("#links");
-
-        links.removeClass('left').removeClass('right').addClass(lClass).html(this.fluidbook.datas.links[pageNr]).show();
+        var links = $("#links").removeClass('right');
+        $(links).html('').show();
+        if (this.fluidbook.displayOnePage && pageNr % 2 === 1 && this.fluidbook.l10n.dir==='ltr') {
+            $(links).addClass('right')
+        }
         if (this.fluidbook.datas.bookmark) {
             links.append(this.fluidbook.bookmarks.getBookmarkForPage(pageNr, this.fluidbook.displayOnePage, this.fluidbook.displayOnePage));
         }
 
-        links.prepend('<div class="leftContainer"></div><div class="rightContainer"></div>');
-        links.find('.rightContainer').append(links.children('.link.odd'));
-        links.find('.leftContainer').append(links.children('.link'));
+        links.prepend('<div class="leftContainer container"></div><div class="rightContainer container"></div>');
+        links.find('.rightContainer').html(this.fluidbook.datas.links[rightPage]);
+        links.find('.leftContainer').html(this.fluidbook.datas.links[leftPage]);
         if (links.find('.link.multimedia iframe').length > 0) {
             this.fluidbook.networkControl.pause(30000);
         }
diff --git a/style/fluidbook.less b/style/fluidbook.less
index ace5b0d8..5ee0c23f 100644
--- a/style/fluidbook.less
+++ b/style/fluidbook.less
@@ -217,6 +217,19 @@ body, html {
   }
 }
 
+#links {
+  .container {
+    position: absolute;
+    top: 0;
+    width: @book-page-width;
+    height: @book-page-height;
+
+    &.rightContainer {
+      left:  @book-page-width;
+    }
+  }
+}
+
 #links .link {
   cursor: auto;
 
@@ -1213,15 +1226,13 @@ html.ios body.portrait #interface {
   background-color: rgba(0, 0, 0, 0.001);
 }
 
-.rtl #pages.double #links {
+.rtl  #links {
   .leftContainer {
-    position: relative;
     left: 50%;
   }
 
   .rightContainer {
-    position: relative;
-    left: -50%;
+    left: 0;
   }
 }
 
-- 
2.39.5