From 82bee70d09b6efb0d3e0b37ef8e885e62dcd3767 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Mon, 12 Dec 2022 16:39:56 +0100 Subject: [PATCH] wip #5639 @3 --- resources/linkeditor/js/linkeditor.js | 4 +++- resources/linkeditor/js/linkeditor.links.js | 4 ++++ resources/linkeditor/js/linkeditor.utils.js | 4 ++-- resources/linkeditor/style/style.sass | 7 ++++--- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/resources/linkeditor/js/linkeditor.js b/resources/linkeditor/js/linkeditor.js index 6c387cf5d..7e1e3b13a 100644 --- a/resources/linkeditor/js/linkeditor.js +++ b/resources/linkeditor/js/linkeditor.js @@ -50,7 +50,9 @@ $.ajaxSetup({ }); function LinkEditor() { + this.mobileFirst = FLUIDBOOK_DATA.settings.mobileNavigationType === 'mobilefirst'; this.single = ['mobilefirst', 'portrait'].indexOf(FLUIDBOOK_DATA.settings.mobileNavigationType) >= 0; + this.pw = FLUIDBOOK_DATA.settings.width; this.ph = FLUIDBOOK_DATA.settings.height; this.fw = this.pw * (this.single ? 1 : 2); @@ -326,7 +328,7 @@ LinkEditor.prototype = { window.location.hash = '#' + this.currentPage; this.clearLinksAndRulers(); this.loader.loadPage(this.currentPage, 'left'); - if (!this.loader.single) { + if (!this.single) { this.loader.loadPage(this.currentPage + 1, 'right'); } $("#linkeditor-page-field input").val(this.currentPage); diff --git a/resources/linkeditor/js/linkeditor.links.js b/resources/linkeditor/js/linkeditor.links.js index aa7a81100..0a64a14d5 100644 --- a/resources/linkeditor/js/linkeditor.links.js +++ b/resources/linkeditor/js/linkeditor.links.js @@ -419,6 +419,10 @@ LinkeditorLinks.prototype = { loadLinks: function (page, side) { let $this = this; $.each(LINKS, function (uid, link) { + if ($this.linkeditor.single && page % 2 === 1 && link.page % 2 === 0 && link.left > $this.linkeditor.pw) { + link.page++; + link.left -= $this.linkeditor.pw; + } if (link.page != page) { return; } diff --git a/resources/linkeditor/js/linkeditor.utils.js b/resources/linkeditor/js/linkeditor.utils.js index 3c7023a2e..25454c371 100644 --- a/resources/linkeditor/js/linkeditor.utils.js +++ b/resources/linkeditor/js/linkeditor.utils.js @@ -13,12 +13,12 @@ LinkeditorUtils.prototype = { if (page % 2 === 1 && !this.linkeditor.single) { page--; } - return Math.max(0, Math.min(page, FLUIDBOOK_DATA.settings.pages)); + return Math.max(this.linkeditor.single ? 1 : 0, Math.min(page, FLUIDBOOK_DATA.settings.pages)); }, splitPages: function (str) { let res = []; - if(str===undefined || str===null){ + if (str === undefined || str === null) { return res; } str = str.toString(); diff --git a/resources/linkeditor/style/style.sass b/resources/linkeditor/style/style.sass index ecc074e61..b53c01da4 100644 --- a/resources/linkeditor/style/style.sass +++ b/resources/linkeditor/style/style.sass @@ -6,6 +6,7 @@ margin: 0 padding: 0 box-sizing: border-box + &:focus outline: 0 @@ -125,9 +126,9 @@ body, #linkeditor, html &.texts z-index: 2 - &#linkeditor-page-right - .simple & - display: none + &.single + #linkeditor-page-right + display: none #linkeditor-preload display: none -- 2.39.5