(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 8b803e7d94b4b3d8adb3479adfef5c2351b25540..3422822634d846b95462a584c48a854e8d6290be 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -232,7 +232,7 @@ class wsUrl {
                        $viewers = array('viewer' => array('title' => __('Version Flash'), 'icon' => cubeMedia::image(IMG . '/flash.png')),\r
                                'viewerh' => array('title' => __('Version HTML5'), 'icon' => cubeMedia::image(IMG . '/html5.png')),\r
                                'vieweru' => array('title' => __('Version Flash') . ' (' . __('debuggage') . ')', 'icon' => cubeMedia::image(IMG . '/flashbug.png')),\r
-                               'viewerhu' => array('title' => __('Version HTML5') . ' (' . __('debuggage') . ')', 'icon' => cubeMedia::image(IMG . '/html5bug.png')),\r
+                               'viewerht' => array('title' => __('Version HTML5') . ' (' . __('debuggage') . ')', 'icon' => cubeMedia::image(IMG . '/html5bug.png')),\r
                                'viewer1' => array('title' => __('Version 1'), 'icon' => cubeMedia::image(IMG . '/flash.png'))\r
                        );\r
                }\r

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index ca72b3a70a145053b546116750244b9bf7b8adcd..f267c8a34432d818edf5009c73ffb983d9817e9d 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -12,12 +12,10 @@ class wsHTML5Compiler {
                'js/libs/jquery/jquery.mousewheel.js',
                'js/libs/jquery/jquery.hashchange.js',
                'js/libs/fluidbook/fluidbook.utils.js',
-               'js/libs/fluidbook/fluidbook.cache.js',
                'js/libs/fluidbook/fluidbook.support.js',
                'js/libs/fluidbook/fluidbook.viewport.js',
                'js/libs/fluidbook/fluidbook.desktop.js',
                'js/libs/fluidbook/fluidbook.service.js',
-               'js/libs/fluidbook/fluidbook.loader.js',
                'js/libs/fluidbook/fluidbook.l10n.js',
                'js/libs/fluidbook/fluidbook.nav.js',
                'js/libs/fluidbook/fluidbook.js',
@@ -250,21 +248,22 @@ class wsHTML5Compiler {
                $scripts[] = '<script type="text/javascript" src="data/datas.js"></script>';
                $script_test = implode("\n\t\t", $scripts);
 
+               $thtml = $uhtml;
+
                $vars = array('titre', 'credits', 'ga', 'style', 'script');
                foreach ($vars as $v) {
                        $uhtml = str_replace('<!-- $' . $v . ' -->', $$v, $uhtml);
                }
 
-               $thtml = file_get_contents(WS_COMPILE_ASSETS . '/_html5/tester.html');
-
-               $vars = array('titre', 'credits', 'ga', 'style', 'script_test');
+               $script.="\n\t\t" . '<script type="text/javascript">window.tester = true;</script>';
+               $vars = array('titre', 'credits', 'ga', 'style', 'script');
                foreach ($vars as $v) {
                        $thtml = str_replace('<!-- $' . $v . ' -->', $$v, $thtml);
                }
 
                file_put_contents($this->vdir . '/index.html', $html);
                file_put_contents($this->vdir . '/indexu.html', $uhtml);
-               file_put_contents($this->vdir . '/indext.html', $thtml);
+               file_put_contents($this->vdir . '/indext.html', $uhtml);
        }
 
        protected function writeLangs() {