diff --git a/dashboard-ui/itemlist.html b/dashboard-ui/itemlist.html index 9357d19e17..e4bf6134bb 100644 --- a/dashboard-ui/itemlist.html +++ b/dashboard-ui/itemlist.html @@ -4,7 +4,7 @@ -
+
@@ -13,31 +13,7 @@
-
-
- -
-
-
- -
- -

- ${HeaderFilters} -

- -
- ${OptionPlayed} - ${OptionUnplayed} - ${OptionResumable} - ${OptionFavorite} - ${OptionLikes} - ${OptionDislikes} -
- -
-
-
+
diff --git a/dashboard-ui/scripts/itemlistpage.js b/dashboard-ui/scripts/itemlistpage.js index 619bbfff8b..db6f459dde 100644 --- a/dashboard-ui/scripts/itemlistpage.js +++ b/dashboard-ui/scripts/itemlistpage.js @@ -69,13 +69,12 @@ startIndex: query.StartIndex, limit: query.Limit, totalRecordCount: result.TotalRecordCount, - viewButton: true, showLimit: false, addLayoutButton: true, currentLayout: view, - viewIcon: 'filter-list', sortButton: true, - layouts: 'Poster,PosterCard,Thumb' + layouts: 'Poster,PosterCard,Thumb', + filterButton: true }); page.querySelector('.listTopPaging').innerHTML = pagingHtml; @@ -121,6 +120,10 @@ elem.innerHTML = html + pagingHtml; ImageLoader.lazyChildren(elem); + $('.btnFilter', page).on('click', function () { + showFilterMenu(page); + }); + $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; reloadItems(page); @@ -208,19 +211,26 @@ }); } + function showFilterMenu(page) { + + require(['components/filterdialog/filterdialog'], function (filterDialogFactory) { + + var filterDialog = new filterDialogFactory({ + query: getQuery() + }); + + Events.on(filterDialog, 'filterchange', function () { + reloadItems(page); + }); + + filterDialog.show(); + }); + } + function updateFilterControls(page) { var query = getQuery(); - $('.chkStandardFilter', page).each(function () { - - var filters = "," + (query.Filters || ""); - var filterName = this.getAttribute('data-filter'); - - this.checked = filters.indexOf(',' + filterName) != -1; - - }); - $('.alphabetPicker', page).alphaValue(query.NameStartsWithOrGreater); } @@ -242,24 +252,6 @@ var page = this; - $('.chkStandardFilter', this).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(page); - }); - $('.alphabetPicker', this).on('alphaselect', function (e, character) { var query = getQuery();