1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

Fix nowplaying for tv mode

This commit is contained in:
grafixeyehero 2020-02-15 03:47:07 +03:00
parent 92d14bed85
commit dec26f6c0e
3 changed files with 31 additions and 4 deletions

View file

@ -14,6 +14,9 @@ define(['loading', 'globalize', 'events', 'viewManager', 'layoutManager', 'skinM
}, },
showSettings: function () { showSettings: function () {
show('/settings/settings.html'); show('/settings/settings.html');
},
showNowPlaying: function () {
show("/nowplaying.html");
} }
}; };

View file

@ -12,6 +12,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
html += "</div>"; html += "</div>";
html += '<div class="headerRight">'; html += '<div class="headerRight">';
html += '<span class="headerSelectedPlayer"></span>'; html += '<span class="headerSelectedPlayer"></span>';
html += '<button is="paper-icon-button-light" class="headerAudioPlayerButton audioPlayerButton headerButton headerButtonRight hide"><i class="material-icons">music_note</i></button>';
html += '<button is="paper-icon-button-light" class="headerCastButton castButton headerButton headerButtonRight hide"><i class="material-icons">cast</i></button>'; html += '<button is="paper-icon-button-light" class="headerCastButton castButton headerButton headerButtonRight hide"><i class="material-icons">cast</i></button>';
html += '<button type="button" is="paper-icon-button-light" class="headerButton headerButtonRight headerSearchButton hide"><i class="material-icons">search</i></button>'; html += '<button type="button" is="paper-icon-button-light" class="headerButton headerButtonRight headerSearchButton hide"><i class="material-icons">search</i></button>';
html += '<button is="paper-icon-button-light" class="headerButton headerButtonRight headerUserButton hide"><i class="material-icons">person</i></button>'; html += '<button is="paper-icon-button-light" class="headerButton headerButtonRight headerUserButton hide"><i class="material-icons">person</i></button>';
@ -27,6 +28,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
headerHomeButton = skinHeader.querySelector(".headerHomeButton"); headerHomeButton = skinHeader.querySelector(".headerHomeButton");
headerUserButton = skinHeader.querySelector(".headerUserButton"); headerUserButton = skinHeader.querySelector(".headerUserButton");
headerCastButton = skinHeader.querySelector(".headerCastButton"); headerCastButton = skinHeader.querySelector(".headerCastButton");
headerAudioPlayerButton = skinHeader.querySelector(".headerAudioPlayerButton");
headerSearchButton = skinHeader.querySelector(".headerSearchButton"); headerSearchButton = skinHeader.querySelector(".headerSearchButton");
lazyLoadViewMenuBarImages(); lazyLoadViewMenuBarImages();
@ -82,6 +84,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
if (!layoutManager.tv) { if (!layoutManager.tv) {
headerCastButton.classList.remove("hide"); headerCastButton.classList.remove("hide");
} }
} else { } else {
headerHomeButton.classList.add("hide"); headerHomeButton.classList.add("hide");
headerCastButton.classList.add("hide"); headerCastButton.classList.add("hide");
@ -116,6 +119,10 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
Dashboard.navigate("home.html"); Dashboard.navigate("home.html");
} }
function showAudioPlayer() {
return appRouter.showNowPlaying();
}
function bindMenuEvents() { function bindMenuEvents() {
mainDrawerButton = document.querySelector(".mainDrawerButton"); mainDrawerButton = document.querySelector(".mainDrawerButton");
@ -140,9 +147,29 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
headerCastButton.addEventListener("click", onCastButtonClicked); headerCastButton.addEventListener("click", onCastButtonClicked);
} }
headerAudioPlayerButton.addEventListener("click", showAudioPlayer);
if (layoutManager.mobile) { if (layoutManager.mobile) {
initHeadRoom(skinHeader); initHeadRoom(skinHeader);
} }
events.on(playbackManager, 'playbackstart', onPlaybackStart);
events.on(playbackManager, 'playbackstop', onPlaybackStop);
}
function onPlaybackStart(e) {
if (playbackManager.isPlayingAudio() && layoutManager.tv) {
headerAudioPlayerButton.classList.remove("hide");
} else {
headerAudioPlayerButton.classList.add("hide");
}
}
function onPlaybackStop(e, stopInfo) {
if (stopInfo.nextMediaType != 'Audio') {
headerAudioPlayerButton.classList.add("hide");
}
} }
function onCastButtonClicked() { function onCastButtonClicked() {
@ -763,6 +790,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
var currentUser; var currentUser;
var headerCastButton; var headerCastButton;
var headerSearchButton; var headerSearchButton;
var headerAudioPlayerButton;
var enableLibraryNavDrawer = !layoutManager.tv; var enableLibraryNavDrawer = !layoutManager.tv;
var skinHeader = document.querySelector(".skinHeader"); var skinHeader = document.querySelector(".skinHeader");
var requiresUserRefresh = true; var requiresUserRefresh = true;

View file

@ -989,10 +989,6 @@ var AppInfo = {};
Dashboard.navigate("mypreferencesmenu.html"); Dashboard.navigate("mypreferencesmenu.html");
}; };
appRouter.showNowPlaying = function () {
Dashboard.navigate("nowplaying.html");
};
appRouter.setTitle = function (title) { appRouter.setTitle = function (title) {
LibraryMenu.setTitle(title); LibraryMenu.setTitle(title);
}; };