From 511f5a0c456cc8d17a888a1146104fb85585c378 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Mon, 14 Sep 2020 14:40:14 +0200
Subject: [PATCH] fix issue #31

---
 css/sideMenu.css        |  8 ++------
 templates/js/script.php | 11 ++++++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/css/sideMenu.css b/css/sideMenu.css
index 78b62ac..5877a35 100644
--- a/css/sideMenu.css
+++ b/css/sideMenu.css
@@ -217,15 +217,11 @@
 
 .side-menu-always-displayed #side-menu.open,
 .side-menu-always-displayed #side-menu.open .side-menu-apps-list,
-.side-menu-always-displayed #side-menu.open .side-menu-header,
-.side-menu-always-displayed #side-menu:hover,
-.side-menu-always-displayed #side-menu:hover .side-menu-apps-list,
-.side-menu-always-displayed #side-menu:hover .side-menu-header {
+.side-menu-always-displayed #side-menu.open .side-menu-header {
     width: 100%;
 }
 
-.side-menu-always-displayed #side-menu.open .side-menu-app-text,
-.side-menu-always-displayed #side-menu:hover .side-menu-app-text {
+.side-menu-always-displayed #side-menu.open .side-menu-app-text {
     display: inline;
 }
 
diff --git a/templates/js/script.php b/templates/js/script.php
index 2050de7..247bdbb 100644
--- a/templates/js/script.php
+++ b/templates/js/script.php
@@ -67,7 +67,7 @@
             }
         }
 
-        <?php if ($_['opener-hover']): ?>
+        <?php if ($_['opener-hover'] || ($_['always-displayed'] && !$_['big-menu'])): ?>
             var sideMenuMouseLeave = function() {
                 sideMenu
                     .removeClass('open')
@@ -87,9 +87,14 @@
             }
 
             if (!isTouchDevice) {
-                headerMenuOpener.on('mouseenter', sideMenuOpenerMouseEnter)
+                <?php if ($_['opener-hover']): ?>
+                    headerMenuOpener.on('mouseenter', sideMenuOpenerMouseEnter)
 
-                sideMenu.addClass('hide-opener')
+                    sideMenu.addClass('hide-opener')
+                <?php else: ?>
+                    sideMenu.on('mouseleave', sideMenuMouseLeave)
+                    sideMenu.on('mouseenter', sideMenuOpenerMouseEnter)
+                <?php endif ?>
             }
         <?php endif; ?>