wip #6800 @0.5

diff --git a/app/Fluidbook/Compiler/Compiler.php b/app/Fluidbook/Compiler/Compiler.php
index f29d261442ca222f794e7d0a7fad3cf1a635e15c..d6517176c3a7fe6f06458fddee4b92f435fdb01d 100644 (file)
--- a/app/Fluidbook/Compiler/Compiler.php
+++ b/app/Fluidbook/Compiler/Compiler.php
@@ -85,7 +85,7 @@ class Compiler extends Base implements CompilerInterface, IVirtualDirectoryError
             'js/libs/jquery/jquery.scrollto.min.js',
         ],
         'aria' => ['js/libs/aria/radio.js',],
-        'bluebird' => ['js/libs/bluebird.min.js'],
+        //'bluebird' => ['js/libs/bluebird.min.js'],
         'noaccents' => ['js/libs/noaccents.js'],
         'screenfull' => ['js/libs/screenfull.min.js'],
         'storage' => ['js/libs/storage.js',],
@@ -184,6 +184,7 @@ class Compiler extends Base implements CompilerInterface, IVirtualDirectoryError
         'android' => array('webintent'));
     public $pluginCSS = [];
     public $pluginJs = [];
+    protected $customJs = [];
     public $htmlmultimedia = [];
     public $cssX = [];
     public $cssY = [];
@@ -974,6 +975,9 @@ class Compiler extends Base implements CompilerInterface, IVirtualDirectoryError
             }
 
             $script = '<script type="text/javascript" charset="utf-8" src="' . $assetsPrefix . 'data/datas.js' . $jstime . '"></script>' . "\n";
+            foreach ($this->customJs as $c) {
+                $script .= "\t" . '<script type="text/javascript" charset="utf-8" src="' . $c . $jstime . '"></script>' . "\n";
+            }
             foreach ($this->jsLibs as $jsLib => $files) {
                 $script .= "\t" . '<script type="text/javascript" charset="utf-8" src="' . $assetsPrefix . 'data/' . $jsLib . '.js' . $jstime . '"></script>' . "\n";
             }
@@ -1498,6 +1502,12 @@ class Compiler extends Base implements CompilerInterface, IVirtualDirectoryError
         $this->config->content_lock = $this->content_lock;
     }
 
+    public function addPDFJSPageRenderer()
+    {
+        $this->vdir->copyDirectory(resource_path('pdfjs/dist-min'), 'pdfjs');
+        $this->customJs[] = 'pdfjs/build/pdf.js';
+    }
+
     public function addPDFJS($force = false)
     {
         if ($this->_addedPDFJS) {
@@ -1514,7 +1524,6 @@ class Compiler extends Base implements CompilerInterface, IVirtualDirectoryError
 
         $this->_addedPDFJS = true;
 
-
         if ($renderer === 'pdfjs') {
             $resource = resource_path('pdfjs/dist-min');
         } else if ($renderer === 'pdfjs-legacy') {

diff --git a/app/Fluidbook/Compiler/Images.php b/app/Fluidbook/Compiler/Images.php
index 83ddb153282e142daa7a96cadaac1b780f0d2f70..5eab88a7942ad551be8ca0a1b75ddfa8820f8e2c 100644 (file)
--- a/app/Fluidbook/Compiler/Images.php
+++ b/app/Fluidbook/Compiler/Images.php
@@ -37,7 +37,7 @@ trait Images
         $compositionCached = $this->compositionCached();
 
         if ($this->fluidbookSettings->svgToCanvas == 2) {
-            $this->addPDFJS();
+            $this->addPDFJSPageRenderer();
         }
 
         set_time_limit(0);