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

update live tv image

Browse source
This commit is contained in:
Luke Pulverenti 2015-08-28 00:19:08 -04:00
parent 9599bbbd35
commit 06b74be1fd
16 changed files with 122 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

51
dashboard-ui/scripts/librarybrowser.js
View file

@ -242,9 +242,8 @@
console.log('iron-select');
// When transition animations are used, add a content loading delay to allow the animations to finish
// Otherwise with both operations happening at the same time, it can cause the animation to not run at full speed.
var enablePaperTabs = LibraryBrowser.enableFullPaperTabs();
var delay = enablePaperTabs ? 500 : 0;
var pgs = this;
var delay = pgs.entryAnimation ? 500 : 0;
setTimeout(function () {
$(pgs).trigger('tabchange');
@ -274,7 +273,24 @@
}
} else {
Events.trigger(page.querySelector('neon-animated-pages'), 'tabchange');
var pages = page.querySelector('neon-animated-pages');
if (!NavHelper.isBack()) {
if (pages.selected) {
var entryAnimation = pages.entryAnimation;
var exitAnimation = pages.exitAnimation;
pages.entryAnimation = null;
pages.exitAnimation = null;
tabs.selected = 0;
pages.entryAnimation = entryAnimation;
pages.exitAnimation = exitAnimation;
return;
}
}
Events.trigger(pages, 'tabchange');
}
},
@ -718,16 +734,16 @@
var href = LibraryBrowser.getHrefInternal(item, context);
if (context != 'livetv') {
if (topParentId == null && context != 'playlists') {
topParentId = LibraryMenu.getTopParentId();
}
//if (context != 'livetv') {
// if (topParentId == null && context != 'playlists') {
// topParentId = LibraryMenu.getTopParentId();
// }
if (topParentId) {
href += href.indexOf('?') == -1 ? "?topParentId=" : "&topParentId=";
href += topParentId;
}
}
// if (topParentId) {
// href += href.indexOf('?') == -1 ? "?topParentId=" : "&topParentId=";
// href += topParentId;
// }
//}
return href;
},
@ -983,11 +999,6 @@
var cssClass = options.smallIcon ? 'ui-li-has-icon listItem' : 'ui-li-has-thumb listItem';
if (item.UserData) {
cssClass += ' ' + LibraryBrowser.getUserDataCssClass(item.UserData.Key);
}
var href = LibraryBrowser.getHref(item, options.context);
html += '<li class="' + cssClass + '"' + dataAttributes + ' data-itemid="' + item.Id + '" data-playlistitemid="' + (item.PlaylistItemId || '') + '" data-href="' + href + '" data-icon="false">';
@ -1219,7 +1230,7 @@
itemCommands.push('trailer');
}
if (item.MediaType == "Audio" || item.Type == "MusicAlbum" || item.Type == "MusicArtist" || item.Type == "MusicGenre") {
if (item.MediaType == "Audio" || item.Type == "MusicAlbum" || item.Type == "MusicArtist" || item.Type == "MusicGenre" || item.CollectionType == "music") {
itemCommands.push('instantmix');
}
@ -1690,10 +1701,6 @@
var href = options.linkItem === false ? '#' : LibraryBrowser.getHref(item, options.context);
if (item.UserData) {
cssClass += ' ' + LibraryBrowser.getUserDataCssClass(item.UserData.Key);
}
if (options.showChildCountIndicator && item.ChildCount && options.showLatestItemsPopup !== false) {
cssClass += ' groupedCard';
}