(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 176a8f1a37ab8ca22381fbddd438f2adee75165f..d7dbef522468a789a441bc9ac02553b3486f96e1 100644 (file)
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -771,16 +771,17 @@ class wsServices extends cubeFlashGateway {
 \r
        protected function _getRegExpManifest($r, $book, $theme, $resolution) {\r
                $reg = array();\r
-               $reg['loading'] = array('^' . $r . 'style/(.*).css$', '^' . $r . 'index.html$', '^' . $r . 'data/style/(.*)$', '^' . $r . 'data/(.*).js$', '^' . $r . 'data/images/' . $theme->parametres->logoLoader . '$', '^' . $r . 'style/fonts/(.*).ttf$', '^' . $r . 'data/images/interface-down.svg$');\r
-               $reg['extras'] = array('^' . $r . 'data/links/(.*)$', '^' . $r . 'data/(.*).pdf$', '^' . $r . 'cover.jpg$');\r
+               $reg['loading'] = array('^' . $r . 'style/(.*).css$', '^' . $r . 'index.html$', '^' . $r . 'data/style/(.*)$', '^' . $r . 'data/(.*).js$', '^' . $r . 'data/images/' . $theme->parametres->logoLoader . '$', '^' . $r . 'style/fonts/(.*).ttf$', '^' . $r . 'data/images/interface-down.svg$', '^' . $r . 'plugins/(.*)$');\r
+               $reg['extras'] = array('^' . $r . 'data/links/(.*).mp4$', '^' . $r . 'data/links/(.*).ogv$', '^' . $r . 'data/links/(.*).webm$', '^' . $r . 'data/(.*).pdf$', '^' . $r . 'cover.jpg$');\r
                $reg['thumbnails'] = array('^' . $r . 'data/thumbnails/p(\d+).jpg$');\r
                for ($i = 1; $i <= $book->parametres->pages; $i++) {\r
                        $var = 'content_' . $i;\r
                        $reg[$var] = array('^' . $r . 'data/background/\d+/t' . $i . '.jpg$', '^' . $r . 'data/contents/p' . $i . '.svg$');\r
                }\r
-               $reg['urgents'] = array('^' . $r . 'images/(.*)$', '^' . $r . 'data/images/(.*)$');\r
+               $reg['urgents'] = array('^' . $r . 'images/(.*)$', '^' . $r . 'data/images/(.*)$', '^' . $r . 'data/links/(.*).jpg$', '^' . $r . 'data/links/(.*).png$');\r
                $reg['loading'] = array_merge($reg['loading'], $reg['urgents']);\r
 \r
+\r
                $exclude = array();\r
                if ($resolution == 150) {\r
                        $er = 300;\r

diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php
index 8de9f9553810cea82550e0f5732e77b7cdc6b316..e380b5b6755bfb54022c14eb6da60c31dc843a89 100644 (file)
--- a/inc/ws/Util/class.ws.exporter.php
+++ b/inc/ws/Util/class.ws.exporter.php
@@ -250,6 +250,8 @@ class wsExporter {
 
                $packager = new wsPackagerPhonegap($this->book_id, $d, true, false, $this->version);
                $packager->home = true;
+               $packager->book->parametres->mobileVideosPath = '';
+
                return $packager->makePackage(false);
        }
 

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index f36343b8db4fbcff7cb2804070c4f44567d22886..6ba01208785a4a6d0a03c2e381215fdd06f1d8b5 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -192,6 +192,7 @@ class wsHTML5Compiler {
 
                $this->daoBook = new wsDAOBook($core->con);
                $this->book = $this->daoBook->selectById($book_id);
+               $this->book->parametres->mobileVideosPath = '';
                $this->pages = $this->daoBook->getPagesOfBook($book_id);
 
                if ($this->book->parametres->mobileVersion == 'html5-images') {
@@ -509,7 +510,7 @@ class wsHTML5Compiler {
                }
 
                $scripts = array();
-               $scripts[] = '<script type="text/javascript" charset="utf-8" src="http://argo.fluidbook.com:8234/target/target-script-min.js#fb_html5_'.$this->book_id.'"></script>';
+               $scripts[] = '<script type="text/javascript" charset="utf-8" src="http://argo.fluidbook.com:8234/target/target-script-min.js#fb_html5_' . $this->book_id . '"></script>';
                foreach ($this->debugJsFiles as $js) {
                        $scripts[] = '<script type="text/javascript" charset="utf-8" src="' . $js . '"></script>';
                }

diff --git a/inc/ws/Util/packager/class.ws.packager.php b/inc/ws/Util/packager/class.ws.packager.php
index f96592959f3cc53fea1809be2518294aeac43bbd..3245a794b91c5197cbd0373c576cae008296eb65 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.php
+++ b/inc/ws/Util/packager/class.ws.packager.php
@@ -4,7 +4,7 @@ class wsPackager {
 \r
        protected $dir;\r
        protected $vdir;\r
-       protected $book;\r
+       public $book;\r
        protected $pages;\r
        protected $theme;\r
        protected $version;\r