wait #6910 @2

diff --git a/js/libs/fluidbook/fluidbook.loader.js b/js/libs/fluidbook/fluidbook.loader.js
index 0d57815ed57a9f9354f6c4b28ea1ba3926b8bfda..4f494b92f26dd005273f17e1bd881b20171c7e22 100644 (file)
--- a/js/libs/fluidbook/fluidbook.loader.js
+++ b/js/libs/fluidbook/fluidbook.loader.js
@@ -936,7 +936,7 @@ FluidbookLoader.prototype = {
     },
 
     loadPDFForTexts: function (callback) {
-        if (this.fluidbook.settings.svgToCanvas != 2) {
+        if (!this.fluidbook.support.pdftocanvas) {
             callback();
             return;
         }

diff --git a/js/libs/fluidbook/fluidbook.support.js b/js/libs/fluidbook/fluidbook.support.js
index f2108dae1ac6828db9b322368b105818cf7cd39a..7a09deaa2ed09a7247aaccd6a00fbb1d0585873c 100644 (file)
--- a/js/libs/fluidbook/fluidbook.support.js
+++ b/js/libs/fluidbook/fluidbook.support.js
@@ -16,7 +16,7 @@ function FluidbookSupport(fluidbook) {
     this.chromeBased = Modernizr.chrome || this.edge;
     this.gpuInfos = this.getGPUInfos();
     this.svgtocanvas = this.fluidbook.settings.svgToCanvas == 1 && this.IE === 0 && !(this.safari && this.macOs) && this.getGPUInfos().vendor.indexOf('intel') === -1 && this.getGPUInfos().vendor.indexOf('renderer') === -1;
-    this.pdftocanvas = this.fluidbook.settings.svgToCanvas == 2;
+    this.pdftocanvas = window.pdfjsLib !== undefined && this.fluidbook.settings.svgToCanvas == 2;
 
     // If in node-webkit or if the index.html fluidbook is locally open in a browser
     this.offline = (typeof process !== "undefined" && process.versions['node-webkit']) || window.location.toString().indexOf("file://") == 0;