diff --git a/dashboard-ui/advanced.html b/dashboard-ui/advanced.html index e6f3773866..4040505b3f 100644 --- a/dashboard-ui/advanced.html +++ b/dashboard-ui/advanced.html @@ -15,7 +15,7 @@
  • diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 7b4751a162..b46004b3f8 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -47,6 +47,13 @@ body { font-family: 'Open Sans', Arial, Helvetica, sans-serif; } +.ui-header .ui-btn-inner, .ui-footer .ui-btn-inner, .ui-mini .ui-btn-inner { + font-size: 13.5px; +} +.ui-li-desc { + font-size: 13px; +} + h1 { font-family: 'Open Sans', Arial, Helvetica, sans-serif; font-weight: 200; diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 36135a2418..70c06359f1 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -1476,7 +1476,7 @@ var html = ''; - if (item.Type != "Audio") { + if (item.Type != "Audio" && item.Type != "Season" && item.Type != "Series") { html += LibraryBrowser.getItemProgressBarHtml(item); } diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index 638f458787..537f358747 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -762,7 +762,7 @@ return self.canPlayMediaType(item.MediaType); }; - self.getPlayUrl = function(item) { + self.getPlayUrl = function (item) { if (item.GameSystem == "Nintendo" && item.MediaType == "Game" && item.ProviderIds.NesBox && item.ProviderIds.NesBoxRom) { @@ -810,7 +810,7 @@ Dashboard.getCurrentUser().done(function (user) { var item = items[0]; - + var videoType = (item.VideoType || "").toLowerCase(); var expirementalText = "This feature is experimental. It may not work at all with some titles. Do you wish to continue?"; @@ -1202,10 +1202,12 @@ } }; - self.queueItem = function (item) { + self.queueItems = function (items) { - self.playlist.push(item); + for (var i = 0, length = items.length; i < length; i++) { + self.playlist.push(items[i]); + } }; self.queue = function (id) { @@ -1222,16 +1224,12 @@ }).done(function (result) { - for (var i = 0, length = result.Items.length; i < length; i++) { - - self.queueItem(result.Items[i]); - - } + self.queueItems(result.Items); }); } else { - self.queueItem(item); + self.queueItems([item]); } }); @@ -1248,11 +1246,7 @@ }).done(function (result) { - for (var i = 0, length = result.Items.length; i < length; i++) { - - self.queueItem(result.Items[i]); - - } + self.queueItems(result.Items); }); diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index d1ebb46b1a..0d1727cdc2 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -804,7 +804,16 @@ var Dashboard = { Ids: msg.Data.ItemIds.join(',') }).done(function (result) { - MediaPlayer.play(result.Items, msg.Data.StartPositionTicks); + + if (msg.Data.PlayCommand == "PlayNext") { + MediaPlayer.queueItems(result.Items); + } + else if (msg.Data.PlayCommand == "PlayLast") { + MediaPlayer.queueItems(result.Items); + } + else { + MediaPlayer.play(result.Items, msg.Data.StartPositionTicks); + } });