wait #6797 @0:20

diff --git a/js/libs/fluidbook/fluidbook.loader.js b/js/libs/fluidbook/fluidbook.loader.js
index 18d7b7ae95b3a2ad9a9688695aafaef7c6426b82..3c9cb27e40c729980cff42dd17f5a479beeea3d5 100644 (file)
--- a/js/libs/fluidbook/fluidbook.loader.js
+++ b/js/libs/fluidbook/fluidbook.loader.js
@@ -909,7 +909,7 @@ FluidbookLoader.prototype = {
         }
         var $this = this;
 
-        var upscale = this.fluidbook.settings.svgToCanvasUpscale !== undefined ? this.fluidbook.settings.svgToCanvasUpscale : 1;
+        var upscale = this.fluidbook.settings.svgToCanvasUpscale !== undefined ? parseFloat(this.fluidbook.settings.svgToCanvasUpscale) : 1;
 
         var z = window.devicePixelRatio * upscale;
         var mz = this.fluidbook.zoom.max * window.devicePixelRatio * upscale * 1.1;
@@ -986,10 +986,12 @@ FluidbookLoader.prototype = {
             }
             $(this).data('w', cw).data('h', ch);
 
+            let textThickness = parseFloat($this.fluidbook.settings.textsThickness);
+
             if (!$(this).hasClass('z') && $this.fluidbook.settings.textsThickness > 1 && $this.fluidbook.settings.textsThicknessPages.indexOf(page) >= 0) {
                 $('canvas:not(.z)[data-page=' + page + '].thick').remove();
                 var clone;
-                for (var i = 1; i <= $this.fluidbook.settings.textsThickness; i++) {
+                for (var i = 1; i <= textThickness; i++) {
                     clone = $this._cloneCanvas($(this).get(0));
                     $(clone).insertBefore($(this));
                 }
@@ -1011,6 +1013,16 @@ FluidbookLoader.prototype = {
         dest.width = source.width;
         dest.height = source.height;
 
+        if ($(source).css('transform') === 'none') {
+            $(dest).hide();
+            let interval = setInterval(function () {
+                if ($(source).css('transform') !== 'none') {
+                    $(dest).show().css('transform', $(source).css('transform'));
+                    clearInterval(interval);
+                }
+            }, 10);
+        }
+
         $(dest).addClass('thick').addClass('p').attr('data-page', $(source).attr('data-page')).css('transform', $(source).css('transform'));
 
         //apply the old canvas to the new one
@@ -1054,8 +1066,7 @@ FluidbookLoader.prototype = {
     },
 
     checkLoadedThumbs: function () {
-        var res = this.loadedThumbnails.length === this.fluidbook.settings.pages;
-        return res;
+        return this.loadedThumbnails.length === this.fluidbook.settings.pages;
     },
 
     preloadThumbs: function (callback) {