From: Vincent Vanwaelscappel Date: Wed, 4 Oct 2023 08:57:57 +0000 (+0200) Subject: wip #6269 @0.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=d1424f276955c56602983129898259bb99ef8978;p=fluidbook-html5.git wip #6269 @0.5 --- diff --git a/_index.html b/_index.html index 8a934c96..847eb455 100644 --- a/_index.html +++ b/_index.html @@ -114,7 +114,7 @@ - + diff --git a/js/libs/fluidbook/fluidbook.links.js b/js/libs/fluidbook/fluidbook.links.js index f5cfacee..93785705 100644 --- a/js/libs/fluidbook/fluidbook.links.js +++ b/js/libs/fluidbook/fluidbook.links.js @@ -30,6 +30,7 @@ function FluidbookLinks(fluidbook) { FluidbookLinks.prototype = { init: function () { + $("#hiddencontents").html(this.fluidbook.settings.hiddenContents); this.jumpToPageContainingLink = true; var $this = this; diff --git a/js/libs/fluidbook/fluidbook.loader.js b/js/libs/fluidbook/fluidbook.loader.js index 910fff22..c4586689 100644 --- a/js/libs/fluidbook/fluidbook.loader.js +++ b/js/libs/fluidbook/fluidbook.loader.js @@ -26,10 +26,15 @@ FluidbookLoader.prototype = { init: function (callback) { let $this = this; if (this.fluidbook.settings.hosting_loadbalancer) { + + $this.loadbalancing = ['s1.lb.fluidbook.com']; + this._loadbalancingServerURL = this.fluidbook.cache.get('_loadbalancingServerURL', {}); + setInterval(function () { $this.fluidbook.cache.set('_loadbalancingServerURL', $this._loadbalancingServerURL); }, 15000); + $.ajax("https://toolbox.fluidbook.com/lb.json").done(function (data) { $this.loadbalancing = data; $this.loadShades(callback); @@ -37,6 +42,7 @@ FluidbookLoader.prototype = { $this.loadbalancing = false; $this.loadShades(callback); }); + } else { this.loadShades(callback); } @@ -47,7 +53,6 @@ FluidbookLoader.prototype = { }, loadShades: function (callback) { - console.log('load shades'); this.shadeLeft = this.loadImage(this.getURL('images/shadows/pages/left.png')); this.shadeRight = this.loadImage(this.getURL('images/shadows/pages/right.png')); if (callback) {