From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 9 Oct 2019 15:35:20 +0000 (+0000)
Subject: wip #3097 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=061b1b08dafb5430ef8fbc84b6234c0cc9b93b18;p=cubeextranet.git

wip #3097 @0.5
---

diff --git a/fluidbook/compile/hybrid/index.html b/fluidbook/compile/hybrid/index.html
index a3c19ef75..a5e457fad 100644
--- a/fluidbook/compile/hybrid/index.html
+++ b/fluidbook/compile/hybrid/index.html
@@ -6,7 +6,7 @@
         var redirect;
         var locationWithoutHash = window.location.href.split('#')[0];
         var hash = window.location.hash;
-        if (window.matchMedia('(min-width: $breakpoint)').matches) {
+        if (window.matchMedia('(min-device-width: $breakpoint) and (min-device-height: $breakpoint)').matches) {
             redirect = 'd';
         } else {
             redirect = 'mf';
diff --git a/inc/ws/Util/packager/class.ws.packager.html.php b/inc/ws/Util/packager/class.ws.packager.html.php
index 1e68dcdd9..b924e7db8 100644
--- 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) {