mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

update movie filters

Browse source
This commit is contained in:
Luke Pulverenti 2015-08-25 22:13:28 -04:00
parent 20dfe14bb1
commit d94811ed33
92 changed files with 1319 additions and 376 deletions
Download patch file Download diff file Expand all files Collapse all files

89
dashboard-ui/scripts/librarybrowser.js
View file

@ -2419,7 +2419,7 @@
html += '</span>';
}
if (showControls || options.viewButton || options.addLayoutButton || options.addSelectionButton || options.additionalButtonsHtml) {
if (showControls || options.viewButton || options.sortButton || options.addLayoutButton || options.addSelectionButton || options.additionalButtonsHtml) {
html += '<div style="display:inline-block;margin-left:10px;">';
@ -2440,11 +2440,17 @@
html += '<paper-button raised class="subdued notext btnChangeLayout" onclick="LibraryBrowser.showLayoutMenu(this, \'' + (options.currentLayout || '') + '\');"><iron-icon icon="view-comfy"></iron-icon></paper-button>';
}
if (options.sortButton) {
html += '<paper-button raised class="subdued notext btnSort" title="' + Globalize.translate('ButtonSort') + '"><iron-icon icon="sort-by-alpha"></iron-icon></paper-button>';
}
if (options.viewButton) {
//html += '<paper-button raised class="subdued notext"><iron-icon icon="view-comfy"></iron-icon></paper-button>';
var viewPanelClass = options.viewPanelClass || 'viewPanel';
html += '<paper-button raised class="subdued notext" onclick="require([\'jqmicons\']);jQuery(\'.' + viewPanelClass + '\', jQuery(this).parents(\'.page\')).panel(\'toggle\');"><iron-icon icon="' + AppInfo.moreIcon + '"></iron-icon></paper-button>';
var title = options.viewIcon == 'filter-list' ? Globalize.translate('ButtonFilter') : Globalize.translate('ButtonMenu');
html += '<paper-button raised class="subdued notext" title="' + title + '" onclick="require([\'jqmicons\']);jQuery(\'.' + viewPanelClass + '\', jQuery(this).parents(\'.page\')).panel(\'toggle\');"><iron-icon icon="' + (options.viewIcon || AppInfo.moreIcon) + '"></iron-icon></paper-button>';
}
html += '</div>';
@ -2477,6 +2483,85 @@
return html;
},
showSortMenu: function (options) {
var id = 'dlg' + new Date().getTime();
var html = '';
html += '<paper-dialog id="' + id + '" entry-animation="fade-in-animation" exit-animation="fade-out-animation" with-backdrop>';
// There seems to be a bug with this in safari causing it to immediately roll up to 0 height
var isScrollable = !$.browser.safari;
html += '<h2>';
html += Globalize.translate('HeaderSortBy');
html += '</h2>';
if (isScrollable) {
html += '<paper-dialog-scrollable>';
}
html += '<paper-radio-group class="groupSortBy" selected="' + (options.query.SortBy || '').replace(',', '_') + '">';
for (var i = 0, length = options.items.length; i < length; i++) {
var option = options.items[i];
html += '<paper-radio-button class="menuSortBy block" data-id="' + option.id + '" name="' + option.id.replace(',', '_') + '">' + option.name + '</paper-radio-button>';
}
html += '</paper-radio-group>';
html += '<p>';
html += Globalize.translate('HeaderSortOrder');
html += '</p>';
html += '<paper-radio-group class="groupSortOrder" selected="' + (options.query.SortOrder || 'Ascending') + '">';
html += '<paper-radio-button name="Ascending" class="menuSortOrder block">' + Globalize.translate('OptionAscending') + '</paper-radio-button>';
html += '<paper-radio-button name="Descending" class="menuSortOrder block">' + Globalize.translate('OptionDescending') + '</paper-radio-button>';
html += '</paper-radio-group>';
if (isScrollable) {
html += '</paper-dialog-scrollable>';
}
html += '<div class="buttons">';
html += '<paper-button dialog-dismiss>' + Globalize.translate('ButtonClose') + '</paper-button>';
html += '</div>';
html += '</paper-dialog>';
$(document.body).append(html);
setTimeout(function () {
var dlg = document.getElementById(id);
dlg.open();
$(dlg).on('iron-overlay-closed', function () {
$(this).remove();
});
$('.groupSortBy', dlg).on('iron-select', function () {
options.query.SortBy = this.selected.replace('_', ',');
options.query.StartIndex = 0;
if (options.callback) {
options.callback();
}
});
$('.groupSortOrder', dlg).on('iron-select', function () {
options.query.SortOrder = this.selected;
options.query.StartIndex = 0;
if (options.callback) {
options.callback();
}
});
}, 100);
},
getRatingHtml: function (item, metascore) {
var html = "";

4
dashboard-ui/scripts/livetvchannel.js
View file

@ -104,7 +104,9 @@
ApiClient.getLiveTvPrograms({
ChannelIds: channelId,
UserId: Dashboard.getCurrentUserId()
UserId: Dashboard.getCurrentUserId(),
HasAired: false,
SortBy: "StartDate"
}).done(function (result) {

26
dashboard-ui/scripts/livetvstatus.js
View file

@ -412,6 +412,11 @@
// id: 'emby'
//});
menuItems.push({
name: Globalize.translate('ButtonOther'),
id: 'other'
});
require(['actionsheet'], function () {
ActionSheetElement.show({
@ -419,7 +424,13 @@
positionTo: button,
callback: function (id) {
Dashboard.navigate(getProviderConfigurationUrl(id));
if (id == 'other') {
Dashboard.alert({
message: Globalize.translate('ForAdditionalLiveTvOptions')
});
} else {
Dashboard.navigate(getProviderConfigurationUrl(id));
}
}
});
@ -440,6 +451,11 @@
id: 'm3u'
});
menuItems.push({
name: Globalize.translate('ButtonOther'),
id: 'other'
});
require(['actionsheet'], function () {
ActionSheetElement.show({
@ -447,7 +463,13 @@
positionTo: button,
callback: function (id) {
Dashboard.navigate('livetvtunerprovider-' + id + '.html');
if (id == 'other') {
Dashboard.alert({
message: Globalize.translate('ForAdditionalLiveTvOptions')
});
} else {
Dashboard.navigate('livetvtunerprovider-' + id + '.html');
}
}
});

1
dashboard-ui/scripts/moviepeople.js
View file

@ -49,6 +49,7 @@
limit: query.Limit,
totalRecordCount: result.TotalRecordCount,
viewButton: true,
viewIcon: 'filter-list',
showLimit: false,
updatePageSizeSetting: false,
pageSizeKey: pageSizeKey,

182
dashboard-ui/scripts/movies.js
View file

@ -61,8 +61,12 @@
viewButton: true,
showLimit: false,
addSelectionButton: true,
viewPanelClass: 'movieViewPanel'
viewPanelClass: 'movieViewPanel',
updatePageSizeSetting: false,
addLayoutButton: true,
viewIcon: 'filter-list',
sortButton: true,
currentLayout: view
});
page.querySelector('.listTopPaging').innerHTML = pagingHtml;
@ -160,6 +164,73 @@
reloadItems(page, viewPanel);
});
$('.btnChangeLayout', page).on('layoutchange', function (e, layout) {
getPageData().view = layout;
reloadItems(page);
});
// On callback make sure to set StartIndex = 0
$('.btnSort', page).on('click', function () {
LibraryBrowser.showSortMenu({
items: [{
name: Globalize.translate('OptionNameSort'),
id: 'SortName'
},
{
name: Globalize.translate('OptionBudget'),
id: 'Budget,SortName'
},
{
name: Globalize.translate('OptionImdbRating'),
id: 'CommunityRating,SortName'
},
{
name: Globalize.translate('OptionCriticRating'),
id: 'CriticRating,SortName'
},
{
name: Globalize.translate('OptionDateAdded'),
id: 'DateCreated,SortName'
},
{
name: Globalize.translate('OptionDatePlayed'),
id: 'DatePlayed,SortName'
},
{
name: Globalize.translate('OptionMetascore'),
id: 'Metascore,SortName'
},
{
name: Globalize.translate('OptionParentalRating'),
id: 'OfficialRating,SortName'
},
{
name: Globalize.translate('OptionPlayCount'),
id: 'PlayCount,SortName'
},
{
name: Globalize.translate('OptionReleaseDate'),
id: 'PremiereDate,SortName'
},
{
name: Globalize.translate('OptionRevenue'),
id: 'Revenue,SortName'
},
{
name: Globalize.translate('OptionRuntime'),
id: 'Runtime,SortName'
},
{
name: Globalize.translate('OptionVideoBitrate'),
id: 'VideoBitRate,SortName'
}],
callback: function () {
reloadItems(page, viewPanel);
},
query: query
});
});
LibraryBrowser.saveQueryValues(getSavedQueryKey(), query);
LibraryBrowser.setLastRefreshed(page);
@ -179,18 +250,6 @@
function updateFilterControls(tabContent, viewPanel) {
var query = getQuery();
// Reset form values using the last used query
$('.radioSortBy', viewPanel).each(function () {
this.checked = (query.SortBy || '').toLowerCase() == this.getAttribute('data-sortby').toLowerCase();
}).checkboxradio('refresh');
$('.radioSortOrder', viewPanel).each(function () {
this.checked = (query.SortOrder || '').toLowerCase() == this.getAttribute('data-sortorder').toLowerCase();
}).checkboxradio('refresh');
$('.chkStandardFilter', viewPanel).each(function () {
@ -210,20 +269,11 @@
}).checkboxradio('refresh');
$('select.selectView', viewPanel).val(getPageData().view).selectmenu('refresh');
$('.chk3D', viewPanel).checked(query.Is3D == true).checkboxradio('refresh');
$('.chkHD', viewPanel).checked(query.IsHD == true).checkboxradio('refresh');
$('.chkSD', viewPanel).checked(query.IsHD == false).checkboxradio('refresh');
$('.chkSubtitle', viewPanel).checked(query.HasSubtitles == true).checkboxradio('refresh');
$('.chkTrailer', viewPanel).checked(query.HasTrailer == true).checkboxradio('refresh');
$('.chkSpecialFeature', viewPanel).checked(query.HasSpecialFeature == true).checkboxradio('refresh');
$('.chkThemeSong', viewPanel).checked(query.HasThemeSong == true).checkboxradio('refresh');
$('.chkThemeVideo', viewPanel).checked(query.HasThemeVideo == true).checkboxradio('refresh');
$('.alphabetPicker', tabContent).alphaValue(query.NameStartsWithOrGreater);
$('select.selectPageSize', viewPanel).val(query.Limit).selectmenu('refresh');
}
var filtersLoaded;
@ -248,20 +298,6 @@
reloadFiltersIfNeeded(tabContent, viewPanel);
});
$('.radioSortBy', viewPanel).on('click', function () {
var query = getQuery();
query.StartIndex = 0;
query.SortBy = this.getAttribute('data-sortby');
reloadItems(tabContent, viewPanel);
});
$('.radioSortOrder', viewPanel).on('click', function () {
var query = getQuery();
query.StartIndex = 0;
query.SortOrder = this.getAttribute('data-sortorder');
reloadItems(tabContent, viewPanel);
});
$('.chkStandardFilter', viewPanel).on('change', function () {
var query = getQuery();
@ -280,26 +316,6 @@
reloadItems(tabContent, viewPanel);
});
$('select.selectView', viewPanel).on('change', function () {
var newView = this.value;
getPageData().view = newView;
var query = getQuery();
if (newView == "Timeline") {
query.SortBy = "PremiereDate";
query.SortOrder = "Descending";
query.StartIndex = 0;
$('.radioPremiereDate', viewPanel)[0].click();
} else {
reloadItems(tabContent, viewPanel);
}
LibraryBrowser.saveViewSetting(getSavedQueryKey(), newView);
});
$('.chkVideoTypeFilter', viewPanel).on('change', function () {
var query = getQuery();
@ -345,51 +361,6 @@
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);
});
$('.chkSpecialFeature', viewPanel).on('change', function () {
var query = getQuery();
query.StartIndex = 0;
query.HasSpecialFeature = 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);
});
$('.alphabetPicker', tabContent).on('alphaselect', function (e, character) {
var query = getQuery();
@ -431,13 +402,6 @@
reloadItems(tabContent, viewPanel);
});
$('select.selectPageSize', viewPanel).on('change', function () {
var query = getQuery();
query.Limit = parseInt(this.value);
query.StartIndex = 0;
reloadItems(tabContent, viewPanel);
});
}
window.MoviesPage.initMoviesTab = function (page, tabContent) {

77
dashboard-ui/scripts/movietrailers.js
View file

@ -57,8 +57,11 @@
limit: query.Limit,
totalRecordCount: result.TotalRecordCount,
viewButton: true,
viewIcon: 'filter-list',
sortButton: true,
showLimit: false,
viewPanelClass: 'trailerViewPanel'
viewPanelClass: 'trailerViewPanel',
updatePageSizeSetting: false
});
page.querySelector('.listTopPaging').innerHTML = pagingHtml;
@ -86,6 +89,44 @@
reloadItems(page, viewPanel);
});
// On callback make sure to set StartIndex = 0
$('.btnSort', page).on('click', function () {
LibraryBrowser.showSortMenu({
items: [{
name: Globalize.translate('OptionNameSort'),
id: 'SortName'
},
{
name: Globalize.translate('OptionImdbRating'),
id: 'CommunityRating,SortName'
},
{
name: Globalize.translate('OptionDateAdded'),
id: 'DateCreated,SortName'
},
{
name: Globalize.translate('OptionDatePlayed'),
id: 'DatePlayed,SortName'
},
{
name: Globalize.translate('OptionParentalRating'),
id: 'OfficialRating,SortName'
},
{
name: Globalize.translate('OptionPlayCount'),
id: 'PlayCount,SortName'
},
{
name: Globalize.translate('OptionReleaseDate'),
id: 'PremiereDate,SortName'
}],
callback: function () {
reloadItems(page, viewPanel);
},
query: query
});
});
LibraryBrowser.saveQueryValues(getSavedQueryKey(), query);
Dashboard.hideLoadingMsg();
@ -95,18 +136,6 @@
function updateFilterControls(tabContent, viewPanel) {
var query = getQuery();
// Reset form values using the last used query
$('.radioSortBy', viewPanel).each(function () {
this.checked = (query.SortBy || '').toLowerCase() == this.getAttribute('data-sortby').toLowerCase();
}).checkboxradio('refresh');
$('.radioSortOrder', viewPanel).each(function () {
this.checked = (query.SortOrder || '').toLowerCase() == this.getAttribute('data-sortorder').toLowerCase();
}).checkboxradio('refresh');
$('.chkStandardFilter', viewPanel).each(function () {
@ -118,25 +147,10 @@
}).checkboxradio('refresh');
$('.alphabetPicker', tabContent).alphaValue(query.NameStartsWithOrGreater);
$('select.selectPageSize', viewPanel).val(query.Limit).selectmenu('refresh');
}
function initPage(page, tabContent, viewPanel) {
$('.radioSortBy', viewPanel).on('click', function () {
var query = getQuery();
query.StartIndex = 0;
query.SortBy = this.getAttribute('data-sortby');
reloadItems(tabContent, viewPanel);
});
$('.radioSortOrder', viewPanel).on('click', function () {
var query = getQuery();
query.StartIndex = 0;
query.SortOrder = this.getAttribute('data-sortorder');
reloadItems(tabContent, viewPanel);
});
$('.chkStandardFilter', viewPanel).on('change', function () {
var query = getQuery();
@ -176,13 +190,6 @@
reloadItems(tabContent, viewPanel);
});
$('select.selectPageSize', viewPanel).on('change', function () {
var query = getQuery();
query.Limit = parseInt(this.value);
query.StartIndex = 0;
reloadItems(tabContent, viewPanel);
});
}
window.MoviesPage.initTrailerTab = function (page, tabContent) {

7
dashboard-ui/scripts/plugincatalogpage.js
View file

@ -101,11 +101,11 @@
html += '<div class="detailSectionHeader">' + currentCategory + '</div>';
var topPlugins = allPlugins.slice(0).sort(function (a, b) {
if (a.installs < b.installs) {
return 1;
if (a.installs > b.installs) {
return -1;
}
if (b.installs > a.installs) {
return -1;
return 1;
}
var aName = (a.name);
@ -122,7 +122,6 @@
});
var limit = screen.availWidth >= 1920 ? 15 : 12;
for (i = 0, length = Math.min(topPlugins.length, limit) ; i < length; i++) {
html += getPluginHtml(topPlugins[i], options, installedPlugins);
}