From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Thu, 13 Mar 2025 18:30:52 +0000 (+0100)
Subject: wip #7390 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=282e9a1508ba3042fe3f6b3c083976e03cff7e43;p=fluidbook-html5.git

wip #7390 @0.5
---

diff --git a/js/libs/fluidbook/fluidbook.bookmarks.js b/js/libs/fluidbook/fluidbook.bookmarks.js
index 66d41168..3c9eb3b6 100644
--- a/js/libs/fluidbook/fluidbook.bookmarks.js
+++ b/js/libs/fluidbook/fluidbook.bookmarks.js
@@ -135,7 +135,7 @@ FluidbookBookmarks.prototype = {
     },
 
     getPDF: function () {
-        return this.fluidbook.service.getBaseURL(true) + 'e/' + this.fluidbook.settings.cid + '/' + this.getBookmarksCompacted();
+        return this.fluidbook.service.getBaseURL(true) + 'e/'+this.fluidbook.settings.id+'-' +this.fluidbook.settings.cid + '/' + this.getBookmarksCompacted();
     },
 
     getBookmarksCompacted: function () {
diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js
index 5d036fc9..ee41027a 100644
--- a/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@ -854,7 +854,7 @@ Fluidbook.prototype = {
         var pdfName;
 
         if (this.settings.pages != this.contentlock.getMaxPage()) {
-            pdf = this.service.getBaseURL(true) + 'e/' + this.settings.cid + '/1-' + this.contentlock.getMaxPage();
+            pdf = this.service.getBaseURL(true) + 'e/'+this.settings.id+'-' + this.settings.cid + '/1-' + this.contentlock.getMaxPage();
         } else if (this.settings.pdfName.substr(0, 4) === 'http') {
             pdf = this.settings.pdfName;
         } else {
diff --git a/js/libs/fluidbook/fluidbook.print.js b/js/libs/fluidbook/fluidbook.print.js
index 7ae5e147..8b6af2fb 100644
--- a/js/libs/fluidbook/fluidbook.print.js
+++ b/js/libs/fluidbook/fluidbook.print.js
@@ -24,7 +24,7 @@ FluidbookPrint.prototype = {
             var element = $(this);
             var mode = element.data('mode'); // Either 'print' or 'download'
             var print = (mode === 'print');
-            var dynamicPDF = $this.fluidbook.service.getBaseURL(true) + (print ? 'ep' : 'e') + '/' + $this.fluidbook.settings.cid + '/';
+            var dynamicPDF = $this.fluidbook.service.getBaseURL(true) + (print ? 'ep' : 'e') + '/' +$this.fluidbook.settings.id + '-' + $this.fluidbook.settings.cid + '/';
             var leftPageNumber = $this.fluidbook.getPhysicalPageNumberOfSide('left');
             var rightPageNumber = $this.fluidbook.getPhysicalPageNumberOfSide('right');
             var choice = $('input[name="pageChoice"]:checked').val();