From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 14 Mar 2014 15:14:02 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=7388a857c7d8a65db8e0ab1ff5722ec11ff4bf1f;p=cubeextranet.git

---

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 483eec857..ff42734f7 100644
--- 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 450f5ea26..f3ad584e4 100644
--- 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 8ceb9b775..cddfc9e29 100644
--- a/index.php
+++ b/index.php
@@ -1,26 +1,25 @@
-<?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);
-?>
\ 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);