wait #5262 @0.25

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 9da5a797e85440f8a72212445a33ad4b2c015b4b..4d1cd255329710a0bfe927a7039a1fef7d910098 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -275,6 +275,7 @@ class wsBookParametres extends wsParametres
                 __('Tourner (souple)') => 'flip3d')
         );
         $this->fields['mobileTransitionDuration'] = array('type' => 'float', 'default' => 0.5, 'editable' => true, 'label' => __('Durée de la transition'));
+        $this->fields['mobileTransitionDurationSlide'] = array('type' => 'float', 'default' => 0, 'editable' => true, 'label' => __('Durée de la transition (fade, slide)'), 'hint' => __('Laisser à zéro pour utiliser la valeur générale'));
         $this->fields['mobileNavigationType'] = array('type' => 'combo', 'default' => 'book', 'editable' => true, 'label' => __('Mode de navigation'), 'grade' => 5,
             'datas' => array(__('Normal (automatique)') => 'book',
                 __('Normal (double page)') => 'landscape',
@@ -304,7 +305,7 @@ class wsBookParametres extends wsParametres
 
 
         $this->forms['3d_mode'] = array('label' => __('Options de visualisation'),
-            'fieldsnames' => array('mobileNavigationType', '|', 'mobileTransitions', 'mobileTransitionDuration', '|', 'forceWhiteBackground', 'rasterizePages', 'vectorPages', 'visualisationMode', 'antialiasReading', 'correctCenter', 'pagesBaseAngle', 'centerBook', '|', 'extraXSpace', 'mobileExtraXSpace', 'extraYSpace', '|', 'viewMode', '|', 'dynamicBackgroundColor', '|', 'svgToCanvas', 'svgToCanvasUpscale', 'svgTextMethod', 'textsThickness', 'textsThicknessPages', '|', 'imageFormat', 'maxResolution', 'JPEGQuality'));
+            'fieldsnames' => array('mobileNavigationType', '|', 'mobileTransitions', 'mobileTransitionDuration', 'mobileTransitionDurationSlide', '|', 'forceWhiteBackground', 'rasterizePages', 'vectorPages', 'visualisationMode', 'antialiasReading', 'correctCenter', 'pagesBaseAngle', 'centerBook', '|', 'extraXSpace', 'mobileExtraXSpace', 'extraYSpace', '|', 'viewMode', '|', 'dynamicBackgroundColor', '|', 'svgToCanvas', 'svgToCanvasUpscale', 'svgTextMethod', 'textsThickness', 'textsThicknessPages', '|', 'imageFormat', 'maxResolution', 'JPEGQuality'));
 
         $this->fields['rasterizeOnSafari'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Ecraser les pages pour Safari (Mac OS)'), 'grade' => 1);
         $this->fields['performance3DMode'] = array('type' => 'combo', 'datas' => [__('Tester la machine') => 'auto',

diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
index 906f2a876c1bfea25018207309fd12d58d5b99b8..35159e8f808f34d319b129c2df06a08c53bb220e 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -2042,7 +2042,7 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
                 $ofile = $this->wdir . '/' . $linkData['to'];
                 $dfile = $this->wdir . '/' . $linkData['to'] . '.svg';
                 if (!file_exists($dfile) || filemtime($dfile) < filemtime($ofile)) {
-                    $cmd="pdftocairo -svg -f 1 -l 1 $ofile $dfile";
+                    $cmd = "pdftocairo -svg -f 1 -l 1 $ofile $dfile";
                     `$cmd`;
                 }
                 $linkData['type'] = 6;
@@ -2825,6 +2825,7 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
         $this->lessVariables['edge-right-offset'] = 0;
         $this->lessVariables['edges-opacity'] = 1;
 
+
         $this->lessVariables['audioplayer-background-color'] = wsHTML5::colorToCSS($this->theme->parametres->audioplayerBackgroundColor ?: $this->theme->parametres->couleurL);
         $this->lessVariables['audioplayer-icon-color'] = wsHTML5::colorToCSS($this->theme->parametres->audioplayerIconColor);
         $this->config->audioplayerStrokeColor = $this->lessVariables['audioplayer-stroke-color'] = wsHTML5::colorToCSS($this->theme->parametres->audioplayerStrokeColor ?: $this->theme->parametres->couleurL);
@@ -2833,6 +2834,9 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
         $this->lessVariables['display-page-number'] = $this->_lessBoolean($this->theme->parametres->displayPageNumber);
         $this->lessVariables['page-transition-duration'] = $this->book->parametres->mobileTransitionDuration . 's';
 
+        $this->config->mobileTransitionDurationSlide = ($this->book->parametres->mobileTransitionDurationSlide ?: $this->book->parametres->mobileTransitionDuration);
+        $this->lessVariables['page-transition-slide-duration'] = $this->config->mobileTransitionDurationSlide . 's';
+
         $corrText = $this->isMobileFirst() ? 0 : 4;
         $this->log('CSS 3');