milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update list views

Browse source
This commit is contained in:
Luke Pulverenti 2016-07-16 17:28:15 -04:00
parent cbf80fb548
commit aaf5037d13
14 changed files with 164 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

25
dashboard-ui/bower_components/emby-webcomponents/listview/listview.js vendored
View file

@ -201,8 +201,6 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
if (options.showParentTitle) {
if (item.Type == 'Episode') {
textlines.push(item.SeriesName || ' ');
} else if (item.Type == 'MusicAlbum') {
textlines.push(item.AlbumArtist || ' ');
}
}
@ -213,13 +211,28 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
}
textlines.push(displayName);
if (item.Type == 'Audio') {
if (item.ArtistItems && item.Type != 'MusicAlbum') {
textlines.push(item.ArtistItems.map(function (a) {
return a.Name;
}).join(', ') || ' ');
}
if (item.AlbumArtist && item.Type == 'MusicAlbum') {
textlines.push(item.AlbumArtist || ' ');
}
if (item.Type == 'Game') {
textlines.push(item.GameSystem || ' ');
}
if (item.Type == 'TvChannel') {
if (item.CurrentProgram) {
textlines.push(itemHelper.getDisplayName(item.CurrentProgram));
}
}
var lineCount = textlines.length;
if (!options.enableSideMediaInfo) {
lineCount++;
@ -241,7 +254,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
html += '<h2>';
}
else if (i == 0) {
html += '<h3>';
html += '<div>';
} else {
html += '<div class="secondary">';
}
@ -249,7 +262,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
if (i == 0 && isLargeStyle) {
html += '</h2>';
} else if (i == 0) {
html += '</h3>';
html += '</div>';
} else {
html += '</div>';
}
@ -268,7 +281,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
html += '</div>';
if (!clickEntireItem) {
html += '<button is="paper-icon-button-light" class="listviewMenuButton autoSize"><i class="md-icon">&#xE5D4;</i></button>';
html += '<button is="paper-icon-button-light" class="menuButton autoSize"><i class="md-icon">&#xE5D4;</i></button>';
html += '<span class="listViewUserDataButtons">';
html += userdataButtons.getIconsHtml(item, false);
html += '</span>';