Merge remote-tracking branch 'upstream/master' into nowplaying-hotfixes

2020-06-23 19:18:32 +02:00
parent b7714eea14 13b05c8e44
commit 33d0329e5c
14 changed files with 76 additions and 39 deletions
@@ -834,6 +834,7 @@ define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', '
    var headerAudioPlayerButton;
    var headerSyncButton;
    var enableLibraryNavDrawer = layoutManager.desktop;
+    var enableLibraryNavDrawerHome = !layoutManager.tv;
    var skinHeader = document.querySelector('.skinHeader');
    var requiresUserRefresh = true;
    var lastOpenTime = new Date().getTime();
@@ -920,7 +921,7 @@ define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', '
            refreshDashboardInfoInDrawer(apiClient);
        } else {
            if (mainDrawerButton) {
-                if (enableLibraryNavDrawer || isHomePage) {
+                if (enableLibraryNavDrawer || (isHomePage && enableLibraryNavDrawerHome)) {
                    mainDrawerButton.classList.remove('hide');
                } else {
                    mainDrawerButton.classList.add('hide');