From 84d12752d3427bb2f5bc8b085fcb55f28460a094 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 7 Apr 2011 10:11:28 +0000
Subject: [PATCH]

---
 .../packager/class.ws.packager.html.php       | 44 ++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/inc/ws/Controlleur/packager/class.ws.packager.html.php b/inc/ws/Controlleur/packager/class.ws.packager.html.php
index 36621fe45..26a20158d 100644
--- a/inc/ws/Controlleur/packager/class.ws.packager.html.php
+++ b/inc/ws/Controlleur/packager/class.ws.packager.html.php
@@ -8,18 +8,60 @@ class wsPackagerHTML extends wsPackager {
 		$this->version = 'html';
 	}
 
+	protected function mergeJavascript()
+	{
+		$dest = WS_COMPILE_ASSETS . '/fluidbook.js';
+		$orig = WS_COMPILE_ASSETS . '/_js/';
+		$files = array('swfobject.js' => false, 'swfaddress.js' => false, 'fluidbook.js' => true);
+
+		$refresh = false;
+		if (file_exists($dest)) {
+			$mtime = filemtime($dest);
+			foreach($files as $file => $min) {
+				if (filemtime($orig . $file) > $mtime) {
+					$refresh = true;
+					break;
+				}
+			}
+		} else {
+			$refresh = true;
+		}
+
+		$refresh=true;
+
+		if (!$refresh) {
+			return;
+		}
+
+		$minjs = '';
+		foreach($files as $file => $min) {
+
+			$c = file_get_contents($orig . $file);
+			if ($min) {
+				$c = JSMin::minify($c);
+			}
+			fb($c,$file);
+			$minjs .= $c;
+		}
+		fb($minjs);
+		file_put_contents($dest, $minjs);
+	}
+
 	protected function preparePackage()
 	{
 		parent::preparePackage();
 
 		$this->copyFluidbookFiles();
+		$this->mergeJavascript();
+
 		$this->copyOtherFiles(array('fluidbook.js', 'getflash.gif', 'index.html', 'index.swf', 'player.swf', 'style.css'));
 
 		mkdir($this->vdir . '/pages/', 0777, true);
 
 		$ga = '';
 		if ($this->book->parametres->googleAnalytics != '') {
-			$ga = cubePage::googleAnalytics(explode(',', $this->book->parametres->googleAnalytics));
+			$variables = array('Language' => array('value' => 'getLang()', 'valueAsJS' => true, 'scope' => 2));
+			$ga = cubePage::googleAnalytics(explode(',', $this->book->parametres->googleAnalytics), true, $variables);
 		}
 
 		$facebook = '';
-- 
2.39.5