diff --git a/dashboard-ui/components/filterdialog/style.css b/dashboard-ui/components/filterdialog/style.css
index 14bb934b02..b906acdeae 100644
--- a/dashboard-ui/components/filterdialog/style.css
+++ b/dashboard-ui/components/filterdialog/style.css
@@ -2,11 +2,14 @@
position: fixed !important;
top: 5% !important;
bottom: 5% !important;
- margin: 0 !important;
+ left: 50%!important;
+ margin-top: 0 !important;
+ margin-bottom: 0 !important;
+ margin-right: 0 !important;
border-radius: 0 !important;
max-height: none !important;
max-width: none !important;
- min-width: 200px;
+ width: 200px;
}
@media all and (min-height: 300px) {
@@ -20,7 +23,16 @@
@media all and (min-width: 300px) {
.dynamicFilterDialog {
- min-width: 240px;
+ width: 240px;
+ margin-left: -120px !important;
+ }
+}
+
+@media all and (min-width: 400px) {
+
+ .dynamicFilterDialog {
+ width: 300px;
+ margin-left: -150px !important;
}
}
diff --git a/dashboard-ui/scripts/episodes.js b/dashboard-ui/scripts/episodes.js
index 29bc6a535b..a538a74554 100644
--- a/dashboard-ui/scripts/episodes.js
+++ b/dashboard-ui/scripts/episodes.js
@@ -40,7 +40,7 @@
return LibraryBrowser.getSavedQueryKey('episodes');
}
- function reloadItems(page, viewPanel) {
+ function reloadItems(page) {
Dashboard.showLoadingMsg();
@@ -57,20 +57,18 @@
startIndex: query.StartIndex,
limit: query.Limit,
totalRecordCount: result.TotalRecordCount,
- viewButton: true,
showLimit: false,
- viewPanelClass: 'episodesViewPanel',
updatePageSizeSetting: false,
addLayoutButton: true,
- viewIcon: 'filter-list',
sortButton: true,
currentLayout: view,
- layouts: 'Poster,PosterCard'
+ layouts: 'Poster,PosterCard',
+ filterButton: true
});
page.querySelector('.listTopPaging').innerHTML = pagingHtml;
- updateFilterControls(page, viewPanel);
+ updateFilterControls(page);
if (view == "List") {
@@ -109,18 +107,22 @@
$('.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) {
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
@@ -163,7 +165,7 @@
id: 'VideoBitRate,SeriesSortName,SortName'
}],
callback: function () {
- reloadItems(page, viewPanel);
+ reloadItems(page);
},
query: query
});
@@ -175,168 +177,31 @@
});
}
- function updateFilterControls(tabContent, viewPanel) {
+ function showFilterMenu(page) {
+
+ require(['components/filterdialog/filterdialog'], function (filterDialogFactory) {
+
+ var filterDialog = new filterDialogFactory({
+ query: getQuery(),
+ mode: 'episodes'
+ });
+
+ 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.toLowerCase().indexOf(',' + filterName.toLowerCase()) != -1;
-
- });
-
- $('.chkVideoTypeFilter', viewPanel).each(function () {
-
- var filters = "," + (query.VideoTypes || "");
- var filterName = this.getAttribute('data-filter');
-
- this.checked = filters.indexOf(',' + filterName) != -1;
-
- });
-
- $('#chkHD', viewPanel).checked(query.IsHD == true);
- $('#chkSD', viewPanel).checked(query.IsHD == false);
-
- $('#chkSubtitle', viewPanel).checked(query.HasSubtitles == true);
- $('#chkTrailer', viewPanel).checked(query.HasTrailer == true);
- $('#chkThemeSong', viewPanel).checked(query.HasThemeSong == true);
- $('#chkThemeVideo', viewPanel).checked(query.HasThemeVideo == true);
- $('#chkSpecialFeature', viewPanel).checked(query.ParentIndexNumber == 0);
-
- $('#chkMissingEpisode', viewPanel).checked(query.IsMissing == true);
- $('#chkFutureEpisode', viewPanel).checked(query.IsUnaired == true);
$('.alphabetPicker', tabContent).alphaValue(query.NameStartsWithOrGreater);
}
- function initPage(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);
- });
-
- $('#chkSubtitle', viewPanel).on('change', function () {
-
- var query = getQuery();
- query.StartIndex = 0;
- query.HasSubtitles = this.checked ? true : null;
-
- reloadItems(tabContent, viewPanel);
- });
-
- $('#chkTrailer', viewPanel).on('change', function () {
-
- var query = getQuery();
- query.StartIndex = 0;
- query.HasTrailer = this.checked ? true : null;
-
- reloadItems(tabContent, viewPanel);
- });
-
- $('#chkThemeSong', viewPanel).on('change', function () {
-
- var query = getQuery();
- query.StartIndex = 0;
- query.HasThemeSong = this.checked ? true : null;
-
- reloadItems(tabContent, viewPanel);
- });
-
- $('#chkThemeVideo', viewPanel).on('change', function () {
-
- var query = getQuery();
- query.StartIndex = 0;
- query.HasThemeVideo = this.checked ? true : null;
-
- reloadItems(tabContent, viewPanel);
- });
-
- $('#chkSpecialFeature', viewPanel).on('change', function () {
-
- var query = getQuery();
- query.ParentIndexNumber = this.checked ? 0 : null;
-
- reloadItems(tabContent, viewPanel);
- });
-
- $('#chkMissingEpisode', viewPanel).on('change', function () {
-
- var query = getQuery();
- query.StartIndex = 0;
- query.IsMissing = this.checked ? true : false;
-
- reloadItems(tabContent, viewPanel);
- });
-
- $('#chkFutureEpisode', viewPanel).on('change', function () {
-
- var query = getQuery();
- query.StartIndex = 0;
-
- if (this.checked) {
- query.IsUnaired = true;
- query.IsVirtualUnaired = null;
- } else {
- query.IsUnaired = null;
- query.IsVirtualUnaired = false;
- }
-
-
- reloadItems(tabContent, viewPanel);
- });
-
- $('#chkHD', viewPanel).on('change', function () {
-
- var query = getQuery();
- query.StartIndex = 0;
- query.IsHD = this.checked ? true : null;
-
- reloadItems(tabContent, viewPanel);
- });
-
- $('#chkSD', 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) {
@@ -344,35 +209,32 @@
query.NameStartsWithOrGreater = character;
query.StartIndex = 0;
- reloadItems(tabContent, viewPanel);
+ reloadItems(tabContent);
}).on('alphaclear', function (e) {
var query = getQuery();
query.NameStartsWithOrGreater = '';
- reloadItems(tabContent, viewPanel);
+ reloadItems(tabContent);
});
$('.itemsContainer', tabContent).on('needsrefresh', function () {
- reloadItems(tabContent, viewPanel);
-
+ reloadItems(tabContent);
});
}
window.TvPage.initEpisodesTab = function (page, tabContent) {
- var viewPanel = page.querySelector('.episodesViewPanel');
- initPage(tabContent, viewPanel);
+ initPage(tabContent);
};
window.TvPage.renderEpisodesTab = function (page, tabContent) {
if (LibraryBrowser.needsRefresh(tabContent)) {
- var viewPanel = page.querySelector('.episodesViewPanel');
- reloadItems(tabContent, viewPanel);
- updateFilterControls(tabContent, viewPanel);
+ reloadItems(tabContent);
+ updateFilterControls(tabContent);
}
};
diff --git a/dashboard-ui/scripts/moviesrecommended.js b/dashboard-ui/scripts/moviesrecommended.js
index eafe4d6b04..27d8e3794e 100644
--- a/dashboard-ui/scripts/moviesrecommended.js
+++ b/dashboard-ui/scripts/moviesrecommended.js
@@ -284,7 +284,6 @@
break;
case 1:
depends.push('scripts/movies');
- depends.push('scripts/queryfilters');
renderMethod = 'renderMoviesTab';
initMethod = 'initMoviesTab';
break;
diff --git a/dashboard-ui/scripts/tvrecommended.js b/dashboard-ui/scripts/tvrecommended.js
index 4b71017381..ca83dd812d 100644
--- a/dashboard-ui/scripts/tvrecommended.js
+++ b/dashboard-ui/scripts/tvrecommended.js
@@ -208,7 +208,6 @@
break;
case 3:
depends.push('scripts/tvshows');
- depends.push('scripts/queryfilters');
renderMethod = 'renderSeriesTab';
initMethod = 'initSeriesTab';
break;
diff --git a/dashboard-ui/scripts/tvshows.js b/dashboard-ui/scripts/tvshows.js
index b66c1d9028..6d23a7a19f 100644
--- a/dashboard-ui/scripts/tvshows.js
+++ b/dashboard-ui/scripts/tvshows.js
@@ -38,7 +38,7 @@
return LibraryBrowser.getSavedQueryKey('series');
}
- function reloadItems(page, viewPanel) {
+ function reloadItems(page) {
Dashboard.showLoadingMsg();
@@ -56,15 +56,13 @@
startIndex: query.StartIndex,
limit: query.Limit,
totalRecordCount: result.TotalRecordCount,
- viewButton: true,
showLimit: false,
- viewPanelClass: 'seriesViewPanel',
updatePageSizeSetting: false,
addLayoutButton: true,
- viewIcon: 'filter-list',
sortButton: true,
currentLayout: view,
- layouts: 'Banner,List,Poster,PosterCard,Thumb,ThumbCard'
+ layouts: 'Banner,List,Poster,PosterCard,Thumb,ThumbCard',
+ filterButton: true
});
page.querySelector('.listTopPaging').innerHTML = pagingHtml;
@@ -144,18 +142,22 @@
$('.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) {
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
@@ -194,7 +196,7 @@
id: 'PremiereDate,SortName'
}],
callback: function () {
- reloadItems(page, viewPanel);
+ reloadItems(page);
},
query: query
});
@@ -207,152 +209,30 @@
});
}
- function updateFilterControls(tabContent, viewPanel) {
+ function showFilterMenu(page) {
- $('.chkStatus', viewPanel).each(function () {
+ require(['components/filterdialog/filterdialog'], function (filterDialogFactory) {
- var filters = "," + (getQuery().SeriesStatus || "");
- var filterName = this.getAttribute('data-filter');
+ var filterDialog = new filterDialogFactory({
+ query: getQuery(),
+ mode: 'series'
+ });
- this.checked = filters.indexOf(',' + filterName) != -1;
+ Events.on(filterDialog, 'filterchange', function () {
+ reloadItems(page);
+ });
+ filterDialog.show();
});
+ }
- $('.chkStandardFilter', viewPanel).each(function () {
-
- var filters = "," + (getQuery().Filters || "");
- var filterName = this.getAttribute('data-filter');
-
- this.checked = filters.indexOf(',' + filterName) != -1;
-
- });
-
- $('.chkAirDays', viewPanel).each(function () {
-
- var filters = "," + (getQuery().AirDays || "");
- var filterName = this.getAttribute('data-filter');
-
- this.checked = filters.indexOf(',' + filterName) != -1;
-
- });
+ function updateFilterControls(tabContent) {
var query = getQuery();
-
- $('#chkTrailer', viewPanel).checked(query.HasTrailer == true);
- $('#chkThemeSong', viewPanel).checked(query.HasThemeSong == true);
- $('#chkThemeVideo', viewPanel).checked(query.HasThemeVideo == true);
- $('#chkSpecialFeature', viewPanel).checked(query.HasSpecialFeature == true);
-
$('.alphabetPicker', tabContent).alphaValue(query.NameStartsWith);
}
- 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.Filters = filters;
- query.StartIndex = 0;
- reloadItems(tabContent, viewPanel);
- });
-
- $('.chkStatus', viewPanel).on('change', function () {
-
- var query = getQuery();
- var filterName = this.getAttribute('data-filter');
- var filters = query.SeriesStatus || "";
-
- filters = (',' + filters).replace(',' + filterName, '').substring(1);
-
- if (this.checked) {
- filters = filters ? (filters + ',' + filterName) : filterName;
- }
-
- query.SeriesStatus = filters;
- query.StartIndex = 0;
- reloadItems(tabContent, viewPanel);
- });
-
- $('.chkAirDays', viewPanel).on('change', function () {
-
- var query = getQuery();
- var filterName = this.getAttribute('data-filter');
- var filters = query.AirDays || "";
-
- filters = (',' + filters).replace(',' + filterName, '').substring(1);
-
- if (this.checked) {
- filters = filters ? (filters + ',' + filterName) : filterName;
- }
-
- query.AirDays = filters;
- query.StartIndex = 0;
- reloadItems(tabContent, viewPanel);
- });
-
- $('#chkTrailer', viewPanel).on('change', function () {
-
- var query = getQuery();
- query.StartIndex = 0;
- query.HasTrailer = this.checked ? true : null;
-
- reloadItems(tabContent, viewPanel);
- });
-
- $('#chkThemeSong', viewPanel).on('change', function () {
-
- var query = getQuery();
- query.StartIndex = 0;
- query.HasThemeSong = this.checked ? true : null;
-
- reloadItems(tabContent, viewPanel);
- });
-
- $('#chkSpecialFeature', viewPanel).on('change', function () {
-
- var query = getQuery();
- query.StartIndex = 0;
- query.HasSpecialFeature = this.checked ? true : null;
-
- reloadItems(tabContent, viewPanel);
- });
-
- $('#chkThemeVideo', viewPanel).on('change', function () {
-
- var query = getQuery();
- query.StartIndex = 0;
- query.HasThemeVideo = this.checked ? true : null;
-
- reloadItems(tabContent, viewPanel);
- });
+ function initPage(tabContent) {
$('.alphabetPicker', tabContent).on('alphaselect', function (e, character) {
@@ -360,49 +240,27 @@
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);
});
}
window.TvPage.initSeriesTab = function (page, tabContent) {
- var viewPanel = page.querySelector('.seriesViewPanel');
- initPage(tabContent, viewPanel);
+ initPage(tabContent);
};
window.TvPage.renderSeriesTab = function (page, tabContent) {
if (LibraryBrowser.needsRefresh(tabContent)) {
- var viewPanel = page.querySelector('.seriesViewPanel');
- reloadItems(tabContent, viewPanel);
- updateFilterControls(tabContent, viewPanel);
+ reloadItems(tabContent);
+ updateFilterControls(tabContent);
}
};
diff --git a/dashboard-ui/tv.html b/dashboard-ui/tv.html
index 1531463d51..03ccb43039 100644
--- a/dashboard-ui/tv.html
+++ b/dashboard-ui/tv.html
@@ -4,7 +4,7 @@
Emby
-