(no commit message)

diff --git a/_project/Présentation_fluidbook_html5.pptx b/_project/Présentation_fluidbook_html5.pptx
index 03bde2f0c912fd873f41612a630241f931cf924c..3d766f1c9c25af998cdb12257ff0d46ebae177ac 100644 (file)
Binary files "a/_project/Pr\303\251sentation_fluidbook_html5.pptx" and "b/_project/Pr\303\251sentation_fluidbook_html5.pptx" differ

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 58436a52d3d936fec41d35d8781605293bdc79e2..2237c8e29d21d30fe0783f42f410b0e7be7c05a5 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -130,13 +130,9 @@ class wsHTML5Compiler {
                }
                $this->numerotation = explode(',', $this->book->numerotation);
        }
-       
-       public function getCssScale(){
-               if($this->book->parametres->zoomMode==1){
-                       return $this->cssOneScale;
-               }else{
-                       return $this->cssScale;
-               }
+
+       public function getCssScale() {
+               return $this->cssScale;
        }
 
        public function virtualToPhysical($virtual) {
@@ -553,23 +549,14 @@ class wsHTML5Compiler {
                $res = array();
 
                // General theme
+               $cssWidth = $this->cssWidth;
+               $cssHeight = $this->cssHeight;
+               $cssScale = $this->cssScale;
+               $w2 = ($cssWidth * 2) . 'px';
 
-               if ($this->book->parametres->zoomMode == '1') {
-                       // Slideshow mode
-                       $cssScale = $this->cssOneScale;
-                       $cssWidth = $this->cssOneWidth;
-                       $cssHeight = $this->cssOneHeight;
-                       $w2 = ($cssWidth * 2) . 'px';
-               } else {
-                       // Normal mode
-                       $cssWidth = $this->cssWidth;
-                       $cssHeight = $this->cssHeight;
-                       $cssScale = $this->cssScale;
-                       $w2 = ($cssWidth * 2) . 'px';
-               }
 
                $h = $cssHeight . 'px';
-               
+
                $wm = ($this->width * $this->multiply) . 'px';
                $hm = ($this->height * $this->multiply) . 'px';
                $w = $cssWidth . 'px';