(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 483eec857874638632d33bc244b9db4aab687eef..ff42734f7aee8a0755c683e2ec352d171f92da2a 100644 (file)
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -645,6 +645,10 @@ class wsServices extends cubeFlashGateway {
                $resolution = $this->callArgs[2];
                $local = (isset($this->callArgs[3])) ? $this->callArgs[3] : null;
 
+               if (is_null($resolution)) {
+                       $resolution = 150;
+               }
+
                if ($id == 4) {
                        $resolution = 150;
                }

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 450f5ea262232d04c0063eeac51aaebc6458c8bc..f3ad584e4f9e43bbfc4fe00da79711d6eeada301 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -69,7 +69,8 @@ class wsHTML5Compiler {
                'js/main.js');
        public $debugJsFiles = array(
                'js/libs/Three.js',
-               'data/search.js'
+               'data/search.index.js',
+               'data/search.texts.js',
        );
        public $testJsFiles = array(
                'js/libs/cube/fb.js',
@@ -489,7 +490,10 @@ class wsHTML5Compiler {
                $script = '';
                $script .= '<script type="text/javascript" charset="utf-8" src="data/datas.js"></script>' . "\n";
                $script .= '<script type="text/javascript" charset="utf-8" src="data/fluidbook.js"></script>' . "\n";
-               $script .= '<script type="text/javascript" charset="utf-8" src="data/search.js"></script>' . "\n";
+               if ($this->book->parametres->search) {
+                       $script .= '<script type="text/javascript" charset="utf-8" src="data/search.index.js"></script>' . "\n";
+                       $script .= '<script type="text/javascript" charset="utf-8" src="data/search.texts.js"></script>' . "\n";
+               }
                foreach ($this->pluginJs as $p) {
                        $script .= '<script type="text/javascript" charset="utf-8" src="' . $p . '"></script>' . "\n";
                }
@@ -797,10 +801,11 @@ class wsHTML5Compiler {
 
        public function writeTexts() {
                $this->daoBook->makeTextsIndexes($this->book, $this->pages, $index, $textes);
-               $js = 'var INDEX=' . $index . ';' . "\r";
-               $js .= 'var TEXTS=' . $textes . ';' . "\r";
+               $jsindex = 'var INDEX=' . $index . ';' . "\r";
+               $jstexts = 'var TEXTS=' . $textes . ';' . "\r";
 
-               file_put_contents($this->vdir . '/data/search.js', $js);
+               file_put_contents($this->vdir . '/data/search.index.js', $jsindex);
+               file_put_contents($this->vdir . '/data/search.texts.js', $jstexts);
        }
 
        public function supportSVG() {
@@ -1278,7 +1283,7 @@ class wsHTML5Compiler {
 
        public function copyLinkFile($source, $dest, $video = false) {
                if ($video && $this->book->parametres->mobileVideosPath != '') {
-                       
+
                }
 
                $origDir = $this->wdir;
@@ -1314,7 +1319,7 @@ class wsHTML5Compiler {
        }
 
        public function __destruct() {
-               
+
        }
 
        public static function colorToArray($color, $forceAlpha = null) {
@@ -1341,5 +1346,5 @@ class wsHTML5Compiler {
 }
 
 class wsHTML5CompilerDev extends wsHTML5Compiler {
-       
+
 }

diff --git a/index.php b/index.php
index 8ceb9b775dc559cd0b4c8dcdc84f5d9cc4b1f252..cddfc9e29cff57203ed3e9a57887eff3a1b5c71e 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,26 +1,25 @@
-<?php\r
-\r
-require_once(dirname(__FILE__) . '/inc/prepend.php');\r
-ob_start();\r
-\r
-header('Access-Control-Allow-Origin: *');\r
-\r
-$meta = array();\r
-$js[] = JS_PATH . '/common.js';\r
-$js[] = JS_PATH . '/' . MODE . '.js';\r
-$jsvar['IMG'] = IMG;\r
-$jsvar['SITE_PATH'] = SITE_PATH;\r
-\r
-$css[] = WEBROOT . '/style/common.css';\r
-$css[] = CSS_PATH . '/style.css';\r
-\r
-$meta['viewport'] = 'width=device-width, initial-scale=1, maximum-scale=1';\r
-\r
-$standard = 'XHTML 1.0 Transitional';\r
-\r
-echo $core->url->getDocument();\r
-$buffer = ob_get_contents();\r
-\r
-ob_clean();\r
-echo cubePage::page($buffer, $js, $jsvar, $css, array(), 9, false, $meta, array(), $standard);\r
-?>
\ No newline at end of file
+<?php
+
+require_once(dirname(__FILE__) . '/inc/prepend.php');
+ob_start();
+
+header('Access-Control-Allow-Origin: *');
+
+$meta = array();
+$js[] = JS_PATH . '/common.js';
+$js[] = JS_PATH . '/' . MODE . '.js';
+$jsvar['IMG'] = IMG;
+$jsvar['SITE_PATH'] = SITE_PATH;
+
+$css[] = WEBROOT . '/style/common.css';
+$css[] = CSS_PATH . '/style.css';
+
+$meta['viewport'] = 'width=device-width, initial-scale=1, maximum-scale=1';
+
+$standard = 'XHTML 1.0 Transitional';
+
+echo $core->url->getDocument();
+$buffer = ob_get_contents();
+
+ob_clean();
+echo cubePage::page($buffer, $js, $jsvar, $css, array(), 9, false, $meta, array(), $standard);