From ba5289e61fb781c786a478484b18b1004702a7e1 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 1 Dec 2014 07:43:34 -0500 Subject: [PATCH] updated nuget --- dashboard-ui/scripts/episodes.js | 4 ++-- dashboard-ui/scripts/gamespage.js | 2 +- dashboard-ui/scripts/gamesrecommendedpage.js | 4 ++-- dashboard-ui/scripts/gamesystemspage.js | 2 +- dashboard-ui/scripts/itemlistpage.js | 2 +- dashboard-ui/scripts/moviecollections.js | 2 +- dashboard-ui/scripts/movies.js | 2 +- dashboard-ui/scripts/movieslatest.js | 6 ++---- dashboard-ui/scripts/moviesrecommended.js | 6 +++--- dashboard-ui/scripts/movietrailers.js | 2 +- dashboard-ui/scripts/musicalbumartists.js | 2 +- dashboard-ui/scripts/musicalbums.js | 2 +- dashboard-ui/scripts/musicartists.js | 2 +- dashboard-ui/scripts/musicrecommended.js | 6 +++--- dashboard-ui/scripts/playlistedit.js | 2 +- dashboard-ui/scripts/songs.js | 2 +- dashboard-ui/scripts/tvlatest.js | 4 ++-- dashboard-ui/scripts/tvrecommended.js | 8 ++++---- dashboard-ui/scripts/tvshows.js | 2 +- dashboard-ui/scripts/tvupcoming.js | 6 +++--- dashboard-ui/thirdparty/apiclient/connectionmanager.js | 2 +- .../thirdparty/apiclient/mediabrowser.apiclient.js | 4 ++-- 22 files changed, 36 insertions(+), 38 deletions(-) diff --git a/dashboard-ui/scripts/episodes.js b/dashboard-ui/scripts/episodes.js index 88760931c0..33c1408549 100644 --- a/dashboard-ui/scripts/episodes.js +++ b/dashboard-ui/scripts/episodes.js @@ -9,12 +9,12 @@ SortOrder: "Ascending", IncludeItemTypes: "Episode", Recursive: true, - Fields: "PrimaryImageAspectRatio,SortName,MediaSourceCount,IsUnidentified", + Fields: "PrimaryImageAspectRatio,MediaSourceCount,IsUnidentified,UserData", StartIndex: 0, IsMissing: false, IsVirtualUnaired: false, ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Logo,Thumb" + EnableImageTypes: "Primary,Backdrop,Banner,Thumb" }; function getSavedQueryKey() { diff --git a/dashboard-ui/scripts/gamespage.js b/dashboard-ui/scripts/gamespage.js index 32abb93766..9b9d1b827a 100644 --- a/dashboard-ui/scripts/gamespage.js +++ b/dashboard-ui/scripts/gamespage.js @@ -13,7 +13,7 @@ Fields: "Genres,Studios,PrimaryImageAspectRatio,SortName", StartIndex: 0, ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Logo,Thumb" + EnableImageTypes: "Primary,Backdrop,Banner,Thumb" }; function getSavedQueryKey() { diff --git a/dashboard-ui/scripts/gamesrecommendedpage.js b/dashboard-ui/scripts/gamesrecommendedpage.js index 095ac5c503..54a72b00c1 100644 --- a/dashboard-ui/scripts/gamesrecommendedpage.js +++ b/dashboard-ui/scripts/gamesrecommendedpage.js @@ -14,7 +14,7 @@ Fields: "PrimaryImageAspectRatio", ParentId: parentId, ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Logo,Thumb" + EnableImageTypes: "Primary,Backdrop,Banner,Thumb" }; ApiClient.getJSON(ApiClient.getUrl('Users/' + userId + '/Items/Latest', options)).done(function (items) { @@ -41,7 +41,7 @@ Fields: "ItemCounts,AudioInfo,PrimaryImageAspectRatio", ParentId: parentId, ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Logo,Thumb" + EnableImageTypes: "Primary,Backdrop,Banner,Thumb" }; ApiClient.getItems(userId, options).done(function (result) { diff --git a/dashboard-ui/scripts/gamesystemspage.js b/dashboard-ui/scripts/gamesystemspage.js index 12034ce79d..1e6a58e867 100644 --- a/dashboard-ui/scripts/gamesystemspage.js +++ b/dashboard-ui/scripts/gamesystemspage.js @@ -10,7 +10,7 @@ Fields: "DateCreated", StartIndex: 0, ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Logo,Thumb" + EnableImageTypes: "Primary,Backdrop,Banner,Thumb" }; function getSavedQueryKey() { diff --git a/dashboard-ui/scripts/itemlistpage.js b/dashboard-ui/scripts/itemlistpage.js index 026e35218c..6b7c413011 100644 --- a/dashboard-ui/scripts/itemlistpage.js +++ b/dashboard-ui/scripts/itemlistpage.js @@ -10,7 +10,7 @@ Fields: "DateCreated,PrimaryImageAspectRatio,MediaSourceCount", StartIndex: 0, ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Logo,Thumb" + EnableImageTypes: "Primary,Backdrop,Banner,Thumb" }; var currentItem; diff --git a/dashboard-ui/scripts/moviecollections.js b/dashboard-ui/scripts/moviecollections.js index dfe2111c43..c3355bec5f 100644 --- a/dashboard-ui/scripts/moviecollections.js +++ b/dashboard-ui/scripts/moviecollections.js @@ -12,7 +12,7 @@ Fields: "PrimaryImageAspectRatio,SortName", StartIndex: 0, ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Logo,Thumb" + EnableImageTypes: "Primary,Backdrop,Banner,Thumb" }; function getSavedQueryKey() { diff --git a/dashboard-ui/scripts/movies.js b/dashboard-ui/scripts/movies.js index fd82076689..f8def57735 100644 --- a/dashboard-ui/scripts/movies.js +++ b/dashboard-ui/scripts/movies.js @@ -12,7 +12,7 @@ Fields: "PrimaryImageAspectRatio,SortName,MediaSourceCount,IsUnidentified", StartIndex: 0, ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Logo,Thumb" + EnableImageTypes: "Primary,Backdrop,Banner,Thumb" }; function getSavedQueryKey() { diff --git a/dashboard-ui/scripts/movieslatest.js b/dashboard-ui/scripts/movieslatest.js index 6994b3fa95..2ae9e09b0d 100644 --- a/dashboard-ui/scripts/movieslatest.js +++ b/dashboard-ui/scripts/movieslatest.js @@ -5,19 +5,17 @@ var parentId = LibraryMenu.getTopParentId(); var userId = Dashboard.getCurrentUserId(); - var screenWidth = $(window).width(); - var page = this; var options = { IncludeItemTypes: "Movie", - Limit: screenWidth >= 1600 ? 28 : (screenWidth >= 1440 ? 30 : (screenWidth >= 800 ? 28 : 18)), + Limit: 30, Fields: "PrimaryImageAspectRatio,MediaSourceCount", ParentId: parentId, IsPlayed: false, ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Logo,Thumb" + EnableImageTypes: "Primary,Backdrop,Banner,Thumb" }; ApiClient.getJSON(ApiClient.getUrl('Users/' + userId + '/Items/Latest', options)).done(function (items) { diff --git a/dashboard-ui/scripts/moviesrecommended.js b/dashboard-ui/scripts/moviesrecommended.js index 6e18a005d6..d2a8e033ad 100644 --- a/dashboard-ui/scripts/moviesrecommended.js +++ b/dashboard-ui/scripts/moviesrecommended.js @@ -52,13 +52,13 @@ SortOrder: "Descending", IncludeItemTypes: "Movie", Filters: "IsResumable", - Limit: screenWidth >= 1920 ? 10 : (screenWidth >= 1600 ? 8 : (screenWidth >= 1200 ? 6 : 3)), + Limit: screenWidth >= 1920 ? 12 : (screenWidth >= 1600 ? 8 : (screenWidth >= 1200 ? 6 : 3)), Recursive: true, Fields: "PrimaryImageAspectRatio,MediaSourceCount", CollapseBoxSetItems: false, ParentId: parentId, ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Logo,Thumb" + EnableImageTypes: "Primary,Backdrop,Banner,Thumb" }; ApiClient.getItems(Dashboard.getCurrentUserId(), options).done(function (result) { @@ -88,7 +88,7 @@ ItemLimit: screenWidth >= 1920 ? 10 : (screenWidth >= 1600 ? 7 : (screenWidth >= 1200 ? 7 : 7)), Fields: "PrimaryImageAspectRatio,MediaSourceCount", ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Logo,Thumb" + EnableImageTypes: "Primary,Backdrop,Banner,Thumb" }); ApiClient.getJSON(url).done(function (recommendations) { diff --git a/dashboard-ui/scripts/movietrailers.js b/dashboard-ui/scripts/movietrailers.js index 0ea94f0056..399d29d2f2 100644 --- a/dashboard-ui/scripts/movietrailers.js +++ b/dashboard-ui/scripts/movietrailers.js @@ -11,7 +11,7 @@ Fields: "PrimaryImageAspectRatio,SortName", StartIndex: 0, ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Logo,Thumb" + EnableImageTypes: "Primary,Backdrop,Banner,Thumb" }; function getSavedQueryKey() { diff --git a/dashboard-ui/scripts/musicalbumartists.js b/dashboard-ui/scripts/musicalbumartists.js index 7edd946241..949d121522 100644 --- a/dashboard-ui/scripts/musicalbumartists.js +++ b/dashboard-ui/scripts/musicalbumartists.js @@ -13,7 +13,7 @@ Fields: "PrimaryImageAspectRatio,SortName,DateCreated", StartIndex: 0, ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Logo,Thumb" + EnableImageTypes: "Primary,Backdrop,Banner,Thumb" }; function getSavedQueryKey() { diff --git a/dashboard-ui/scripts/musicalbums.js b/dashboard-ui/scripts/musicalbums.js index c82f323547..7c9735f7ae 100644 --- a/dashboard-ui/scripts/musicalbums.js +++ b/dashboard-ui/scripts/musicalbums.js @@ -12,7 +12,7 @@ Fields: "PrimaryImageAspectRatio,SortName", StartIndex: 0, ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Logo,Thumb" + EnableImageTypes: "Primary,Backdrop,Banner,Thumb" }; function getSavedQueryKey() { diff --git a/dashboard-ui/scripts/musicartists.js b/dashboard-ui/scripts/musicartists.js index ad8efad371..37268e32cc 100644 --- a/dashboard-ui/scripts/musicartists.js +++ b/dashboard-ui/scripts/musicartists.js @@ -13,7 +13,7 @@ Fields: "PrimaryImageAspectRatio,SortName,DateCreated", StartIndex: 0, ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Logo,Thumb" + EnableImageTypes: "Primary,Backdrop,Banner,Thumb" }; function getSavedQueryKey() { diff --git a/dashboard-ui/scripts/musicrecommended.js b/dashboard-ui/scripts/musicrecommended.js index a5a7851c45..ae5c9fb2a9 100644 --- a/dashboard-ui/scripts/musicrecommended.js +++ b/dashboard-ui/scripts/musicrecommended.js @@ -15,7 +15,7 @@ Fields: "PrimaryImageAspectRatio", ParentId: parentId, ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Logo,Thumb" + EnableImageTypes: "Primary,Backdrop,Banner,Thumb" }; ApiClient.getJSON(ApiClient.getUrl('Users/' + userId + '/Items/Latest', options)).done(function (items) { @@ -42,7 +42,7 @@ Filters: "IsPlayed", ParentId: parentId, ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Logo,Thumb" + EnableImageTypes: "Primary,Backdrop,Banner,Thumb" }; ApiClient.getItems(Dashboard.getCurrentUserId(), options).done(function (result) { @@ -76,7 +76,7 @@ Filters: "IsPlayed", ParentId: parentId, ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Logo,Thumb" + EnableImageTypes: "Primary,Backdrop,Banner,Thumb" }; ApiClient.getItems(Dashboard.getCurrentUserId(), options).done(function (result) { diff --git a/dashboard-ui/scripts/playlistedit.js b/dashboard-ui/scripts/playlistedit.js index 8c02e551b0..357db51ea5 100644 --- a/dashboard-ui/scripts/playlistedit.js +++ b/dashboard-ui/scripts/playlistedit.js @@ -10,7 +10,7 @@ Fields: "PrimaryImageAspectRatio", StartIndex: 0, ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Logo,Thumb" + EnableImageTypes: "Primary,Backdrop,Banner,Thumb" }; function getSavedQueryKey() { diff --git a/dashboard-ui/scripts/songs.js b/dashboard-ui/scripts/songs.js index 739cd94610..8e98b3e543 100644 --- a/dashboard-ui/scripts/songs.js +++ b/dashboard-ui/scripts/songs.js @@ -13,7 +13,7 @@ Limit: 200, StartIndex: 0, ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Logo,Thumb" + EnableImageTypes: "Primary,Backdrop,Banner,Thumb" }; function getSavedQueryKey() { diff --git a/dashboard-ui/scripts/tvlatest.js b/dashboard-ui/scripts/tvlatest.js index 15851ef4ad..dc36347921 100644 --- a/dashboard-ui/scripts/tvlatest.js +++ b/dashboard-ui/scripts/tvlatest.js @@ -12,12 +12,12 @@ var options = { IncludeItemTypes: "Episode", - Limit: 24, + Limit: 30, Fields: "PrimaryImageAspectRatio", ParentId: parentId, IsPlayed: false, ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Logo,Thumb" + EnableImageTypes: "Primary,Backdrop,Banner,Thumb" }; ApiClient.getJSON(ApiClient.getUrl('Users/' + userId + '/Items/Latest', options)).done(function (items) { diff --git a/dashboard-ui/scripts/tvrecommended.js b/dashboard-ui/scripts/tvrecommended.js index 4a4b98805b..ca93897d3a 100644 --- a/dashboard-ui/scripts/tvrecommended.js +++ b/dashboard-ui/scripts/tvrecommended.js @@ -9,7 +9,7 @@ UserId: Dashboard.getCurrentUserId(), ExcludeLocationTypes: "Virtual", ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Logo,Thumb" + EnableImageTypes: "Primary,Backdrop,Banner,Thumb" }; query.ParentId = LibraryMenu.getTopParentId(); @@ -44,7 +44,7 @@ UserId: Dashboard.getCurrentUserId(), ExcludeLocationTypes: "Virtual", ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Logo,Thumb" + EnableImageTypes: "Primary,Backdrop,Banner,Thumb" }; query.ParentId = LibraryMenu.getTopParentId(); @@ -99,13 +99,13 @@ SortOrder: "Descending", IncludeItemTypes: "Episode", Filters: "IsResumable", - Limit: screenWidth >= 1920 ? 5 : (screenWidth >= 1200 ? 6 : 4), + Limit: screenWidth >= 1920 ? 6 : (screenWidth >= 1200 ? 6 : 4), Recursive: true, Fields: "PrimaryImageAspectRatio,SeriesInfo,UserData", ExcludeLocationTypes: "Virtual", ParentId: parentId, ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Logo,Thumb" + EnableImageTypes: "Primary,Backdrop,Banner,Thumb" }; ApiClient.getItems(Dashboard.getCurrentUserId(), options).done(function (result) { diff --git a/dashboard-ui/scripts/tvshows.js b/dashboard-ui/scripts/tvshows.js index e1d596c854..51167692ab 100644 --- a/dashboard-ui/scripts/tvshows.js +++ b/dashboard-ui/scripts/tvshows.js @@ -12,7 +12,7 @@ Fields: "PrimaryImageAspectRatio,SortName", StartIndex: 0, ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Logo,Thumb" + EnableImageTypes: "Primary,Backdrop,Banner,Thumb" }; function getSavedQueryKey() { diff --git a/dashboard-ui/scripts/tvupcoming.js b/dashboard-ui/scripts/tvupcoming.js index a5192dda76..05b2254095 100644 --- a/dashboard-ui/scripts/tvupcoming.js +++ b/dashboard-ui/scripts/tvupcoming.js @@ -6,11 +6,11 @@ var query = { - Limit: 32, - Fields: "SeriesInfo,UserData", + Limit: 40, + Fields: "SeriesInfo,UserData,SeriesStudio", UserId: Dashboard.getCurrentUserId(), ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Logo,Thumb" + EnableImageTypes: "Primary,Backdrop,Banner,Thumb" }; query.ParentId = LibraryMenu.getTopParentId(); diff --git a/dashboard-ui/thirdparty/apiclient/connectionmanager.js b/dashboard-ui/thirdparty/apiclient/connectionmanager.js index 6fa93d2f05..8479a648ad 100644 --- a/dashboard-ui/thirdparty/apiclient/connectionmanager.js +++ b/dashboard-ui/thirdparty/apiclient/connectionmanager.js @@ -67,7 +67,7 @@ url: url + "/mediabrowser/system/info/public", dataType: "json", - timeout: 5000 + timeout: 15000 }); } diff --git a/dashboard-ui/thirdparty/apiclient/mediabrowser.apiclient.js b/dashboard-ui/thirdparty/apiclient/mediabrowser.apiclient.js index b0554cde9b..304c721f89 100644 --- a/dashboard-ui/thirdparty/apiclient/mediabrowser.apiclient.js +++ b/dashboard-ui/thirdparty/apiclient/mediabrowser.apiclient.js @@ -192,7 +192,7 @@ url: url + "/mediabrowser/system/info/public", dataType: "json", - timeout: 3000 + timeout: 15000 }).done(function () { @@ -254,7 +254,7 @@ console.log("Requesting " + request.url); - request.timeout = 3000; + request.timeout = 15000; $.ajax(request).done(function (response) {