(no commit message)

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