diff --git a/dashboard-ui/nowplaying.html b/dashboard-ui/nowplaying.html index 52e81ca440..982537df85 100644 --- a/dashboard-ui/nowplaying.html +++ b/dashboard-ui/nowplaying.html @@ -10,6 +10,7 @@ ${TabNowPlaying} ${TabControls} ${TabAdvanced} + ${TabPlaylist}
@@ -125,6 +126,15 @@
+ diff --git a/dashboard-ui/playlist.html b/dashboard-ui/playlist.html deleted file mode 100644 index b4b9b8f873..0000000000 --- a/dashboard-ui/playlist.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - ${TitleMediaBrowser} - - -
- -
${HeaderNowPlaying}
-
- -
-
-
-
- - diff --git a/dashboard-ui/scripts/nowplayingbar.js b/dashboard-ui/scripts/nowplayingbar.js index f481af54fc..f8cbdf34ce 100644 --- a/dashboard-ui/scripts/nowplayingbar.js +++ b/dashboard-ui/scripts/nowplayingbar.js @@ -25,7 +25,7 @@ html += '' + Globalize.translate('ButtonRemoteControl') + ''; - html += '' + Globalize.translate('ButtonPlaylist') + ''; + html += '' + Globalize.translate('ButtonPlaylist') + ''; html += ''; html += ''; diff --git a/dashboard-ui/scripts/nowplayingpage.js b/dashboard-ui/scripts/nowplayingpage.js index 747767fc7c..c53fba8c99 100644 --- a/dashboard-ui/scripts/nowplayingpage.js +++ b/dashboard-ui/scripts/nowplayingpage.js @@ -371,6 +371,21 @@ document.title = new Date().getTime(); history.back(); }); + + $(page).on('click', '.lnkPlayFromIndex', function () { + + var index = parseInt(this.getAttribute('data-index')); + + MediaController.currentPlaylistIndex(index); + loadPlaylist(page); + + }).on('click', '.lnkRemoveFromPlaylist', function () { + + var index = parseInt(this.getAttribute('data-index')); + + MediaController.removeFromPlaylist(index); + loadPlaylist(page); + }); } function onPlaybackStart(e, state) { @@ -610,6 +625,63 @@ } + function loadPlaylist(page) { + + var html = ''; + + html += ''; + + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + + html += ''; + + $.each(MediaController.playlist(), function (i, item) { + + var name = LibraryBrowser.getPosterViewDisplayName(item); + + var parentName = item.SeriesName || item.Album; + + html += ''; + html += ''; + html += ''; + + html += ''; + + html += ''; + + html += ''; + + html += ''; + html += ''; + html += ''; + }); + + html += ''; + html += '
' + Globalize.translate('HeaderName') + '' + Globalize.translate('HeaderAlbum') + '' + Globalize.translate('HeaderArtist') + '' + Globalize.translate('HeaderAlbumArtist') + '' + Globalize.translate('HeaderTime') + '
'; + html += '' + name + ''; + html += ''; + if (parentName) { + var parentId = item.AlbumId || item.SeriesId || item.ParentId; + html += '' + parentName + ''; + } + html += ''; + html += LibraryBrowser.getArtistLinksHtml(item.ArtistItems || []); + html += ''; + if (item.AlbumArtist) { + html += LibraryBrowser.getArtistLinksHtml(item.AlbumArtists || []); + } + html += '' + Dashboard.getDisplayTime(item.RunTimeTicks) + '
'; + + $(".playlist", page).html(html).trigger('create'); + } + $(document).on('pageinit', "#nowPlayingPage", function () { var page = this; @@ -620,7 +692,12 @@ var page = this; - $('.tabButton:first', page).trigger('click'); + var tab = getParameterByName('tab'); + if (tab) { + $('.tabButton' + tab, page).trigger('click'); + } else { + $('.tabButton:first', page).trigger('click'); + } $(function () { @@ -633,8 +710,8 @@ }); - showIntro(); + loadPlaylist(page); }).on('pagehide', "#nowPlayingPage", function () { diff --git a/dashboard-ui/scripts/playlist.js b/dashboard-ui/scripts/playlist.js deleted file mode 100644 index c05663158c..0000000000 --- a/dashboard-ui/scripts/playlist.js +++ /dev/null @@ -1,87 +0,0 @@ -(function ($, document) { - - function reloadPlaylist(page) { - - var html = ''; - - html += ''; - - html += ''; - html += ''; - html += ''; - html += ''; - html += ''; - html += ''; - html += ''; - html += ''; - - html += ''; - - $.each(MediaController.playlist(), function (i, item) { - - var name = LibraryBrowser.getPosterViewDisplayName(item); - - var parentName = item.SeriesName || item.Album; - - html += ''; - html += ''; - html += ''; - - html += ''; - - html += ''; - - html += ''; - - html += ''; - html += ''; - html += ''; - }); - - html += ''; - html += '
' + Globalize.translate('HeaderName') + '' + Globalize.translate('HeaderAlbum') + '' + Globalize.translate('HeaderArtist') + '' + Globalize.translate('HeaderAlbumArtist') + '' + Globalize.translate('HeaderTime') + '
'; - html += '' + name + ''; - html += ''; - if (parentName) { - var parentId = item.AlbumId || item.SeriesId || item.ParentId; - html += '' + parentName + ''; - } - html += ''; - html += LibraryBrowser.getArtistLinksHtml(item.ArtistItems || []); - html += ''; - if (item.AlbumArtist) { - html += LibraryBrowser.getArtistLinksHtml(item.AlbumArtists || []); - } - html += '' + Dashboard.getDisplayTime(item.RunTimeTicks) + '
'; - - $("#playlist", page).html(html).trigger('create'); - } - - $(document).on('pageinit', "#playlistPage", function () { - - var page = this; - - $(page).on('click', '.lnkPlay', function () { - - var index = parseInt(this.getAttribute('data-index')); - - MediaController.currentPlaylistIndex(index); - reloadPlaylist(page); - - }).on('click', '.lnkRemove', function () { - - var index = parseInt(this.getAttribute('data-index')); - - MediaController.removeFromPlaylist(index); - reloadPlaylist(page); - }); - - }).on('pagebeforeshow', "#playlistPage", function () { - - var page = this; - - reloadPlaylist(page); - }); - - -})(jQuery, document); \ No newline at end of file