wip #6800 @0.25

diff --git a/js/libs/fluidbook/fluidbook.loader.js b/js/libs/fluidbook/fluidbook.loader.js
index bae752d929eeb34d0f34bb9e9abff8c931c08f7e..b84761c0acd67c94ccb73e522f130a8c2ab56a3b 100644 (file)
--- a/js/libs/fluidbook/fluidbook.loader.js
+++ b/js/libs/fluidbook/fluidbook.loader.js
@@ -703,31 +703,6 @@ FluidbookLoader.prototype = {
                     ctx.fillStyle = "#FFFFFF";
                     ctx.fillRect(0, 0, dw, dh);
                 }
-                // Draw the texts if necessary
-                if ($this.getVersionToLoad(page) === 'textasvector' || $this.getVersionToLoad(page) === 'vector') {
-                    if ($this.fluidbook.support.pdftocanvas) {
-                        $this.renderPDFPageToCanvas(page, ctx, dw, dh, function () {
-                            afterTexts();
-                        });
-                    } else {
-                        try {
-                            var img = $this.texts[page];
-                            if (img !== undefined && img !== null) {
-                                img = img.get(0);
-                                if (img.width === 0) {
-                                    $this.deletePage(page);
-                                    $this._preloadPage(page, callback);
-                                    console.warn('failed to load page for drawing texture ', page);
-                                    return;
-                                }
-                                ctx.drawImage(img, -1, 0, dw + 2, dh);
-                            }
-                        } catch (e) {
-                            console.warn(e);
-                        }
-                        afterTexts();
-                    }
-                }
 
                 var afterTexts = function () {
                     // Draw content links
@@ -855,6 +830,34 @@ FluidbookLoader.prototype = {
                     }
                 };
 
+                // Draw the texts if necessary
+                if ($this.getVersionToLoad(page) === 'textasvector' || $this.getVersionToLoad(page) === 'vector') {
+                    if ($this.fluidbook.support.pdftocanvas) {
+                        $this.renderPDFPageToCanvas(page, ctx, dw, dh, function () {
+                            afterTexts();
+                        });
+                    } else {
+                        try {
+                            var img = $this.texts[page];
+                            if (img !== undefined && img !== null) {
+                                img = img.get(0);
+                                if (img.width === 0) {
+                                    $this.deletePage(page);
+                                    $this._preloadPage(page, callback);
+                                    console.warn('failed to load page for drawing texture ', page);
+                                    return;
+                                }
+                                ctx.drawImage(img, -1, 0, dw + 2, dh);
+                            }
+                        } catch (e) {
+                            console.warn(e);
+                        }
+                        afterTexts();
+                    }
+                }
+
+
+
 
             } else {
                 callback();