diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html index 5c46b8b1e..4ca107d51 100644 --- a/dashboard-ui/itemdetails.html +++ b/dashboard-ui/itemdetails.html @@ -127,10 +127,10 @@

+

-

diff --git a/dashboard-ui/scripts/boxsets.js b/dashboard-ui/scripts/boxsets.js index 781c5f138..c8909a6f6 100644 --- a/dashboard-ui/scripts/boxsets.js +++ b/dashboard-ui/scripts/boxsets.js @@ -8,7 +8,6 @@ IncludeItemTypes: "BoxSet", Recursive: true, Fields: "DisplayMediaType,ItemCounts,DateCreated,UserData", - Limit: LibraryBrowser.getDefaultPageSize(), StartIndex: 0 }; @@ -61,6 +60,8 @@ var page = this; + query.Limit = LibraryBrowser.getDefaultPageSize(); + $('.radioSortBy', this).on('click', function () { query.SortBy = this.getAttribute('data-sortby'); reloadItems(page); diff --git a/dashboard-ui/scripts/gamegenrepage.js b/dashboard-ui/scripts/gamegenrepage.js index a28ebe498..e973e926e 100644 --- a/dashboard-ui/scripts/gamegenrepage.js +++ b/dashboard-ui/scripts/gamegenrepage.js @@ -8,7 +8,6 @@ MediaTypes: "Game", Recursive: true, Fields: "ItemCounts,DateCreated,UserData", - Limit: LibraryBrowser.getDefaultPageSize(), StartIndex: 0 }; @@ -62,6 +61,8 @@ var page = this; + query.Limit = LibraryBrowser.getDefaultPageSize(); + $('.radioSortBy', this).on('click', function () { query.SortBy = this.getAttribute('data-sortby'); query.StartIndex = 0; diff --git a/dashboard-ui/scripts/gamespage.js b/dashboard-ui/scripts/gamespage.js index ad269c6e3..ad5b19520 100644 --- a/dashboard-ui/scripts/gamespage.js +++ b/dashboard-ui/scripts/gamespage.js @@ -11,7 +11,6 @@ MediaTypes: "Game", Recursive: true, Fields: "UserData,DisplayMediaType,Genres,Studios", - Limit: LibraryBrowser.getDefaultPageSize(), StartIndex: 0 }; @@ -85,6 +84,8 @@ var page = this; + query.Limit = LibraryBrowser.getDefaultPageSize(); + $('.radioSortBy', this).on('click', function () { query.StartIndex = 0; query.SortBy = this.getAttribute('data-sortby'); diff --git a/dashboard-ui/scripts/gamestudiospage.js b/dashboard-ui/scripts/gamestudiospage.js index 37b0acfb7..7b9ced7af 100644 --- a/dashboard-ui/scripts/gamestudiospage.js +++ b/dashboard-ui/scripts/gamestudiospage.js @@ -8,7 +8,6 @@ MediaTypes: "Game", Recursive: true, Fields: "ItemCounts,DateCreated,UserData", - Limit: LibraryBrowser.getDefaultPageSize(), StartIndex: 0 }; @@ -62,6 +61,8 @@ var page = this; + query.Limit = LibraryBrowser.getDefaultPageSize(); + $('.radioSortBy', this).on('click', function () { query.SortBy = this.getAttribute('data-sortby'); query.StartIndex = 0; diff --git a/dashboard-ui/scripts/gamesystemspage.js b/dashboard-ui/scripts/gamesystemspage.js index f8d16c894..098294a45 100644 --- a/dashboard-ui/scripts/gamesystemspage.js +++ b/dashboard-ui/scripts/gamesystemspage.js @@ -9,7 +9,6 @@ IncludeItemTypes: "GamePlatform", Recursive: true, Fields: "ItemCounts,ItemCounts,DateCreated,UserData", - Limit: LibraryBrowser.getDefaultPageSize(), StartIndex: 0 }; @@ -62,6 +61,8 @@ var page = this; + query.Limit = LibraryBrowser.getDefaultPageSize(); + $('.radioSortBy', this).on('click', function () { query.SortBy = this.getAttribute('data-sortby'); reloadItems(page); diff --git a/dashboard-ui/scripts/itemlistpage.js b/dashboard-ui/scripts/itemlistpage.js index 6d7fa9ab8..241411657 100644 --- a/dashboard-ui/scripts/itemlistpage.js +++ b/dashboard-ui/scripts/itemlistpage.js @@ -8,7 +8,6 @@ SortBy: "SortName", SortOrder: "Ascending", Fields: "UserData,DisplayMediaType,ItemCounts,DateCreated", - Limit: LibraryBrowser.getDefaultPageSize(), StartIndex: 0 }; @@ -100,6 +99,8 @@ var page = this; + query.Limit = LibraryBrowser.getDefaultPageSize(); + $('.radioSortBy', this).on('click', function () { query.StartIndex = 0; query.SortBy = this.getAttribute('data-sortby'); diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index ce6c793bf..a9a0e1486 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -1,4 +1,4 @@ -var LibraryBrowser = (function (window, document, $, screen) { +var LibraryBrowser = (function (window, document, $, screen, localStorage) { var defaultBackground = "#999;"; @@ -6,6 +6,12 @@ getDefaultPageSize: function () { + var saved = localStorage.getItem('pagesize'); + + if (saved) { + return parseInt(saved); + } + if (window.location.toString().toLowerCase().indexOf('localhost') != -1) { return 100; } @@ -581,7 +587,7 @@ var date = item.DateCreated; try { - if (date && (new Date().getTime() - parseISO8601Date(date).getTime()) < 864000000) { + if (date && (new Date().getTime() - parseISO8601Date(date).getTime()) < 604800000) { return "
New
"; } } catch (err) { @@ -768,6 +774,10 @@ getPagingHtml: function (query, totalRecordCount) { + if (query.Limit) { + localStorage.setItem('pagesize', query.Limit); + } + var html = ''; var pageCount = Math.ceil(totalRecordCount / query.Limit); @@ -1623,7 +1633,7 @@ }; -})(window, document, jQuery, screen); +})(window, document, jQuery, screen, localStorage); (function (window, document, $) { diff --git a/dashboard-ui/scripts/moviegenres.js b/dashboard-ui/scripts/moviegenres.js index d91ad830a..cc9e257db 100644 --- a/dashboard-ui/scripts/moviegenres.js +++ b/dashboard-ui/scripts/moviegenres.js @@ -8,7 +8,6 @@ IncludeItemTypes: "Movie", Recursive: true, Fields: "ItemCounts,DateCreated,UserData", - Limit: LibraryBrowser.getDefaultPageSize(), StartIndex: 0 }; @@ -62,6 +61,8 @@ var page = this; + query.Limit = LibraryBrowser.getDefaultPageSize(); + $('.radioSortBy', this).on('click', function () { query.SortBy = this.getAttribute('data-sortby'); query.StartIndex = 0; diff --git a/dashboard-ui/scripts/moviepeople.js b/dashboard-ui/scripts/moviepeople.js index 08f129bce..14e5f0e96 100644 --- a/dashboard-ui/scripts/moviepeople.js +++ b/dashboard-ui/scripts/moviepeople.js @@ -9,7 +9,6 @@ Recursive: true, Fields: "ItemCounts,DateCreated,UserData", PersonTypes: "", - Limit: LibraryBrowser.getDefaultPageSize(), StartIndex: 0 }; @@ -63,6 +62,8 @@ var page = this; + query.Limit = LibraryBrowser.getDefaultPageSize(); + $('.radioSortBy', this).on('click', function () { query.SortBy = this.getAttribute('data-sortby'); query.StartIndex = 0; diff --git a/dashboard-ui/scripts/movies.js b/dashboard-ui/scripts/movies.js index efbd691f8..9a7e6f4d4 100644 --- a/dashboard-ui/scripts/movies.js +++ b/dashboard-ui/scripts/movies.js @@ -10,7 +10,6 @@ IncludeItemTypes: "Movie", Recursive: true, Fields: "UserData,DisplayMediaType,ItemCounts,DateCreated", - Limit: LibraryBrowser.getDefaultPageSize(), StartIndex: 0 }; @@ -84,6 +83,8 @@ var page = this; + query.Limit = LibraryBrowser.getDefaultPageSize(); + $('.radioSortBy', this).on('click', function () { query.StartIndex = 0; query.SortBy = this.getAttribute('data-sortby'); diff --git a/dashboard-ui/scripts/moviestudios.js b/dashboard-ui/scripts/moviestudios.js index a56e08208..6e37d786a 100644 --- a/dashboard-ui/scripts/moviestudios.js +++ b/dashboard-ui/scripts/moviestudios.js @@ -8,7 +8,6 @@ IncludeItemTypes: "Movie", Recursive: true, Fields: "ItemCounts,DateCreated,UserData", - Limit: LibraryBrowser.getDefaultPageSize(), StartIndex: 0 }; @@ -62,6 +61,8 @@ var page = this; + query.Limit = LibraryBrowser.getDefaultPageSize(); + $('.radioSortBy', this).on('click', function () { query.SortBy = this.getAttribute('data-sortby'); query.StartIndex = 0; diff --git a/dashboard-ui/scripts/movietrailers.js b/dashboard-ui/scripts/movietrailers.js index 2269c8764..deb8e4284 100644 --- a/dashboard-ui/scripts/movietrailers.js +++ b/dashboard-ui/scripts/movietrailers.js @@ -10,7 +10,6 @@ IncludeItemTypes: "Trailer", Recursive: true, Fields: "UserData,DisplayMediaType,ItemCounts,DateCreated", - Limit: LibraryBrowser.getDefaultPageSize(), StartIndex: 0 }; @@ -71,6 +70,8 @@ var page = this; + query.Limit = LibraryBrowser.getDefaultPageSize(); + $('.radioSortBy', this).on('click', function () { query.StartIndex = 0; query.SortBy = this.getAttribute('data-sortby'); diff --git a/dashboard-ui/scripts/musicalbums.js b/dashboard-ui/scripts/musicalbums.js index b0616502d..11fb7492a 100644 --- a/dashboard-ui/scripts/musicalbums.js +++ b/dashboard-ui/scripts/musicalbums.js @@ -10,7 +10,6 @@ IncludeItemTypes: "MusicAlbum", Recursive: true, Fields: "ItemCounts,DateCreated,UserData", - Limit: LibraryBrowser.getDefaultPageSize(), StartIndex: 0 }; @@ -75,6 +74,8 @@ var page = this; + query.Limit = LibraryBrowser.getDefaultPageSize(); + $('.radioSortBy', this).on('click', function () { query.SortBy = this.getAttribute('data-sortby'); query.StartIndex = 0; diff --git a/dashboard-ui/scripts/musicartists.js b/dashboard-ui/scripts/musicartists.js index 98f62e12f..2ab5e5d6e 100644 --- a/dashboard-ui/scripts/musicartists.js +++ b/dashboard-ui/scripts/musicartists.js @@ -7,7 +7,6 @@ SortOrder: "Ascending", Recursive: true, Fields: "ItemCounts,DateCreated,UserData", - Limit: LibraryBrowser.getDefaultPageSize(), StartIndex: 0 }; @@ -63,6 +62,8 @@ var page = this; + query.Limit = LibraryBrowser.getDefaultPageSize(); + $('.radioSortBy', this).on('click', function () { query.SortBy = this.getAttribute('data-sortby'); query.StartIndex = 0; diff --git a/dashboard-ui/scripts/musicgenres.js b/dashboard-ui/scripts/musicgenres.js index b386216ac..1fcb90963 100644 --- a/dashboard-ui/scripts/musicgenres.js +++ b/dashboard-ui/scripts/musicgenres.js @@ -8,7 +8,6 @@ IncludeItemTypes: "Audio", Recursive: true, Fields: "ItemCounts,DateCreated,UserData", - Limit: LibraryBrowser.getDefaultPageSize(), StartIndex: 0 }; @@ -62,6 +61,8 @@ var page = this; + query.Limit = LibraryBrowser.getDefaultPageSize(); + $('.radioSortBy', this).on('click', function () { query.SortBy = this.getAttribute('data-sortby'); query.StartIndex = 0; diff --git a/dashboard-ui/scripts/tvgenres.js b/dashboard-ui/scripts/tvgenres.js index 31f070f1e..38da77454 100644 --- a/dashboard-ui/scripts/tvgenres.js +++ b/dashboard-ui/scripts/tvgenres.js @@ -8,7 +8,6 @@ IncludeItemTypes: "Series", Recursive: true, Fields: "ItemCounts,DateCreated,UserData", - Limit: LibraryBrowser.getDefaultPageSize(), StartIndex: 0 }; @@ -62,6 +61,8 @@ var page = this; + query.Limit = LibraryBrowser.getDefaultPageSize(); + $('.radioSortBy', this).on('click', function () { query.SortBy = this.getAttribute('data-sortby'); query.StartIndex = 0; diff --git a/dashboard-ui/scripts/tvpeople.js b/dashboard-ui/scripts/tvpeople.js index 43d0156ad..1c5d37488 100644 --- a/dashboard-ui/scripts/tvpeople.js +++ b/dashboard-ui/scripts/tvpeople.js @@ -9,7 +9,6 @@ Recursive: true, Fields: "ItemCounts,DateCreated,UserData", PersonTypes: "", - Limit: LibraryBrowser.getDefaultPageSize(), StartIndex: 0 }; @@ -63,6 +62,8 @@ var page = this; + query.Limit = LibraryBrowser.getDefaultPageSize(); + $('.radioSortBy', this).on('click', function () { query.SortBy = this.getAttribute('data-sortby'); query.StartIndex = 0; diff --git a/dashboard-ui/scripts/tvshows.js b/dashboard-ui/scripts/tvshows.js index 30e3ff2cf..aa570fd08 100644 --- a/dashboard-ui/scripts/tvshows.js +++ b/dashboard-ui/scripts/tvshows.js @@ -10,7 +10,6 @@ IncludeItemTypes: "Series", Recursive: true, Fields: "DisplayMediaType,SeriesInfo,ItemCounts,DateCreated,UserData", - Limit: LibraryBrowser.getDefaultPageSize(), StartIndex: 0 }; @@ -81,6 +80,8 @@ var page = this; + query.Limit = LibraryBrowser.getDefaultPageSize(); + $('.radioSortBy', this).on('click', function () { query.SortBy = this.getAttribute('data-sortby'); query.StartIndex = 0; diff --git a/dashboard-ui/scripts/tvstudios.js b/dashboard-ui/scripts/tvstudios.js index a55008b8b..109ef79f4 100644 --- a/dashboard-ui/scripts/tvstudios.js +++ b/dashboard-ui/scripts/tvstudios.js @@ -8,7 +8,6 @@ IncludeItemTypes: "Series", Recursive: true, Fields: "ItemCounts,DateCreated,UserData", - Limit: LibraryBrowser.getDefaultPageSize(), StartIndex: 0 }; @@ -62,6 +61,8 @@ var page = this; + query.Limit = LibraryBrowser.getDefaultPageSize(); + $('.radioSortBy', this).on('click', function () { query.SortBy = this.getAttribute('data-sortby'); query.StartIndex = 0;