From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Thu, 29 Apr 2021 18:52:08 +0000 (+0200)
Subject: wip #4440 @3
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=1553a058219a1e1a07ba19e083c8e524e4159cfd;p=fluidbook-html5.git

wip #4440 @3
---

diff --git a/js/libs/fluidbook/fluidbook.background.js b/js/libs/fluidbook/fluidbook.background.js
index 9efaafc3..7d6b3229 100644
--- a/js/libs/fluidbook/fluidbook.background.js
+++ b/js/libs/fluidbook/fluidbook.background.js
@@ -12,7 +12,7 @@ FluidbookBackground.prototype = {
             && this.fluidbook.settings.links.background !== ''
             && this.fluidbook.settings.mobileIgnoreBackgroundLinks === false) {
 
-            $("#background").prepend('<div class="links">' + this.fluidbook.settings.links.background + '</div>');
+            $("#background").prepend('<div class="links">' + this.fluidbook.loader.handleExtension(this.fluidbook.settings.links.background) + '</div>');
             this.hasLinks = true;
         }
 
diff --git a/js/libs/fluidbook/fluidbook.links.js b/js/libs/fluidbook/fluidbook.links.js
index 2c385de8..1c9f5d46 100644
--- a/js/libs/fluidbook/fluidbook.links.js
+++ b/js/libs/fluidbook/fluidbook.links.js
@@ -394,7 +394,7 @@ FluidbookLinks.prototype = {
         if (leftLinks) {
             links.prepend('<div class="leftContainer container"></div>');
             var leftContainer = links.find('.leftContainer');
-            leftContainer.html(this.fluidbook.settings.links[leftPage]);
+            leftContainer.html(this.fluidbook.loader.handleExtension(this.fluidbook.settings.links[leftPage]));
             if (this.fluidbook.settings.bookmark) {
                 leftContainer.append(this.fluidbook.bookmarks.getBookmarkForPage(leftPage, this.fluidbook.displayOnePage, this.fluidbook.settings.bookmarkPermanentIcon));
             }
@@ -402,7 +402,7 @@ FluidbookLinks.prototype = {
         if (rightLinks) {
             links.prepend('<div class="rightContainer container"></div>');
             var rightContainer = links.find('.rightContainer');
-            rightContainer.html(this.fluidbook.settings.links[rightPage]);
+            rightContainer.html(this.fluidbook.loader.handleExtension(this.fluidbook.settings.links[rightPage]));
             if (this.fluidbook.settings.bookmark) {
                 rightContainer.append(this.fluidbook.bookmarks.getBookmarkForPage(rightPage, this.fluidbook.displayOnePage, this.fluidbook.settings.bookmarkPermanentIcon));
             }
@@ -743,7 +743,7 @@ FluidbookLinks.prototype = {
 
     getLinkByHref: function (href) {
         for (var i = 1; i <= this.fluidbook.settings.pages; i++) {
-            var res = $(this.fluidbook.settings.links[i]).find('a[href="' + href + '"]');
+            var res = $(this.fluidbook.loader.handleExtension(this.fluidbook.settings.links[i])).find('a[href="' + href + '"]');
             if (res.length > 0) {
                 return res.eq('0');
             }
diff --git a/js/libs/fluidbook/fluidbook.loader.js b/js/libs/fluidbook/fluidbook.loader.js
index 9b814d67..3922d263 100644
--- a/js/libs/fluidbook/fluidbook.loader.js
+++ b/js/libs/fluidbook/fluidbook.loader.js
@@ -310,8 +310,8 @@ FluidbookLoader.prototype = {
                 $(page).show();
             }
 
-            $(page).children('.clinks').html(this.fluidbook.settings.clinks[pageNr]);
-            $(page).children('.ctlinks').html(this.fluidbook.settings.ctlinks[pageNr]);
+            $(page).children('.clinks').html(this.handleExtension(this.fluidbook.settings.clinks[pageNr]));
+            $(page).children('.ctlinks').html(this.handleExtension(this.fluidbook.settings.ctlinks[pageNr]));
             callback();
             return;
         }
@@ -325,11 +325,22 @@ FluidbookLoader.prototype = {
         var $this = this;
         this.loadDatas(pageNr, function () {
             $(page).addClass(position);
-            $(page).children('.clinks').html($this.fluidbook.settings.clinks[pageNr]);
-            $(page).children('.ctlinks').html($this.fluidbook.settings.ctlinks[pageNr]);
+            $(page).children('.clinks').html($this.handleExtension($this.fluidbook.settings.clinks[pageNr]));
+            $(page).children('.ctlinks').html($this.handleExtension($this.fluidbook.settings.ctlinks[pageNr]));
             callback();
         });
     },
+
+    handleExtension: function (content) {
+        var ext = this.fluidbook.settings.actualHtmlExtension;
+        if (ext === undefined || ext === null || ext === 'html') {
+            return content;
+        }
+        var res = content.replace(/data\/([^"]*)\.html/gm, "data/$1." + ext);
+        console.log('ext replaced', ext, content, res);
+        return res;
+    },
+
     loadPageShade: function (position) {
         return this.loadImage('images/shadows/pages/' + position + '.png', this.fluidbook.settings.width / 4, this.fluidbook.settings.height);
     },
@@ -464,7 +475,7 @@ FluidbookLoader.prototype = {
         }
 
         // Draw content links
-        var clinks = this.fluidbook.settings.clinks[page];
+        var clinks = this.handleExtension(this.fluidbook.settings.clinks[page]);
         if (clinks !== '') {
             $("body").append('<div id="texture_clinks">' + clinks + '</div>');
             $("#texture_clinks .contentLink").each(function () {
@@ -691,7 +702,7 @@ FluidbookLoader.prototype = {
             return;
         }
         var img = $(image).get(0);
-        if (img===undefined || img.complete || img.readyState === 'complete' || img.readyState === 4) {
+        if (img === undefined || img.complete || img.readyState === 'complete' || img.readyState === 4) {
             callback();
         }
     },
diff --git a/js/libs/fluidbook/fluidbook.menu.js b/js/libs/fluidbook/fluidbook.menu.js
index f6ac12a6..cc9c2ff2 100644
--- a/js/libs/fluidbook/fluidbook.menu.js
+++ b/js/libs/fluidbook/fluidbook.menu.js
@@ -207,7 +207,7 @@ FluidbookMenu.prototype = {
         var animateLinks = false;
         var uid = $(a).closest('[data-id]').data('id');
         if (this.fluidbook.settings.links['link_' + uid] !== undefined) {
-            links = '<div class="links">' + this.fluidbook.settings.links['link_' + uid] + '</div>';
+            links = '<div class="links">' + this.fluidbook.loader.handleExtension(this.fluidbook.settings.links['link_' + uid]) + '</div>';
             animateLinks = true;
         }
         view += '<div class="content"><div class="multimediaHolder"><div class="multimediaScale">';
@@ -530,7 +530,7 @@ FluidbookMenu.prototype = {
     },
     openArchives: function (title, callback) {
         var archives = this.getCaption(title, true, title === undefined || title === '' ? 'h0' : '');
-        archives += '<div class="content"><div class="image" id="archivesview"><img src="data/images/' + this.fluidbook.settings.externalArchives + '" /><div class="links">' + this.fluidbook.settings.links.archives + '</div></div></div>';
+        archives += '<div class="content"><div class="image" id="archivesview"><img src="data/images/' + this.fluidbook.settings.externalArchives + '" /><div class="links">' + this.fluidbook.loader.handleExtension(this.fluidbook.settings.links.archives) + '</div></div></div>';
         this.viewWrap(archives, 'archives', '', 'archives');
         if (callback != undefined) {
             callback();
diff --git a/js/libs/fluidbook/fluidbook.nav.js b/js/libs/fluidbook/fluidbook.nav.js
index 47bb7083..fc41b19e 100644
--- a/js/libs/fluidbook/fluidbook.nav.js
+++ b/js/libs/fluidbook/fluidbook.nav.js
@@ -695,7 +695,7 @@ FluidbookNav.prototype = {
 
         if (this.fluidbook.settings.afterSearch !== '' && this.fluidbook.settings.afterSearchDisplayForHTML && this.fluidbook.settings.themeEnableAfterSearch && navType === 'horizontalNav') {
             // Use the "afterSearch" image and links set in the theme and link editor
-            var afterSearchContent = '<div id="afterSearch"><div class="c">' + this.fluidbook.loader.getImage('data/images/' + this.fluidbook.settings.afterSearch) + '</div><div class="links">' + this.fluidbook.settings.links.aftersearch + '</div></li>';
+            var afterSearchContent = '<div id="afterSearch"><div class="c">' + this.fluidbook.loader.getImage('data/images/' + this.fluidbook.settings.afterSearch) + '</div><div class="links">' + this.fluidbook.loader.handleExtension(this.fluidbook.settings.links.aftersearch) + '</div></li>';
             $nav.after(afterSearchContent);
         }