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

fixes #1420 - Go to now playing in web ui

Browse source
This commit is contained in:
Luke Pulverenti 2016-07-22 00:58:55 -04:00
parent 13838f9d76
commit cc687118d2
3 changed files with 81 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

29
dashboard-ui/scripts/nowplayingbar.js
View file

@ -288,14 +288,13 @@
var nowPlayingBarElement;
function getNowPlayingBar() {
if (nowPlayingBarElement) {
return Promise.resolve(nowPlayingBarElement);
}
return new Promise(function (resolve, reject) {
if (nowPlayingBarElement) {
resolve(nowPlayingBarElement);
return;
}
require(['css!css/nowplayingbar.css', 'emby-slider'], function () {
require(['itemShortcuts', 'css!css/nowplayingbar.css', 'emby-slider'], function (itemShortcuts) {
nowPlayingBarElement = document.querySelector('.nowPlayingBar');
@ -312,6 +311,8 @@
nowPlayingBarElement.classList.add('noMediaProgress');
}
itemShortcuts.on(nowPlayingBarElement);
bindEvents(nowPlayingBarElement);
resolve(nowPlayingBarElement);
});
@ -507,19 +508,15 @@
var currentImgUrl;
function updateNowPlayingInfo(state) {
var nameHtml = MediaController.getNowPlayingNameHtml(state.NowPlayingItem) || '';
nowPlayingTextElement.innerHTML = MediaController.getNowPlayingNames(state.NowPlayingItem).map(function (nowPlayingName) {
if (nameHtml.indexOf('<br/>') != -1) {
nowPlayingTextElement.classList.add('nowPlayingDoubleText');
} else {
nowPlayingTextElement.classList.remove('nowPlayingDoubleText');
}
if (nowPlayingName.item) {
return '<div>' + LibraryBrowser.getTextActionButton(nowPlayingName.item, nowPlayingName.text) + '</div>';
}
if (state.NowPlayingItem.Id) {
nameHtml = '<a style="color:inherit;text-decoration:none;" href="' + LibraryBrowser.getHref(state.NowPlayingItem) + '">' + nameHtml + '</a>';
}
return '<div>' + nowPlayingName.text + '</div>';
nowPlayingTextElement.innerHTML = nameHtml;
}).join('');
var url;
var imgHeight = 80;