]> _ Git - fluidbook-html5.git/commitdiff
wip #6269 @0.5
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 4 Oct 2023 08:57:57 +0000 (10:57 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 4 Oct 2023 08:57:57 +0000 (10:57 +0200)
_index.html
js/libs/fluidbook/fluidbook.links.js
js/libs/fluidbook/fluidbook.loader.js

index 8a934c9628801edb52a80791bfe4a23f7bba13c8..847eb455b1e7ab7328199038033e97d688878efc 100644 (file)
 <div id="ol" aria-hidden="true"></div>
 <canvas id="pscanvas" width="4096" height="4096" aria-hidden="true"></canvas>
 <div id="loader" aria-hidden="true"></div>
-<div id="hiddencontents" aria-hidden="true"><!-- $hiddenContents --></div>
+<div id="hiddencontents" aria-hidden="true"></div>
 <div id="splash" style="background-color:#<!-- $bgcolor -->;<!-- $splashstyles -->" aria-hidden="true">
     <!-- $splash --></div>
 <div id="popinOverlay" aria-hidden="true"></div>
index f5cfacee183328000d2f3960d8516b160e126ead..937857050b6213bdf8e7314cbfe0d3f1c7afda34 100644 (file)
@@ -30,6 +30,7 @@ function FluidbookLinks(fluidbook) {
 
 FluidbookLinks.prototype = {
     init: function () {
+        $("#hiddencontents").html(this.fluidbook.settings.hiddenContents);
         this.jumpToPageContainingLink = true;
         var $this = this;
 
index 910fff22cdf421b8779e6fbf94971940d40de6d8..c4586689a68fcb891209aaa3711cce06552ae319 100644 (file)
@@ -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) {