From 8d32cf178be214b0e5251c4face3a7f131c7e5a5 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Sun, 26 Feb 2012 12:50:26 +0000 Subject: [PATCH] --- inc/ws/Controlleur/class.ws.url.php | 2 +- inc/ws/Util/html5/class.ws.html5.compiler.php | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php index 8b803e7d9..342282263 100644 --- 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')), 'viewerh' => array('title' => __('Version HTML5'), 'icon' => cubeMedia::image(IMG . '/html5.png')), 'vieweru' => array('title' => __('Version Flash') . ' (' . __('debuggage') . ')', 'icon' => cubeMedia::image(IMG . '/flashbug.png')), - 'viewerhu' => array('title' => __('Version HTML5') . ' (' . __('debuggage') . ')', 'icon' => cubeMedia::image(IMG . '/html5bug.png')), + 'viewerht' => array('title' => __('Version HTML5') . ' (' . __('debuggage') . ')', 'icon' => cubeMedia::image(IMG . '/html5bug.png')), 'viewer1' => array('title' => __('Version 1'), 'icon' => cubeMedia::image(IMG . '/flash.png')) ); } diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php index ca72b3a70..f267c8a34 100644 --- 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_test = implode("\n\t\t", $scripts); + $thtml = $uhtml; + $vars = array('titre', 'credits', 'ga', 'style', 'script'); foreach ($vars as $v) { $uhtml = str_replace('', $$v, $uhtml); } - $thtml = file_get_contents(WS_COMPILE_ASSETS . '/_html5/tester.html'); - - $vars = array('titre', 'credits', 'ga', 'style', 'script_test'); + $script.="\n\t\t" . ''; + $vars = array('titre', 'credits', 'ga', 'style', 'script'); foreach ($vars as $v) { $thtml = str_replace('', $$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() { -- 2.39.5