wip #3097 @0.5

diff --git a/fluidbook/compile/hybrid/index.html b/fluidbook/compile/hybrid/index.html
index a3c19ef75b935b1ddd884707471e08149f996fac..a5e457fade69803e7782001211a4d92e04ab6310 100644 (file)
--- a/fluidbook/compile/hybrid/index.html
+++ b/fluidbook/compile/hybrid/index.html
@@ -6,7 +6,7 @@
         var redirect;\r
         var locationWithoutHash = window.location.href.split('#')[0];\r
         var hash = window.location.hash;\r
-        if (window.matchMedia('(min-width: $breakpoint)').matches) {\r
+        if (window.matchMedia('(min-device-width: $breakpoint) and (min-device-height: $breakpoint)').matches) {\r
             redirect = 'd';\r
         } else {\r
             redirect = 'mf';\r

diff --git a/inc/ws/Util/packager/class.ws.packager.html.php b/inc/ws/Util/packager/class.ws.packager.html.php
index 1e68dcdd9408001a17bdc2807acf4b7f0ecb10b1..b924e7db81aeb14c29f9b23c77f8bf2828b602f8 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.html.php
@@ -257,7 +257,7 @@ class wsPackagerHTML extends wsPackager
 
             $hybrid = file_get_contents(WS_COMPILE_ASSETS . '/hybrid/index.html');
             $replace = [
-                'breakpoint' => ((int)$this->book->parametres->mobilefirstBreakpoint - 1) . 'px',
+                'breakpoint' => $this->book->parametres->mobilefirstBreakpoint . 'px',
                 'bgcolor' => $this->theme->parametres->loadingBackColor
             ];
             foreach ($replace as $var => $value) {