diff --git a/dashboard-ui/components/filterdialog/filterdialog.js b/dashboard-ui/components/filterdialog/filterdialog.js index a06a783d19..5c8625600c 100644 --- a/dashboard-ui/components/filterdialog/filterdialog.js +++ b/dashboard-ui/components/filterdialog/filterdialog.js @@ -1,4 +1,77 @@ -define(['paperdialoghelper', 'events', 'paper-checkbox'], function (paperDialogHelper, events) { +define(['paperdialoghelper', 'events', 'paper-checkbox', 'jqmcollapsible', 'css!components/filterdialog/style', 'paper-radio-button', 'paper-radio-group'], function (paperDialogHelper, events) { + + function renderOptions(context, selector, cssClass, items) { + + var elem = context.querySelector(selector); + + if (items.length) { + + elem.classList.remove('hide'); + + } else { + elem.classList.add('hide'); + } + + var html = ''; + + // style="margin: -.2em -.8em;" + html += '
'; + + var index = 0; + var idPrefix = 'chk' + selector.substring(1); + + html += items.map(function (filter) { + + var itemHtml = ''; + + var id = idPrefix + index; + //itemHtml += '
'; + //itemHtml += ''; + //itemHtml += ''; + //itemHtml += '
'; + + itemHtml += '' + filter + ''; + + index++; + + return itemHtml; + + }).join(''); + + html += '
'; + + elem.querySelector('.filterOptions').innerHTML = html; + } + + function renderFilters(context, result) { + + // If there's a huge number of these they will be really show to render + if (result.Tags) { + result.Tags.length = Math.min(result.Tags.length, 50); + } + + renderOptions(context, '.genreFilters', 'chkGenreFilter', result.Genres); + renderOptions(context, '.officialRatingFilters', 'chkOfficialRatingFilter', result.OfficialRatings); + renderOptions(context, '.tagFilters', 'chkTagFilter', result.Tags); + renderOptions(context, '.yearFilters', 'chkYearFilter', result.Years); + + } + + function loadDynamicFilters(context, userId, itemQuery) { + + return ApiClient.getJSON(ApiClient.getUrl('Items/Filters', { + + UserId: userId, + ParentId: itemQuery.ParentId, + IncludeItemTypes: itemQuery.IncludeItemTypes + + + })).then(function (result) { + + renderFilters(context, result); + }); + + } function updateFilterControls(context, options) { @@ -20,6 +93,20 @@ }); } + + $('.chkVideoTypeFilter', context).each(function () { + + var filters = "," + (query.VideoTypes || ""); + var filterName = this.getAttribute('data-filter'); + + this.checked = filters.indexOf(',' + filterName) != -1; + }); + + $('.chk3DFilter', context).checked(query.Is3D == true); + $('.chkHDFilter', context).checked(query.IsHD == true); + $('.chkSDFilter', context).checked(query.IsHD == false); + + context.querySelector('.playersRadioGroup').selected = query.MinPlayers == null ? 'all' : query.MinPlayers; } function triggerChange(instance) { @@ -27,6 +114,19 @@ events.trigger(instance, 'filterchange'); } + function parentWithClass(elem, className) { + + while (!elem.classList || !elem.classList.contains(className)) { + elem = elem.parentNode; + + if (!elem) { + return null; + } + } + + return elem; + } + function bindEvents(instance, context, options) { var query = options.query; @@ -71,6 +171,133 @@ triggerChange(instance); }); } + + $('.chkVideoTypeFilter', context).on('change', function () { + + var filterName = this.getAttribute('data-filter'); + var filters = query.VideoTypes || ""; + + filters = (',' + filters).replace(',' + filterName, '').substring(1); + + if (this.checked) { + filters = filters ? (filters + ',' + filterName) : filterName; + } + + query.StartIndex = 0; + query.VideoTypes = filters; + + triggerChange(instance); + }); + + $('.chk3DFilter', context).on('change', function () { + + query.StartIndex = 0; + query.Is3D = this.checked ? true : null; + + triggerChange(instance); + }); + + $('.chkHDFilter', context).on('change', function () { + + query.StartIndex = 0; + query.IsHD = this.checked ? true : null; + triggerChange(instance); + }); + + $('.chkSDFilter', context).on('change', function () { + + query.StartIndex = 0; + query.IsHD = this.checked ? false : null; + + triggerChange(instance); + }); + + context.querySelector('.playersRadioGroup').addEventListener('iron-select', function(e) { + + query.StartIndex = 0; + var val = e.target.selected; + query.MinPlayers = val == "all" ? null : val; + triggerChange(instance); + }); + + context.addEventListener('change', function(e) { + + var chkGenreFilter = parentWithClass(e.target, 'chkGenreFilter'); + if (chkGenreFilter) { + var filterName = chkGenreFilter.getAttribute('data-filter'); + var filters = query.Genres || ""; + var delimiter = '|'; + + filters = (delimiter + filters).replace(delimiter + filterName, '').substring(1); + + if (chkGenreFilter.checked) { + filters = filters ? (filters + delimiter + filterName) : filterName; + } + + query.StartIndex = 0; + query.Genres = filters; + + triggerChange(instance); + return; + } + + var chkTagFilter = parentWithClass(e.target, 'chkTagFilter'); + if (chkTagFilter) { + var filterName = chkTagFilter.getAttribute('data-filter'); + var filters = query.Tags || ""; + var delimiter = '|'; + + filters = (delimiter + filters).replace(delimiter + filterName, '').substring(1); + + if (chkTagFilter.checked) { + filters = filters ? (filters + delimiter + filterName) : filterName; + } + + query.StartIndex = 0; + query.Tags = filters; + + triggerChange(instance); + return; + } + + var chkYearFilter = parentWithClass(e.target, 'chkYearFilter'); + if (chkYearFilter) { + var filterName = chkYearFilter.getAttribute('data-filter'); + var filters = query.Years || ""; + var delimiter = ','; + + filters = (delimiter + filters).replace(delimiter + filterName, '').substring(1); + + if (chkYearFilter.checked) { + filters = filters ? (filters + delimiter + filterName) : filterName; + } + + query.StartIndex = 0; + query.Years = filters; + + triggerChange(instance); + return; + } + + var chkOfficialRatingFilter = parentWithClass(e.target, 'chkOfficialRatingFilter'); + if (chkOfficialRatingFilter) { + var filterName = chkOfficialRatingFilter.getAttribute('data-filter'); + var filters = query.OfficialRatings || ""; + var delimiter = '|'; + + filters = (delimiter + filters).replace(delimiter + filterName, '').substring(1); + + if (chkOfficialRatingFilter.checked) { + filters = filters ? (filters + delimiter + filterName) : filterName; + } + + query.StartIndex = 0; + query.OfficialRatings = filters; + + triggerChange(instance); + return; + } + }); } function setVisibility(context, options) { @@ -79,6 +306,20 @@ hideByClass(context, 'nolivetvchannels'); } + if (enableDynamicFilters(options.mode)) { + context.querySelector('.genreFilters').classList.remove('hide'); + context.querySelector('.officialRatingFilters').classList.remove('hide'); + context.querySelector('.tagFilters').classList.remove('hide'); + context.querySelector('.yearFilters').classList.remove('hide'); + } + + if (options.mode == 'movies') { + context.querySelector('.videoTypeFilters').classList.remove('hide'); + } + + if (options.mode == 'games') { + context.querySelector('.players').classList.remove('hide'); + } } function hideByClass(context, className) { @@ -90,6 +331,10 @@ } } + function enableDynamicFilters(mode) { + return mode == 'movies' || mode == 'games'; + } + return function (options) { var self = this; @@ -115,21 +360,31 @@ dlg.classList.add('background-theme-a'); dlg.classList.add('formDialog'); + dlg.classList.add('filterDialog'); var html = ''; html += Globalize.translateDocument(template); dlg.innerHTML = html; + setVisibility(dlg, options); document.body.appendChild(dlg); + // needed for jqm collapsibles + $(dlg.querySelector('.filterDialogContent')).trigger('create'); + paperDialogHelper.open(dlg); dlg.addEventListener('iron-overlay-closed', resolve); updateFilterControls(dlg, options); bindEvents(self, dlg, options); + + if (enableDynamicFilters(options.mode)) { + dlg.classList.add('dynamicFilterDialog'); + loadDynamicFilters(dlg, Dashboard.getCurrentUserId(), options.query); + } } xhr.send(); diff --git a/dashboard-ui/components/filterdialog/filterdialog.template.html b/dashboard-ui/components/filterdialog/filterdialog.template.html index 0bde71bf8a..640add0923 100644 --- a/dashboard-ui/components/filterdialog/filterdialog.template.html +++ b/dashboard-ui/components/filterdialog/filterdialog.template.html @@ -1,5 +1,5 @@ -
-

+
+

${HeaderFilters}

@@ -10,4 +10,65 @@ ${OptionLikes} ${OptionDislikes}
+ +
+

+ ${HeaderNumberOfPlayers} +

+ + ${OptionAnyNumberOfPlayers} + ${Option2Player} + ${Option3Player} + ${Option4Player} + +
+ +
+

${HeaderGenres}

+ +
+
+
+ +
+

${HeaderParentalRatings}

+ +
+
+
+ +
+

${HeaderTags}

+ +
+
+
+ +
+

${HeaderTags}

+ +
+
+
+ +
+

${HeaderVideoTypes}

+ +
+ ${OptionBluray} + ${OptionDvd} + ${OptionIso} + + ${OptionIsHD} + ${OptionIsSD} + ${Option3D} +
+
+ +
+

${HeaderYears}

+ +
+
+
\ No newline at end of file diff --git a/dashboard-ui/components/filterdialog/style.css b/dashboard-ui/components/filterdialog/style.css new file mode 100644 index 0000000000..14bb934b02 --- /dev/null +++ b/dashboard-ui/components/filterdialog/style.css @@ -0,0 +1,30 @@ +.dynamicFilterDialog { + position: fixed !important; + top: 5% !important; + bottom: 5% !important; + margin: 0 !important; + border-radius: 0 !important; + max-height: none !important; + max-width: none !important; + min-width: 200px; +} + +@media all and (min-height: 300px) { + + .dynamicFilterDialog { + top: 10% !important; + bottom: 10% !important; + } +} + +@media all and (min-width: 300px) { + + .dynamicFilterDialog { + min-width: 240px; + } +} + +.filterDialog paper-radio-button { + display: block; + padding-left: 0; +} diff --git a/dashboard-ui/games.html b/dashboard-ui/games.html index a5db396efc..395d3b1afc 100644 --- a/dashboard-ui/games.html +++ b/dashboard-ui/games.html @@ -4,7 +4,7 @@ Emby -
+
${TabSuggestions} ${TabGames} @@ -23,143 +23,6 @@
- -
-
- -
- ${TabView} - ${TabSort} - ${TabFilter} -
- -
- -
- - -
-
-
- - -
- -
- -
-
- - ${HeaderSortBy} - - - - - - - - - - - - - - - - - - - -
- -
- - ${HeaderSortOrder} - - - - - - - -
- -
- -
-
- - ${HeaderFilters} - - - - - - - - - - - - - - - -
- -
- - ${HeaderNumberOfPlayers} - - - - - - - - - - - - - -
-
- -
-

${HeaderGenres}

- -
-
-
- -
-

${HeaderParentalRatings}

- -
-
-
- -
-

${HeaderTags}

- -
-
-
- -
-

${HeaderYears}

- -
-
-
-
-
-
diff --git a/dashboard-ui/movies.html b/dashboard-ui/movies.html index 5ec1aef64a..c57e1f6428 100644 --- a/dashboard-ui/movies.html +++ b/dashboard-ui/movies.html @@ -4,7 +4,7 @@ Emby -
+
@@ -117,92 +117,6 @@
-
-
-
- -
-

- ${HeaderFilters} -

-
- ${OptionPlayed} - ${OptionUnplayed} - ${OptionResumable} - ${OptionFavorite} - ${OptionLikes} - ${OptionDislikes} -
-
-
- -
-

${HeaderGenres}

- -
-
-
- -
-

${HeaderParentalRatings}

- -
-
-
- -
-

${HeaderTags}

- -
-
-
- -
-

${HeaderVideoTypes}

- -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
-
-
- -
-

${HeaderYears}

- -
-
-
-
-
-
diff --git a/dashboard-ui/scripts/gamespage.js b/dashboard-ui/scripts/gamespage.js index 372a446297..b51e72a2cb 100644 --- a/dashboard-ui/scripts/gamespage.js +++ b/dashboard-ui/scripts/gamespage.js @@ -1,30 +1,49 @@ - (function ($, document) { - var view = LibraryBrowser.getDefaultItemsView('Poster', 'List'); + var data = {}; - // The base query options - var query = { + function getPageData() { + var key = getSavedQueryKey(); + var pageData = data[key]; - SortBy: "SortName", - SortOrder: "Ascending", - MediaTypes: "Game", - Recursive: true, - Fields: "Genres,Studios,PrimaryImageAspectRatio,SortName", - StartIndex: 0, - ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Banner,Thumb" - }; + if (!pageData) { + pageData = data[key] = { + query: { + SortBy: "SortName", + SortOrder: "Ascending", + MediaTypes: "Game", + Recursive: true, + Fields: "Genres,Studios,PrimaryImageAspectRatio,SortName", + ImageTypeLimit: 1, + EnableImageTypes: "Primary,Backdrop,Banner,Thumb", + StartIndex: 0, + Limit: LibraryBrowser.getDefaultPageSize() + }, + view: LibraryBrowser.getSavedView(key) || LibraryBrowser.getDefaultItemsView('Poster', 'List') + }; + + pageData.query.ParentId = LibraryMenu.getTopParentId(); + LibraryBrowser.loadSavedQueryValues(key, pageData.query); + } + return pageData; + } + + function getQuery() { + + return getPageData().query; + } function getSavedQueryKey() { - return LibraryBrowser.getSavedQueryKey(); + return LibraryBrowser.getSavedQueryKey('movies'); } function reloadItems(page) { Dashboard.showLoadingMsg(); + var query = getQuery(); + ApiClient.getItems(Dashboard.getCurrentUserId(), query).then(function (result) { // Scroll back up so they can see the results from the beginning @@ -36,12 +55,11 @@ startIndex: query.StartIndex, limit: query.Limit, totalRecordCount: result.TotalRecordCount, - viewButton: true, - showLimit: false + showLimit: false, + filterButton: true })); - updateFilterControls(page); - var trigger = false; + var view = getPageData().view; if (view == "List") { @@ -86,120 +104,40 @@ reloadItems(page); }); + $('.btnFilter', page).on('click', function () { + showFilterMenu(page); + }); + LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); Dashboard.hideLoadingMsg(); }); } - function updateFilterControls(page) { + function showFilterMenu(page) { - // Reset form values using the last used query - $('.radioSortBy', page).each(function () { + require(['components/filterdialog/filterdialog'], function (filterDialogFactory) { - this.checked = (query.SortBy || '').toLowerCase() == this.getAttribute('data-sortby').toLowerCase(); - - }).checkboxradio('refresh'); - - $('.radioSortOrder', page).each(function () { - - this.checked = (query.SortOrder || '').toLowerCase() == this.getAttribute('data-sortorder').toLowerCase(); - - }).checkboxradio('refresh'); - - $('.radioPlayers', page).each(function () { - - var val = this.getAttribute('data-value'); - - if (val == "all") { - - this.checked = query.MinPlayers == null; - } else { - this.checked = query.MinPlayers == val; - } - - }).checkboxradio('refresh'); - - $('.chkStandardFilter', page).each(function () { - - var filters = "," + (query.Filters || ""); - var filterName = this.getAttribute('data-filter'); - - this.checked = filters.indexOf(',' + filterName) != -1; - - }).checkboxradio('refresh'); - - $('#selectView', page).val(view); - - $('.alphabetPicker', page).alphaValue(query.NameStartsWith); - $('#selectPageSize', page).val(query.Limit); - } - - var filtersLoaded; - function reloadFiltersIfNeeded(page) { - - if (!filtersLoaded) { - - filtersLoaded = true; - - QueryFilters.loadFilters(page, Dashboard.getCurrentUserId(), query, function () { + var filterDialog = new filterDialogFactory({ + query: getQuery(), + mode: 'games' + }); + Events.on(filterDialog, 'filterchange', function () { reloadItems(page); }); - } + + filterDialog.show(); + }); } $(document).on('pageinit', "#gamesPage", function () { var page = this; - $('.viewPanel', page).on('panelopen', function () { - - reloadFiltersIfNeeded(page); - }); - - $('.radioSortBy', this).on('click', function () { - query.StartIndex = 0; - query.SortBy = this.getAttribute('data-sortby'); - reloadItems(page); - }); - - $('.radioSortOrder', this).on('click', function () { - query.StartIndex = 0; - query.SortOrder = this.getAttribute('data-sortorder'); - reloadItems(page); - }); - - $('.radioPlayers', this).on('click', function () { - - query.StartIndex = 0; - - var val = this.getAttribute('data-value'); - - query.MinPlayers = val == "all" ? null : val; - - reloadItems(page); - }); - - $('.chkStandardFilter', this).on('change', function () { - - var filterName = this.getAttribute('data-filter'); - var filters = query.Filters || ""; - - filters = (',' + filters).replace(',' + filterName, '').substring(1); - - if (this.checked) { - filters = filters ? (filters + ',' + filterName) : filterName; - } - - query.StartIndex = 0; - query.Filters = filters; - - reloadItems(page); - }); - $('.alphabetPicker', this).on('alphaselect', function (e, character) { + var query = getQuery(); query.NameStartsWithOrGreater = character; query.StartIndex = 0; @@ -207,38 +145,16 @@ }).on('alphaclear', function (e) { + var query = getQuery(); query.NameStartsWithOrGreater = ''; reloadItems(page); }); - $('#selectView', this).on('change', function () { - - view = this.value; - - if (view == "Timeline") { - - query.SortBy = "PremiereDate"; - query.SortOrder = "Descending"; - query.StartIndex = 0; - $('#radioPremiereDate', page)[0].click(); - - } else { - reloadItems(page); - } - - LibraryBrowser.saveViewSetting(getSavedQueryKey(), view); - }); - - $('#selectPageSize', page).on('change', function () { - query.Limit = parseInt(this.value); - query.StartIndex = 0; - reloadItems(page); - }); - }).on('pagebeforeshow', "#gamesPage", function () { var page = this; + var query = getQuery(); query.ParentId = LibraryMenu.getTopParentId(); var limit = LibraryBrowser.getDefaultPageSize(); @@ -252,7 +168,6 @@ var viewkey = getSavedQueryKey(); LibraryBrowser.loadSavedQueryValues(viewkey, query); - QueryFilters.onPageShow(page, query); LibraryBrowser.getSavedViewSetting(viewkey).then(function (val) { @@ -262,8 +177,6 @@ reloadItems(page); } }); - - updateFilterControls(this); }); })(jQuery, document); \ No newline at end of file diff --git a/dashboard-ui/scripts/movies.js b/dashboard-ui/scripts/movies.js index 77db19f1df..534db77697 100644 --- a/dashboard-ui/scripts/movies.js +++ b/dashboard-ui/scripts/movies.js @@ -58,15 +58,13 @@ startIndex: query.StartIndex, limit: query.Limit, totalRecordCount: result.TotalRecordCount, - viewButton: true, showLimit: false, - viewPanelClass: 'movieViewPanel', updatePageSizeSetting: false, addLayoutButton: true, - viewIcon: 'filter-list', sortButton: true, currentLayout: view, - layouts: 'Banner,List,Poster,PosterCard,Thumb,ThumbCard,Timeline' + layouts: 'Banner,List,Poster,PosterCard,Thumb,ThumbCard,Timeline', + filterButton: true }); page.querySelector('.listTopPaging').innerHTML = pagingHtml; @@ -152,12 +150,12 @@ $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; - reloadItems(page, viewPanel); + reloadItems(page); }); $('.btnPreviousPage', page).on('click', function () { query.StartIndex -= query.Limit; - reloadItems(page, viewPanel); + reloadItems(page); }); $('.btnChangeLayout', page).on('layoutchange', function (e, layout) { @@ -169,7 +167,11 @@ getPageData().view = layout; LibraryBrowser.saveViewSetting(getSavedQueryKey(), layout); - reloadItems(page, viewPanel); + reloadItems(page); + }); + + $('.btnFilter', page).on('click', function () { + showFilterMenu(page); }); // On callback make sure to set StartIndex = 0 @@ -228,7 +230,7 @@ id: 'VideoBitRate,SortName' }], callback: function () { - reloadItems(page, viewPanel); + reloadItems(page); }, query: query }); @@ -242,117 +244,31 @@ }); } - function updateFilterControls(tabContent, viewPanel) { + function showFilterMenu(page) { + + require(['components/filterdialog/filterdialog'], function (filterDialogFactory) { + + var filterDialog = new filterDialogFactory({ + query: getQuery(), + mode: 'movies' + }); + + Events.on(filterDialog, 'filterchange', function () { + reloadItems(page); + }); + + filterDialog.show(); + }); + } + + function updateFilterControls(tabContent) { var query = getQuery(); - $('.chkStandardFilter', viewPanel).each(function () { - - var filters = "," + (query.Filters || ""); - var filterName = this.getAttribute('data-filter'); - - this.checked = filters.indexOf(',' + filterName) != -1; - - }); - - $('.chkVideoTypeFilter', viewPanel).each(function () { - - var filters = "," + (query.VideoTypes || ""); - var filterName = this.getAttribute('data-filter'); - - this.checked = filters.indexOf(',' + filterName) != -1; - - }); - - $('.chk3DFilter', viewPanel).checked(query.Is3D == true); - $('.chkHDFilter', viewPanel).checked(query.IsHD == true); - $('.chkSDFilter', viewPanel).checked(query.IsHD == false); - $('.alphabetPicker', tabContent).alphaValue(query.NameStartsWithOrGreater); } - function reloadFiltersIfNeeded(tabContent, viewPanel) { - - if (!getPageData().filtersLoaded) { - - getPageData().filtersLoaded = true; - - var query = getQuery(); - QueryFilters.loadFilters(viewPanel, Dashboard.getCurrentUserId(), query, function () { - - reloadItems(tabContent, viewPanel); - }); - } - } - - function initPage(tabContent, viewPanel) { - - $(viewPanel).on('panelopen', function () { - - reloadFiltersIfNeeded(tabContent, viewPanel); - }); - - $('.chkStandardFilter', viewPanel).on('change', function () { - - var query = getQuery(); - var filterName = this.getAttribute('data-filter'); - var filters = query.Filters || ""; - - filters = (',' + filters).replace(',' + filterName, '').substring(1); - - if (this.checked) { - filters = filters ? (filters + ',' + filterName) : filterName; - } - - query.StartIndex = 0; - query.Filters = filters; - - reloadItems(tabContent, viewPanel); - }); - - $('.chkVideoTypeFilter', viewPanel).on('change', function () { - - var query = getQuery(); - var filterName = this.getAttribute('data-filter'); - var filters = query.VideoTypes || ""; - - filters = (',' + filters).replace(',' + filterName, '').substring(1); - - if (this.checked) { - filters = filters ? (filters + ',' + filterName) : filterName; - } - - query.StartIndex = 0; - query.VideoTypes = filters; - - reloadItems(tabContent, viewPanel); - }); - - $('.chk3DFilter', viewPanel).on('change', function () { - - var query = getQuery(); - query.StartIndex = 0; - query.Is3D = this.checked ? true : null; - - reloadItems(tabContent, viewPanel); - }); - - $('.chkHDFilter', viewPanel).on('change', function () { - - var query = getQuery(); - query.StartIndex = 0; - query.IsHD = this.checked ? true : null; - reloadItems(tabContent, viewPanel); - }); - - $('.chkSDFilter', viewPanel).on('change', function () { - - var query = getQuery(); - query.StartIndex = 0; - query.IsHD = this.checked ? false : null; - - reloadItems(tabContent, viewPanel); - }); + function initPage(tabContent) { $('.alphabetPicker', tabContent).on('alphaselect', function (e, character) { @@ -360,55 +276,32 @@ query.NameStartsWithOrGreater = character; query.StartIndex = 0; - reloadItems(tabContent, viewPanel); + reloadItems(tabContent); }).on('alphaclear', function (e) { var query = getQuery(); query.NameStartsWithOrGreater = ''; - reloadItems(tabContent, viewPanel); - }); - - $('.radioBasicFilters', viewPanel).on('change', function () { - - if (this.checked) { - $('.basicFilters', viewPanel).show(); - $('.advancedFilters', viewPanel).hide(); - } else { - $('.basicFilters', viewPanel).hide(); - } - }); - - $('.radioAdvancedFilters', viewPanel).on('change', function () { - - if (this.checked) { - $('.advancedFilters', viewPanel).show(); - $('.basicFilters', viewPanel).hide(); - } else { - $('.advancedFilters', viewPanel).hide(); - } + reloadItems(tabContent); }); $('.itemsContainer', tabContent).on('needsrefresh', function () { - reloadItems(tabContent, viewPanel); - + reloadItems(tabContent); }); } window.MoviesPage.initMoviesTab = function (page, tabContent) { - var viewPanel = page.querySelector('.movieViewPanel'); - initPage(tabContent, viewPanel); + initPage(tabContent); }; window.MoviesPage.renderMoviesTab = function (page, tabContent) { if (LibraryBrowser.needsRefresh(tabContent)) { - var viewPanel = page.querySelector('.movieViewPanel'); - reloadItems(tabContent, viewPanel); - updateFilterControls(tabContent, viewPanel); + reloadItems(tabContent); + updateFilterControls(tabContent); } }; diff --git a/dashboard-ui/strings/html/server.json b/dashboard-ui/strings/html/server.json index 6ee8159dc8..e55b1f2226 100644 --- a/dashboard-ui/strings/html/server.json +++ b/dashboard-ui/strings/html/server.json @@ -476,7 +476,7 @@ "LabelEnableRealtimeMonitor": "Enable real time monitoring", "LabelEnableRealtimeMonitorHelp": "Changes will be processed immediately, on supported file systems.", "ButtonScanLibrary": "Scan Library", - "HeaderNumberOfPlayers": "Players:", + "HeaderNumberOfPlayers": "Players", "OptionAnyNumberOfPlayers": "Any", "Option1Player": "1+", "Option2Player": "2+",