fix #1935 @0.5

diff --git a/fluidbook/compile/index.html b/fluidbook/compile/index.html
index ce2d57de6c3ab73f717bc99b42f8ed3b5bcacddc..8e4853e8298d2f71ca46db501d7eaefbfee0e19f 100644 (file)
--- a/fluidbook/compile/index.html
+++ b/fluidbook/compile/index.html
@@ -27,6 +27,7 @@
         INDEX_EXT = '$index_ext';
         FLASH_ALIVE = false;
         FLASH_ALIVE_TIMEOUT = 0;
+        FLASH_ALIVE_WAIT = $flash_blocked_wait;
 
         var backgroundColor = "$bgcolor";
 
@@ -56,7 +57,7 @@
                             if (!FLASH_ALIVE) {
                                 $redirectMobile
                             }
-                        }, 1500);
+                        }, FLASH_ALIVE_WAIT * 1000);
                     }
                 } else {
                     displayFlashFluidbook();

diff --git a/inc/ws/Util/packager/class.ws.packager.html.php b/inc/ws/Util/packager/class.ws.packager.html.php
index 47b529689610f969be60b5be4804a61a46d7a71f..6de1e858f4967af2ee564db6b88a2115cb1c1331 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.html.php
@@ -137,7 +137,8 @@ class wsPackagerHTML extends wsPackager {
                                   'keywords' => $keywords,
                                   'allowNetworking' => $this->_allowNeworking,
                                   'redirectIfFlashNotInstalled' => in_array($html5priority, array('true', 'notinstalled')) ? 'true' : 'false',
-                                  'redirectIfFlashBlocked' => $html5priority == 'true' ? 'true' : 'false'
+                                  'redirectIfFlashBlocked' => $html5priority == 'true' ? 'true' : 'false',
+                                  'flash_blocked_wait' => $this->book->parametres->flashBlockedWait,
                );
 
                $this->origHTML = $this->book->parametres->htmlPrepend . file_get_contents($this->vdir . '/index.html');
@@ -255,13 +256,13 @@ class wsPackagerHTML extends wsPackager {
                }
 
                $filesToDelete = array('indext.html', 'indexu.html');
-//             if ($this->book->parametres->mobileVersion == 'html5') {
-//                     $filesToDelete[] = 'data/background/*/t*.jpg';
-//                     $filesToDelete[] = 'data/background/contents/p*.html';
-//             } else {
-//                     $filesToDelete[] = 'data/background/*/p*.jpg';
-//                     $filesToDelete[] = 'data/contents/p*.svg';
-//             }
+               //              if ($this->book->parametres->mobileVersion == 'html5') {
+               //                      $filesToDelete[] = 'data/background/*/t*.jpg';
+               //                      $filesToDelete[] = 'data/background/contents/p*.html';
+               //              } else {
+               //                      $filesToDelete[] = 'data/background/*/p*.jpg';
+               //                      $filesToDelete[] = 'data/contents/p*.svg';
+               //              }
                $htmlFiles = array('index', 'widget');
 
                foreach ($htmlFiles as $name) {