wip #4211 @0.5

diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php
index 4a7ac0c20e38c567cb9327e687dfe2f675dbf457..90777c176e4b43c864d85387ffcde4480ac8193f 100644 (file)
--- a/inc/ws/Util/class.ws.exporter.php
+++ b/inc/ws/Util/class.ws.exporter.php
@@ -97,7 +97,7 @@ class wsExporter
         }
 
         $phonegap->setPreference('show-splash-screen-spinner', false);
-        $phonegap->setPreference('auto-hide-splash-screen', $os==='ios');
+        $phonegap->setPreference('auto-hide-splash-screen', $os === 'ios');
         $phonegap->setPreference('ios-statusbarstyle', CubeIT_Mobile_Phonegap::BARSTYLE_TRANSLUCENT);
         $phonegap->setPreference('iosPersistentFileLocation', 'Library');
         $phonegap->setPreference('EnableViewportScale', true);
@@ -515,11 +515,7 @@ class wsExporter
         if ($version == 'v2') {
             return 'html';
         } else if ($version == 'online') {
-            if ($this->book->parametres->version == '1') {
-                return 'v1';
-            } elseif ($this->book->parametres->version == '2') {
-                return 'html';
-            }
+            return 'html';
         }
         return $version;
     }

diff --git a/inc/ws/Util/html5/icon-bar/class.ws.html5.compiler.php b/inc/ws/Util/html5/icon-bar/class.ws.html5.compiler.php
index 4bae88e04e52c108e5fe08570f8e514d878877a1..1997965407e19784839bfde525974f3be809a8ac 100644 (file)
--- a/inc/ws/Util/html5/icon-bar/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/icon-bar/class.ws.html5.compiler.php
@@ -309,7 +309,7 @@ class wsHTML5Compiler
             $this->initMobileFirst();
         }
 
-        if ($this->book->parametres->zoomMode == 1 || $this->isMobileFirst()) {
+        if ($this->isMobileFirst()) {
             $this->multiply = $this->pdf2htmlRatio * $this->scale * $this->cssOneScale;
         } else {
             $this->multiply = $this->pdf2htmlRatio * $this->scale * $this->cssScale;
@@ -2015,10 +2015,10 @@ class wsHTML5Compiler
         }
 
         // Archives
-        if ($this->book->parametres->externalArchivesBack) {
-            $this->vdir->copy($this->wdir . '/' . $this->book->parametres->externalArchivesBack, 'data/images/' . $this->book->parametres->externalArchivesBack);
-            $res[] = '.mview.archives{background-image:url("../images/' . $this->book->parametres->externalArchivesBack . '");}';
-        }
+//        if ($this->book->parametres->externalArchivesBack) {
+//            $this->vdir->copy($this->wdir . '/' . $this->book->parametres->externalArchivesBack, 'data/images/' . $this->book->parametres->externalArchivesBack);
+//            $res[] = '.mview.archives{background-image:url("../images/' . $this->book->parametres->externalArchivesBack . '");}';
+//        }
 
         # Index
         $ratio = $this->width / $this->height;

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 dc87a8074ac01a7dd51636f09c2fe8861fcf7b1e..1dca84b39650a5ee8422ddfab7f27b4d0509107b 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -289,7 +289,7 @@ class wsHTML5Compiler
 
         $this->wdir = $this->book->getAssetDir();
 
-        $this->widget = !$this->phonegap && $this->book->parametres->widget;
+        $this->widget = false;
 
         $this->pages = $this->daoBook->getPagesOfBook($book_id);
         $this->maxRes = min(300, $this->book->parametres->maxResolution);
@@ -350,7 +350,7 @@ class wsHTML5Compiler
             $this->svgfiles[] = $this->themeRoot . '/' . $this->theme->parametres->symbols;
         }
 
-        if ($this->book->parametres->zoomMode == 1 || $this->isMobileFirst()) {
+        if ($this->isMobileFirst()) {
             $this->multiply = $this->pdf2htmlRatio * $this->scale * $this->cssOneScale;
         } else {
             $this->multiply = $this->pdf2htmlRatio * $this->scale * $this->cssScale;
@@ -2965,10 +2965,10 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
         }
 
         // Archives
-        if ($this->book->parametres->externalArchivesBack) {
-            $this->vdir->copy($this->wdir . '/' . $this->book->parametres->externalArchivesBack, 'data/images/' . $this->book->parametres->externalArchivesBack);
-            $res[] = '.mview.archives{background-image:url("../images/' . $this->book->parametres->externalArchivesBack . '");}';
-        }
+//        if ($this->book->parametres->externalArchivesBack) {
+//            $this->vdir->copy($this->wdir . '/' . $this->book->parametres->externalArchivesBack, 'data/images/' . $this->book->parametres->externalArchivesBack);
+//            $res[] = '.mview.archives{background-image:url("../images/' . $this->book->parametres->externalArchivesBack . '");}';
+//        }
         $this->log('CSS 11');
         # Index
         $thumbw = $this->book->parametres->mobileNavigationType === 'portrait' ? 200 : 100;

diff --git a/inc/ws/Util/packager/class.ws.packager.html.php b/inc/ws/Util/packager/class.ws.packager.html.php
index b49b725394618be193eeda270b8da1d42bef10e8..c1642524968899e46cda3e019dc7e902bc563fc9 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.html.php
@@ -20,7 +20,6 @@ class wsPackagerHTML extends wsPackager
     {
         parent::preparePackage();
 
-        $this->book->parametres->alwaysHTML5 = true;
         if ($this->_disableScorm) {
             $this->book->parametres->scorm_enable = false;
         }
@@ -104,15 +103,8 @@ class wsPackagerHTML extends wsPackager
             $keywords = '<meta name="keywords" content="' . self::escape($this->book->parametres->seoKeywords) . '">';
         }
 
-        $alwaysHTML5 = $this->book->parametres->alwaysHTML5;
-        if (is_null($alwaysHTML5) || !$alwaysHTML5) {
-            $alwaysHTML5 = 'false';
-        }
-
-        if (!isset($this->book->parametres->html5priority)) {
-            $this->book->parametres->html5priority = 'true';
-        }
-        $html5priority = $this->book->parametres->html5priority;
+        $alwaysHTML5 = true;
+        $html5priority = true;
 
 
         // Stuffs to replace in html

diff --git a/inc/ws/Util/packager/class.ws.packager.php b/inc/ws/Util/packager/class.ws.packager.php
index fccc27208c6a523b5261b30d63db917b10898557..011709452bb56fddc468160c4bee7bf404072629 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.php
+++ b/inc/ws/Util/packager/class.ws.packager.php
@@ -238,9 +238,7 @@ class wsPackager
     public function getFinalPackageDir()
     {
         $dir = $this->vdir;
-        if ($this->book->parametres->alwaysHTML5) {
             $dir .= '/m/';
-        }
         return $dir;
     }
 

diff --git a/inc/ws/Util/packager/class.ws.packager.win.cd.html.php b/inc/ws/Util/packager/class.ws.packager.win.cd.html.php
index 6a8ad1712bfa074879b13d1397b7d5b7b10c14d8..ff9f148c6411b009beb8130c261356d14eccfaa6 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.win.cd.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.win.cd.html.php
@@ -6,7 +6,6 @@ class wsPackagerWinCDHTML extends wsPackagerMacEXEHTML
        public function __construct($book_id,$options=[])\r
        {\r
                parent::__construct($book_id,$options);\r
-               $this->book->parametres->alwaysHTML5 = true;\r
                $this->version = 'win_cd_html';\r
        }\r
 \r

diff --git a/inc/ws/Util/packager/class.ws.packager.win.exe.html.php b/inc/ws/Util/packager/class.ws.packager.win.exe.html.php
index 57c2794b7b4eb35c39f4afa444e1e47b8d5bbaca..659092b776e17ab01cfa6fdbceb10ee63f57ab58 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.win.exe.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.win.exe.html.php
@@ -150,7 +150,6 @@ class wsPackagerWinEXEHTML extends wsPackager
     protected function compile()\r
     {\r
         // For exe version, force to export only the html5 version\r
-        $this->book->parametres->alwaysHTML5 = true;\r
         // No need to export pages with texts for this version, we are certain that svg is supported if enabled\r
         if ($this->book->parametres->mobileVersion == 'html5-desktop') {\r
             $this->book->parametres->mobileVersion = 'html5';\r