(no commit message)

diff --git a/fluidbook/compile/_js/fluidbook.js b/fluidbook/compile/_js/fluidbook.js
index c9897fcbebb6800c82606828e14e5174985ad77a..dadd95db7bc5ea3c34f98fa7037fe9d82cac3229 100644 (file)
--- a/fluidbook/compile/_js/fluidbook.js
+++ b/fluidbook/compile/_js/fluidbook.js
@@ -183,10 +183,15 @@ function redirectPDF() {
 }\r
 \r
 function redirectMobile() {\r
+       var page = '';\r
        var get = parseGet();\r
        var html = 'index.html';\r
        if (get['widget'] != undefined && get['widget'] == '1') {\r
                html = 'widget.html';\r
+               page = '?';\r
+               if (get['backgroud'] != undefined) {\r
+                       page += "background=" + get['background'];\r
+               }\r
        }\r
        var pageNr = 0;\r
        if (get.page != undefined) {\r
@@ -200,7 +205,7 @@ function redirectMobile() {
                }\r
        }\r
 \r
-       var page = '';\r
+\r
        if (pageNr > 0) {\r
                page = '#/page/' + pageNr;\r
        }\r

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index ff6b8f6694f2aa08db27f42581980b2d15daaea3..242fb8ea27a562b7d7f67504afa1ea2d3bdd7f66 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -879,7 +879,9 @@ class wsAjax extends cubeAjax {
                fb($_POST);\r
 \r
                $dest = array('dir' => null, 'file' => null);\r
-               $dest = array_merge($dest, $_POST['destination']);\r
+               if (isset($_POST['destination']) && is_array($_POST['destination'])) {\r
+                       $dest = array_merge($dest, $_POST['destination']);\r
+               }\r
 \r
                $exporter = new wsExporter();\r
                $exporter->export($_POST['book_id'], $x, $_POST['action'], $_POST['version'], $dest['dir'], $dest['file']);\r

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 2b2ed28b85ea60d010a9e409798d2bd9a4683267..618db597c78130aa63de4d400293f6a9e9cfa855 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -578,7 +578,8 @@ class wsHTML5Compiler {
                // Write widget html
                if ($this->widget) {
                        $whtml = file_get_contents($this->assets . '/widget.html');
-                       $script = '<script type="text/javascript" charset="utf-8" src="data/widget.js"></script>';
+                       $script = '<script type="text/javascript" charset="utf-8" src="data/datas.js"></script>';
+                       $script .= '<script type="text/javascript" charset="utf-8" src="data/widget.js"></script>';
 
                        $style = '<link type="text/css" rel="stylesheet" href="style/widget.css">';
                        $vars = array('titre', 'style', 'script');
@@ -745,7 +746,8 @@ class wsHTML5Compiler {
        }
 
        protected function writeJs() {
-               file_put_contents($this->vdir . '/data/datas.js', $this->writeConfig());
+               $config = $this->writeConfig();
+               file_put_contents($this->vdir . '/data/datas.js', $config);
                $finals = array('fluidbook' => $this->jsFiles);
                if ($this->widget) {
                        $finals['widget'] = $this->widgetJsFiles;
@@ -954,7 +956,7 @@ class wsHTML5Compiler {
                $c->execute();
 
                $convert = new cubeCommandLine('composite');
-               $cmd.= '-compose Multiply ';
+               $cmd = '-compose Multiply ';
                $cmd.=$tmp . ' ' . $orig . ' ';
                $cmd.=$this->vdir . '/cover.jpg';
                $convert->setManualArg($cmd);