diff --git a/dashboard-ui/scripts/Itemdetailpage.js b/dashboard-ui/scripts/Itemdetailpage.js index 70ac88e158..5167ab0ffe 100644 --- a/dashboard-ui/scripts/Itemdetailpage.js +++ b/dashboard-ui/scripts/Itemdetailpage.js @@ -238,8 +238,8 @@ $('#players', page).hide(); } - if ((item.Type == "Audio" || item.Type == "MusicVideo") && item.Artists && item.Artists.length) { - $('#artist', page).show().html('Artist:  ' + item.Artists[0] + '').trigger('create'); + if (item.Artists && item.Artists.length) { + $('#artist', page).show().html(getArtistLinksHtml(item.Artists)).trigger('create'); } else { $('#artist', page).hide(); } @@ -260,6 +260,30 @@ $('.itemPath', page).hide(); } } + + function getArtistLinksHtml(artists) { + + var html = []; + + for (var i = 0, length = artists.length; i < length; i++) { + + var artist = artists[i]; + + html.push('' + artist + ''); + + } + + html = html.join(' / '); + + if (artists.length == 1) { + return 'Artist:  ' + html; + } + if (artists.length > 1) { + return 'Artists:  ' + html; + } + + return html; + } function renderSoundtracks(page, item) { diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js index 5c0708547a..5ea288c2ea 100644 --- a/dashboard-ui/scripts/edititemmetadata.js +++ b/dashboard-ui/scripts/edititemmetadata.js @@ -598,7 +598,7 @@ $('#txtAlbumArtist', page).val(item.AlbumArtist || ""); var artists = item.Artists || []; - $('#txtArtist', page).val(artists.join(',')); + $('#txtArtist', page).val(artists.join(';')); var date; @@ -824,7 +824,7 @@ Players: $('#txtPlayers', form).val(), Album: $('#txtAlbum', form).val(), AlbumArtist: $('#txtAlbumArtist', form).val(), - Artists: [$('#txtArtist', form).val()], + Artists: $('#txtArtist', form).val().split(';'), Overview: $('#txtOverview', form).val(), Status: $('#selectStatus', form).val(), AirDays: editableListViewValues($("#listAirDays", form)), diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index a96c8da3aa..20ef4413ca 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -293,13 +293,14 @@ if (options.showArtist) { - if (item.Artists && item.Artists.length && item.Artists[0]) { + if (item.Artists && item.Artists.length) { - var artist = item.Artists[0]; + var artistLinksHtml = LibraryBrowser.getArtistLinksHtml(item.Artists); - html += '' + artist + ''; - } else { - html += '' + (artist || '') + ''; + html += '' + artistLinksHtml + ''; + } + else { + html += ''; } } @@ -319,6 +320,23 @@ return html; }, + getArtistLinksHtml: function (artists) { + + var html = []; + + for (var i = 0, length = artists.length; i < length; i++) { + + var artist = artists[i]; + + html.push('' + artist + ''); + + } + + html = html.join(' / '); + + return html; + }, + showPlayMenu: function (positionTo, itemId, itemType, mediaType, resumePositionTicks) { var isPlaying = MediaPlayer.isPlaying();