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 filter and sorting menus

Browse source
This commit is contained in:
Luke Pulverenti 2016-02-26 14:02:53 -05:00
parent c65749da5a
commit 1044d68ba6
14 changed files with 265 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

1
dashboard-ui/components/filterdialog/filterdialog.js
View file

@ -510,7 +510,6 @@
var dlg = paperDialogHelper.createDialog({ var dlg = paperDialogHelper.createDialog({
removeOnClose: true, removeOnClose: true,
modal: false, modal: false,
enableHistory: false,
entryAnimationDuration: 160, entryAnimationDuration: 160,
exitAnimationDuration: 200, exitAnimationDuration: 200,
autoFocus: false autoFocus: false

52
dashboard-ui/scripts/channelitems.js
View file

@ -2,8 +2,8 @@
var data = {}; var data = {};
function getPageData() { function getPageData(context) {
var key = getSavedQueryKey(); var key = getSavedQueryKey(context);
var pageData = data[key]; var pageData = data[key];
if (!pageData) { if (!pageData) {
@ -22,19 +22,35 @@
return pageData; return pageData;
} }
function getQuery() { function getQuery(context) {
return getPageData().query; return getPageData(context).query;
} }
function getSavedQueryKey() { function getSavedQueryKey(context) {
return LibraryBrowser.getSavedQueryKey('movies'); if (!context.savedQueryKey) {
context.savedQueryKey = LibraryBrowser.getSavedQueryKey('channelitems');
}
return context.savedQueryKey;
}
function getParam(context, name) {
if (!context.pageParams) {
context.pageParams = {};
}
if (!context.pageParams[name]) {
context.pageParams[name] = getParameterByName(name);
}
return context.pageParams[name];
} }
function reloadFeatures(page) { function reloadFeatures(page) {
var channelId = getParameterByName('id'); var channelId = getParam(page, 'id');
ApiClient.getJSON(ApiClient.getUrl("Channels/" + channelId + "/Features")).then(function (features) { ApiClient.getJSON(ApiClient.getUrl("Channels/" + channelId + "/Features")).then(function (features) {
@ -55,12 +71,12 @@
var maxPageSize = features.MaxPageSize; var maxPageSize = features.MaxPageSize;
var query = getQuery(); var query = getQuery(page);
if (maxPageSize) { if (maxPageSize) {
query.Limit = Math.min(maxPageSize, query.Limit || maxPageSize); query.Limit = Math.min(maxPageSize, query.Limit || maxPageSize);
} }
getPageData().sortFields = features.DefaultSortFields; getPageData(page).sortFields = features.DefaultSortFields;
reloadItems(page); reloadItems(page);
}); });
@ -70,10 +86,10 @@
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
var channelId = getParameterByName('id'); var channelId = getParam(page, 'id');
var folderId = getParameterByName('folderId'); var folderId = getParam(page, 'folderId');
var query = getQuery(); var query = getQuery(page);
query.UserId = Dashboard.getCurrentUserId(); query.UserId = Dashboard.getCurrentUserId();
if (folderId) { if (folderId) {
@ -161,7 +177,7 @@
require(['components/filterdialog/filterdialog'], function (filterDialogFactory) { require(['components/filterdialog/filterdialog'], function (filterDialogFactory) {
var filterDialog = new filterDialogFactory({ var filterDialog = new filterDialogFactory({
query: getQuery() query: getQuery(page)
}); });
Events.on(filterDialog, 'filterchange', function () { Events.on(filterDialog, 'filterchange', function () {
@ -174,7 +190,7 @@
function showSortMenu(page) { function showSortMenu(page) {
var sortFields = getPageData().sortFields; var sortFields = getPageData(page).sortFields;
var items = []; var items = [];
@ -225,13 +241,13 @@
callback: function () { callback: function () {
reloadItems(page); reloadItems(page);
}, },
query: getQuery() query: getQuery(page)
}); });
} }
function updateFilterControls(page) { function updateFilterControls(page) {
var query = getQuery(); var query = getQuery(page);
$('.alphabetPicker', page).alphaValue(query.NameStartsWith); $('.alphabetPicker', page).alphaValue(query.NameStartsWith);
} }
@ -241,7 +257,7 @@
$('.alphabetPicker', this).on('alphaselect', function (e, character) { $('.alphabetPicker', this).on('alphaselect', function (e, character) {
var query = getQuery(); var query = getQuery(page);
query.NameStartsWithOrGreater = character; query.NameStartsWithOrGreater = character;
query.StartIndex = 0; query.StartIndex = 0;
@ -249,7 +265,7 @@
}).on('alphaclear', function (e) { }).on('alphaclear', function (e) {
var query = getQuery(); var query = getQuery(page);
query.NameStartsWithOrGreater = ''; query.NameStartsWithOrGreater = '';
reloadItems(page); reloadItems(page);

33
dashboard-ui/scripts/episodes.js
View file

@ -2,8 +2,8 @@
var data = {}; var data = {};
function getPageData() { function getPageData(context) {
var key = getSavedQueryKey(); var key = getSavedQueryKey(context);
var pageData = data[key]; var pageData = data[key];
if (!pageData) { if (!pageData) {
@ -30,27 +30,30 @@
return pageData; return pageData;
} }
function getQuery() { function getQuery(context) {
return getPageData().query; return getPageData(context).query;
} }
function getSavedQueryKey() { function getSavedQueryKey(context) {
return LibraryBrowser.getSavedQueryKey('episodes'); if (!context.savedQueryKey) {
context.savedQueryKey = LibraryBrowser.getSavedQueryKey('episodes');
}
return context.savedQueryKey;
} }
function reloadItems(page) { function reloadItems(page) {
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
var query = getQuery(); var query = getQuery(page);
ApiClient.getItems(Dashboard.getCurrentUserId(), query).then(function (result) { ApiClient.getItems(Dashboard.getCurrentUserId(), query).then(function (result) {
// Scroll back up so they can see the results from the beginning // Scroll back up so they can see the results from the beginning
window.scrollTo(0, 0); window.scrollTo(0, 0);
var view = getPageData().view; var view = getPageData(page).view;
var html = ''; var html = '';
var pagingHtml = LibraryBrowser.getQueryPagingHtml({ var pagingHtml = LibraryBrowser.getQueryPagingHtml({
@ -116,8 +119,8 @@
}); });
$('.btnChangeLayout', page).on('layoutchange', function (e, layout) { $('.btnChangeLayout', page).on('layoutchange', function (e, layout) {
getPageData().view = layout; getPageData(page).view = layout;
LibraryBrowser.saveViewSetting(getSavedQueryKey(), layout); LibraryBrowser.saveViewSetting(getSavedQueryKey(page), layout);
reloadItems(page); reloadItems(page);
}); });
@ -171,7 +174,7 @@
}); });
}); });
LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); LibraryBrowser.saveQueryValues(getSavedQueryKey(page), query);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
}); });
@ -182,7 +185,7 @@
require(['components/filterdialog/filterdialog'], function (filterDialogFactory) { require(['components/filterdialog/filterdialog'], function (filterDialogFactory) {
var filterDialog = new filterDialogFactory({ var filterDialog = new filterDialogFactory({
query: getQuery(), query: getQuery(page),
mode: 'episodes' mode: 'episodes'
}); });
@ -196,7 +199,7 @@
function updateFilterControls(tabContent) { function updateFilterControls(tabContent) {
var query = getQuery(); var query = getQuery(tabContent);
$('.alphabetPicker', tabContent).alphaValue(query.NameStartsWithOrGreater); $('.alphabetPicker', tabContent).alphaValue(query.NameStartsWithOrGreater);
} }
@ -205,7 +208,7 @@
$('.alphabetPicker', tabContent).on('alphaselect', function (e, character) { $('.alphabetPicker', tabContent).on('alphaselect', function (e, character) {
var query = getQuery(); var query = getQuery(tabContent);
query.NameStartsWithOrGreater = character; query.NameStartsWithOrGreater = character;
query.StartIndex = 0; query.StartIndex = 0;
@ -213,7 +216,7 @@
}).on('alphaclear', function (e) { }).on('alphaclear', function (e) {
var query = getQuery(); var query = getQuery(tabContent);
query.NameStartsWithOrGreater = ''; query.NameStartsWithOrGreater = '';
reloadItems(tabContent); reloadItems(tabContent);

31
dashboard-ui/scripts/gamespage.js
View file

@ -2,8 +2,8 @@
var data = {}; var data = {};
function getPageData() { function getPageData(context) {
var key = getSavedQueryKey(); var key = getSavedQueryKey(context);
var pageData = data[key]; var pageData = data[key];
if (!pageData) { if (!pageData) {
@ -28,21 +28,24 @@
return pageData; return pageData;
} }
function getQuery() { function getQuery(context) {
return getPageData().query; return getPageData(context).query;
} }
function getSavedQueryKey() { function getSavedQueryKey(context) {
return LibraryBrowser.getSavedQueryKey('movies'); if (!context.savedQueryKey) {
context.savedQueryKey = LibraryBrowser.getSavedQueryKey('games');
}
return context.savedQueryKey;
} }
function reloadItems(page) { function reloadItems(page) {
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
var query = getQuery(); var query = getQuery(page);
ApiClient.getItems(Dashboard.getCurrentUserId(), query).then(function (result) { ApiClient.getItems(Dashboard.getCurrentUserId(), query).then(function (result) {
@ -59,7 +62,7 @@
filterButton: true filterButton: true
})); }));
var view = getPageData().view; var view = getPageData(page).view;
if (view == "List") { if (view == "List") {
@ -108,7 +111,7 @@
showFilterMenu(page); showFilterMenu(page);
}); });
LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); LibraryBrowser.saveQueryValues(getSavedQueryKey(page), query);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
}); });
@ -119,7 +122,7 @@
require(['components/filterdialog/filterdialog'], function (filterDialogFactory) { require(['components/filterdialog/filterdialog'], function (filterDialogFactory) {
var filterDialog = new filterDialogFactory({ var filterDialog = new filterDialogFactory({
query: getQuery(), query: getQuery(page),
mode: 'games' mode: 'games'
}); });
@ -137,7 +140,7 @@
$('.alphabetPicker', this).on('alphaselect', function (e, character) { $('.alphabetPicker', this).on('alphaselect', function (e, character) {
var query = getQuery(); var query = getQuery(page);
query.NameStartsWithOrGreater = character; query.NameStartsWithOrGreater = character;
query.StartIndex = 0; query.StartIndex = 0;
@ -145,7 +148,7 @@
}).on('alphaclear', function (e) { }).on('alphaclear', function (e) {
var query = getQuery(); var query = getQuery(page);
query.NameStartsWithOrGreater = ''; query.NameStartsWithOrGreater = '';
reloadItems(page); reloadItems(page);
@ -154,7 +157,7 @@
}).on('pagebeforeshow', "#gamesPage", function () { }).on('pagebeforeshow', "#gamesPage", function () {
var page = this; var page = this;
var query = getQuery(); var query = getQuery(page);
query.ParentId = LibraryMenu.getTopParentId(); query.ParentId = LibraryMenu.getTopParentId();
var limit = LibraryBrowser.getDefaultPageSize(); var limit = LibraryBrowser.getDefaultPageSize();
@ -165,7 +168,7 @@
query.StartIndex = 0; query.StartIndex = 0;
} }
var viewkey = getSavedQueryKey(); var viewkey = getSavedQueryKey(page);
LibraryBrowser.loadSavedQueryValues(viewkey, query); LibraryBrowser.loadSavedQueryValues(viewkey, query);

56
dashboard-ui/scripts/itemlistpage.js
View file

@ -4,8 +4,8 @@
var data = {}; var data = {};
function getPageData() { function getPageData(context) {
var key = getSavedQueryKey(); var key = getSavedQueryKey(context);
var pageData = data[key]; var pageData = data[key];
if (!pageData) { if (!pageData) {
@ -25,26 +25,42 @@
pageData.query.NameStartsWithOrGreater = ''; pageData.query.NameStartsWithOrGreater = '';
pageData.view = LibraryBrowser.getSavedView(key) || LibraryBrowser.getDefaultItemsView('Poster', 'Poster'); pageData.view = LibraryBrowser.getSavedView(key) || LibraryBrowser.getDefaultItemsView('Poster', 'Poster');
pageData.query.ParentId = getParameterByName('parentId'); pageData.query.ParentId = getParam(context, 'parentId');
LibraryBrowser.loadSavedQueryValues(key, pageData.query); LibraryBrowser.loadSavedQueryValues(key, pageData.query);
} }
return pageData; return pageData;
} }
function getQuery() { function getParam(context, name) {
return getPageData().query; if (!context.pageParams) {
context.pageParams = {};
} }
function getSavedQueryKey() {
return LibraryBrowser.getSavedQueryKey(); if (!context.pageParams[name]) {
context.pageParams[name] = getParameterByName(name);
}
return context.pageParams[name];
}
function getQuery(context) {
return getPageData(context).query;
}
function getSavedQueryKey(context) {
if (!context.savedQueryKey) {
context.savedQueryKey = LibraryBrowser.getSavedQueryKey('items');
}
return context.savedQueryKey;
} }
function reloadItems(page) { function reloadItems(page) {
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
var query = getQuery(); var query = getQuery(page);
var userId = Dashboard.getCurrentUserId(); var userId = Dashboard.getCurrentUserId();
var parentItemPromise = query.ParentId ? var parentItemPromise = query.ParentId ?
@ -62,7 +78,7 @@
// Scroll back up so they can see the results from the beginning // Scroll back up so they can see the results from the beginning
window.scrollTo(0, 0); window.scrollTo(0, 0);
var view = getPageData().view; var view = getPageData(page).view;
var html = ''; var html = '';
var pagingHtml = LibraryBrowser.getQueryPagingHtml({ var pagingHtml = LibraryBrowser.getQueryPagingHtml({
@ -81,7 +97,7 @@
updateFilterControls(page); updateFilterControls(page);
var context = getParameterByName('context'); var context = getParam(page, 'context');
var posterOptions = { var posterOptions = {
items: result.Items, items: result.Items,
@ -141,8 +157,8 @@
}); });
$('.btnChangeLayout', page).on('layoutchange', function (e, layout) { $('.btnChangeLayout', page).on('layoutchange', function (e, layout) {
getPageData().view = layout; getPageData(page).view = layout;
LibraryBrowser.saveViewSetting(getSavedQueryKey(), layout); LibraryBrowser.saveViewSetting(getSavedQueryKey(page), layout);
reloadItems(page); reloadItems(page);
}); });
@ -192,7 +208,7 @@
}); });
}); });
LibraryBrowser.saveQueryValues(getParameterByName('parentId'), query); LibraryBrowser.saveQueryValues(getParam(page, 'parentId'), query);
var name = item.Name; var name = item.Name;
@ -222,7 +238,7 @@
require(['components/filterdialog/filterdialog'], function (filterDialogFactory) { require(['components/filterdialog/filterdialog'], function (filterDialogFactory) {
var filterDialog = new filterDialogFactory({ var filterDialog = new filterDialogFactory({
query: getQuery() query: getQuery(page)
}); });
Events.on(filterDialog, 'filterchange', function () { Events.on(filterDialog, 'filterchange', function () {
@ -235,15 +251,15 @@
function updateFilterControls(page) { function updateFilterControls(page) {
var query = getQuery(); var query = getQuery(page);
$('.alphabetPicker', page).alphaValue(query.NameStartsWithOrGreater); $('.alphabetPicker', page).alphaValue(query.NameStartsWithOrGreater);
} }
function onListItemClick(e) { function onListItemClick(e) {
var query = getQuery(); var page = $(this).parents('.page')[0];
var page = $(this).parents('.page'); var query = getQuery(page);
var info = LibraryBrowser.getListItemInfo(this); var info = LibraryBrowser.getListItemInfo(this);
if (info.mediaType == 'Photo') { if (info.mediaType == 'Photo') {
@ -260,7 +276,7 @@
$('.alphabetPicker', this).on('alphaselect', function (e, character) { $('.alphabetPicker', this).on('alphaselect', function (e, character) {
var query = getQuery(); var query = getQuery(page);
query.NameStartsWithOrGreater = character; query.NameStartsWithOrGreater = character;
query.StartIndex = 0; query.StartIndex = 0;
@ -268,7 +284,7 @@
}).on('alphaclear', function (e) { }).on('alphaclear', function (e) {
var query = getQuery(); var query = getQuery(page);
query.NameStartsWithOrGreater = ''; query.NameStartsWithOrGreater = '';
reloadItems(page); reloadItems(page);
@ -284,7 +300,7 @@
reloadItems(page); reloadItems(page);
updateFilterControls(page); updateFilterControls(page);
LibraryMenu.setBackButtonVisible(getParameterByName('context')); LibraryMenu.setBackButtonVisible(getParam(page, 'context'));
}); });

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

@ -2947,14 +2947,7 @@
dlg.innerHTML = html; dlg.innerHTML = html;
document.body.appendChild(dlg); document.body.appendChild(dlg);
var fireCallbackOnClose = false; paperDialogHelper.open(dlg);
paperDialogHelper.open(dlg).then(function () {
if (options.callback && fireCallbackOnClose) {
options.callback();
}
});
$('.groupSortBy', dlg).on('iron-select', function () { $('.groupSortBy', dlg).on('iron-select', function () {
@ -2965,7 +2958,7 @@
options.query.StartIndex = 0; options.query.StartIndex = 0;
if (options.callback && changed) { if (options.callback && changed) {
fireCallbackOnClose = true; options.callback();
} }
}); });
@ -2978,7 +2971,7 @@
options.query.StartIndex = 0; options.query.StartIndex = 0;
if (options.callback && changed) { if (options.callback && changed) {
fireCallbackOnClose = true; options.callback();
} }
}); });
}); });

23
dashboard-ui/scripts/livetvchannels.js
View file

@ -2,8 +2,8 @@
var data = {}; var data = {};
function getPageData() { function getPageData(context) {
var key = getSavedQueryKey(); var key = getSavedQueryKey(context);
var pageData = data[key]; var pageData = data[key];
if (!pageData) { if (!pageData) {
@ -20,14 +20,17 @@
return pageData; return pageData;
} }
function getQuery() { function getQuery(context) {
return getPageData().query; return getPageData(context).query;
} }
function getSavedQueryKey() { function getSavedQueryKey(context) {
return LibraryBrowser.getSavedQueryKey('channels'); if (!context.savedQueryKey) {
context.savedQueryKey = LibraryBrowser.getSavedQueryKey('channels');
}
return context.savedQueryKey;
} }
function getChannelsHtml(channels) { function getChannelsHtml(channels) {
@ -40,7 +43,7 @@
function renderChannels(page, result) { function renderChannels(page, result) {
var query = getQuery(); var query = getQuery(page);
$('.listTopPaging', page).html(LibraryBrowser.getQueryPagingHtml({ $('.listTopPaging', page).html(LibraryBrowser.getQueryPagingHtml({
startIndex: query.StartIndex, startIndex: query.StartIndex,
@ -71,7 +74,7 @@
showFilterMenu(page); showFilterMenu(page);
}); });
LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); LibraryBrowser.saveQueryValues(getSavedQueryKey(page), query);
} }
function showFilterMenu(page) { function showFilterMenu(page) {
@ -79,7 +82,7 @@
require(['components/filterdialog/filterdialog'], function (filterDialogFactory) { require(['components/filterdialog/filterdialog'], function (filterDialogFactory) {
var filterDialog = new filterDialogFactory({ var filterDialog = new filterDialogFactory({
query: getQuery(), query: getQuery(page),
mode: 'livetvchannels' mode: 'livetvchannels'
}); });
@ -95,7 +98,7 @@
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
var query = getQuery(); var query = getQuery(page);
query.UserId = Dashboard.getCurrentUserId(); query.UserId = Dashboard.getCurrentUserId();

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

@ -2,8 +2,8 @@
var data = {}; var data = {};
function getPageData() { function getPageData(context) {
var key = getSavedQueryKey(); var key = getSavedQueryKey(context);
var pageData = data[key]; var pageData = data[key];
if (!pageData) { if (!pageData) {
@ -28,24 +28,27 @@
return pageData; return pageData;
} }
function getQuery() { function getQuery(context) {
return getPageData().query; return getPageData(context).query;
} }
function getSavedQueryKey() { function getSavedQueryKey(context) {
return LibraryBrowser.getSavedQueryKey('movies'); if (!context.savedQueryKey) {
context.savedQueryKey = LibraryBrowser.getSavedQueryKey('movies');
}
return context.savedQueryKey;
} }
function reloadItems(page, viewPanel) { function reloadItems(context) {
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
var userId = Dashboard.getCurrentUserId(); var userId = Dashboard.getCurrentUserId();
var query = getQuery(); var query = getQuery(context);
var view = getPageData().view; var view = getPageData(context).view;
ApiClient.getItems(userId, query).then(function (result) { ApiClient.getItems(userId, query).then(function (result) {
@ -67,9 +70,9 @@
filterButton: true filterButton: true
}); });
page.querySelector('.listTopPaging').innerHTML = pagingHtml; context.querySelector('.listTopPaging').innerHTML = pagingHtml;
updateFilterControls(page); updateFilterControls(context);
if (view == "Thumb") { if (view == "Thumb") {
html = LibraryBrowser.getPosterViewHtml({ html = LibraryBrowser.getPosterViewHtml({
@ -144,38 +147,38 @@
}); });
} }
var elem = page.querySelector('.itemsContainer'); var elem = context.querySelector('.itemsContainer');
elem.innerHTML = html + pagingHtml; elem.innerHTML = html + pagingHtml;
ImageLoader.lazyChildren(elem); ImageLoader.lazyChildren(elem);
$('.btnNextPage', page).on('click', function () { $('.btnNextPage', context).on('click', function () {
query.StartIndex += query.Limit; query.StartIndex += query.Limit;
reloadItems(page); reloadItems(context);
}); });
$('.btnPreviousPage', page).on('click', function () { $('.btnPreviousPage', context).on('click', function () {
query.StartIndex -= query.Limit; query.StartIndex -= query.Limit;
reloadItems(page); reloadItems(context);
}); });
$('.btnChangeLayout', page).on('layoutchange', function (e, layout) { $('.btnChangeLayout', context).on('layoutchange', function (e, layout) {
if (layout == 'Timeline') { if (layout == 'Timeline') {
getQuery().SortBy = 'ProductionYear,PremiereDate,SortName'; getQuery(context).SortBy = 'ProductionYear,PremiereDate,SortName';
getQuery().SortOrder = 'Descending'; getQuery(context).SortOrder = 'Descending';
} }
getPageData().view = layout; getPageData(context).view = layout;
LibraryBrowser.saveViewSetting(getSavedQueryKey(), layout); LibraryBrowser.saveViewSetting(getSavedQueryKey(context), layout);
reloadItems(page); reloadItems(context);
}); });
$('.btnFilter', page).on('click', function () { $('.btnFilter', context).on('click', function () {
showFilterMenu(page); showFilterMenu(context);
}); });
// On callback make sure to set StartIndex = 0 // On callback make sure to set StartIndex = 0
$('.btnSort', page).on('click', function () { $('.btnSort', context).on('click', function () {
LibraryBrowser.showSortMenu({ LibraryBrowser.showSortMenu({
items: [{ items: [{
name: Globalize.translate('OptionNameSort'), name: Globalize.translate('OptionNameSort'),
@ -230,65 +233,65 @@
id: 'VideoBitRate,SortName' id: 'VideoBitRate,SortName'
}], }],
callback: function () { callback: function () {
reloadItems(page); reloadItems(context);
}, },
query: query query: query
}); });
}); });
LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); LibraryBrowser.saveQueryValues(getSavedQueryKey(context), query);
LibraryBrowser.setLastRefreshed(page); LibraryBrowser.setLastRefreshed(context);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
}); });
} }
function showFilterMenu(page) { function showFilterMenu(context) {
require(['components/filterdialog/filterdialog'], function (filterDialogFactory) { require(['components/filterdialog/filterdialog'], function (filterDialogFactory) {
var filterDialog = new filterDialogFactory({ var filterDialog = new filterDialogFactory({
query: getQuery(), query: getQuery(context),
mode: 'movies' mode: 'movies'
}); });
Events.on(filterDialog, 'filterchange', function () { Events.on(filterDialog, 'filterchange', function () {
reloadItems(page); reloadItems(context);
}); });
filterDialog.show(); filterDialog.show();
}); });
} }
function updateFilterControls(tabContent) { function updateFilterControls(context) {
var query = getQuery(); var query = getQuery(context);
$('.alphabetPicker', tabContent).alphaValue(query.NameStartsWithOrGreater); $('.alphabetPicker', context).alphaValue(query.NameStartsWithOrGreater);
} }
function initPage(tabContent) { function initPage(context) {
$('.alphabetPicker', tabContent).on('alphaselect', function (e, character) { $('.alphabetPicker', context).on('alphaselect', function (e, character) {
var query = getQuery(); var query = getQuery(context);
query.NameStartsWithOrGreater = character; query.NameStartsWithOrGreater = character;
query.StartIndex = 0; query.StartIndex = 0;
reloadItems(tabContent); reloadItems(context);
}).on('alphaclear', function (e) { }).on('alphaclear', function (e) {
var query = getQuery(); var query = getQuery(context);
query.NameStartsWithOrGreater = ''; query.NameStartsWithOrGreater = '';
reloadItems(tabContent); reloadItems(context);
}); });
$('.itemsContainer', tabContent).on('needsrefresh', function () { $('.itemsContainer', context).on('needsrefresh', function () {
reloadItems(tabContent); reloadItems(context);
}); });
} }

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

@ -2,9 +2,9 @@
var data = {}; var data = {};
function getQuery() { function getQuery(context) {
var key = getSavedQueryKey(); var key = getSavedQueryKey(context);
var pageData = data[key]; var pageData = data[key];
if (!pageData) { if (!pageData) {
@ -27,16 +27,19 @@
return pageData.query; return pageData.query;
} }
function getSavedQueryKey() { function getSavedQueryKey(context) {
return LibraryBrowser.getSavedQueryKey('trailers'); if (!context.savedQueryKey) {
context.savedQueryKey = LibraryBrowser.getSavedQueryKey('trailers');
}
return context.savedQueryKey;
} }
function reloadItems(page) { function reloadItems(page) {
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
var query = getQuery(); var query = getQuery(page);
query.UserId = Dashboard.getCurrentUserId(); query.UserId = Dashboard.getCurrentUserId();
ApiClient.getJSON(ApiClient.getUrl('Trailers', query)).then(function (result) { ApiClient.getJSON(ApiClient.getUrl('Trailers', query)).then(function (result) {
@ -130,7 +133,7 @@
}); });
}); });
LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); LibraryBrowser.saveQueryValues(getSavedQueryKey(page), query);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
}); });
@ -141,7 +144,7 @@
require(['components/filterdialog/filterdialog'], function (filterDialogFactory) { require(['components/filterdialog/filterdialog'], function (filterDialogFactory) {
var filterDialog = new filterDialogFactory({ var filterDialog = new filterDialogFactory({
query: getQuery() query: getQuery(page)
}); });
Events.on(filterDialog, 'filterchange', function () { Events.on(filterDialog, 'filterchange', function () {
@ -154,7 +157,7 @@
function updateFilterControls(tabContent) { function updateFilterControls(tabContent) {
var query = getQuery(); var query = getQuery(tabContent);
$('.alphabetPicker', tabContent).alphaValue(query.NameStartsWithOrGreater); $('.alphabetPicker', tabContent).alphaValue(query.NameStartsWithOrGreater);
} }
@ -163,7 +166,7 @@
$('.alphabetPicker', tabContent).on('alphaselect', function (e, character) { $('.alphabetPicker', tabContent).on('alphaselect', function (e, character) {
var query = getQuery(); var query = getQuery(page);
query.NameStartsWithOrGreater = character; query.NameStartsWithOrGreater = character;
query.StartIndex = 0; query.StartIndex = 0;
@ -171,7 +174,7 @@
}).on('alphaclear', function (e) { }).on('alphaclear', function (e) {
var query = getQuery(); var query = getQuery(page);
query.NameStartsWithOrGreater = ''; query.NameStartsWithOrGreater = '';
reloadItems(tabContent); reloadItems(tabContent);

33
dashboard-ui/scripts/musicalbumartists.js
View file

@ -1,8 +1,8 @@
(function ($, document) { (function ($, document) {
var data = {}; var data = {};
function getPageData() { function getPageData(context) {
var key = getSavedQueryKey(); var key = getSavedQueryKey(context);
var pageData = data[key]; var pageData = data[key];
if (!pageData) { if (!pageData) {
@ -26,28 +26,31 @@
return pageData; return pageData;
} }
function getQuery() { function getQuery(context) {
return getPageData().query; return getPageData(context).query;
} }
function getSavedQueryKey() { function getSavedQueryKey(context) {
return LibraryBrowser.getSavedQueryKey('albumartists'); if (!context.savedQueryKey) {
context.savedQueryKey = LibraryBrowser.getSavedQueryKey('albumartists');
}
return context.savedQueryKey;
} }
function reloadItems(page) { function reloadItems(page) {
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
var query = getQuery(); var query = getQuery(page);
ApiClient.getAlbumArtists(Dashboard.getCurrentUserId(), query).then(function (result) { ApiClient.getAlbumArtists(Dashboard.getCurrentUserId(), query).then(function (result) {
// Scroll back up so they can see the results from the beginning // Scroll back up so they can see the results from the beginning
window.scrollTo(0, 0); window.scrollTo(0, 0);
var view = getPageData().view; var view = getPageData(page).view;
var html = ''; var html = '';
var pagingHtml = LibraryBrowser.getQueryPagingHtml({ var pagingHtml = LibraryBrowser.getQueryPagingHtml({
@ -114,8 +117,8 @@
}); });
$('.btnChangeLayout', page).on('layoutchange', function (e, layout) { $('.btnChangeLayout', page).on('layoutchange', function (e, layout) {
getPageData().view = layout; getPageData(page).view = layout;
LibraryBrowser.saveViewSetting(getSavedQueryKey(), layout); LibraryBrowser.saveViewSetting(getSavedQueryKey(page), layout);
reloadItems(page); reloadItems(page);
}); });
@ -123,7 +126,7 @@
showFilterMenu(page); showFilterMenu(page);
}); });
LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); LibraryBrowser.saveQueryValues(getSavedQueryKey(page), query);
LibraryBrowser.setLastRefreshed(page); LibraryBrowser.setLastRefreshed(page);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
}); });
@ -134,7 +137,7 @@
require(['components/filterdialog/filterdialog'], function (filterDialogFactory) { require(['components/filterdialog/filterdialog'], function (filterDialogFactory) {
var filterDialog = new filterDialogFactory({ var filterDialog = new filterDialogFactory({
query: getQuery(), query: getQuery(page),
mode: 'albumartists' mode: 'albumartists'
}); });
@ -148,7 +151,7 @@
function updateFilterControls(tabContent) { function updateFilterControls(tabContent) {
var query = getQuery(); var query = getQuery(tabContent);
$('.alphabetPicker', tabContent).alphaValue(query.NameStartsWithOrGreater); $('.alphabetPicker', tabContent).alphaValue(query.NameStartsWithOrGreater);
} }
@ -157,7 +160,7 @@
$('.alphabetPicker', tabContent).on('alphaselect', function (e, character) { $('.alphabetPicker', tabContent).on('alphaselect', function (e, character) {
var query = getQuery(); var query = getQuery(tabContent);
query.NameStartsWithOrGreater = character; query.NameStartsWithOrGreater = character;
query.StartIndex = 0; query.StartIndex = 0;
@ -166,7 +169,7 @@
}).on('alphaclear', function (e) { }).on('alphaclear', function (e) {
var query = getQuery(); var query = getQuery(tabContent);
query.NameStartsWithOrGreater = ''; query.NameStartsWithOrGreater = '';

37
dashboard-ui/scripts/musicalbums.js
View file

@ -1,8 +1,8 @@
(function ($, document) { (function ($, document) {
var data = {}; var data = {};
function getPageData() { function getPageData(context) {
var key = getSavedQueryKey(); var key = getSavedQueryKey(context);
var pageData = data[key]; var pageData = data[key];
if (!pageData) { if (!pageData) {
@ -27,21 +27,24 @@
return pageData; return pageData;
} }
function getQuery() { function getQuery(context) {
return getPageData().query; return getPageData(context).query;
} }
function getSavedQueryKey() { function getSavedQueryKey(context) {
return LibraryBrowser.getSavedQueryKey('albums'); if (!context.savedQueryKey) {
context.savedQueryKey = LibraryBrowser.getSavedQueryKey('albums');
}
return context.savedQueryKey;
} }
function reloadItems(page) { function reloadItems(page) {
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
var query = getQuery(); var query = getQuery(page);
ApiClient.getItems(Dashboard.getCurrentUserId(), query).then(function (result) { ApiClient.getItems(Dashboard.getCurrentUserId(), query).then(function (result) {
@ -49,7 +52,7 @@
window.scrollTo(0, 0); window.scrollTo(0, 0);
var html = ''; var html = '';
var view = getPageData().view; var view = getPageData(page).view;
var pagingHtml = LibraryBrowser.getQueryPagingHtml({ var pagingHtml = LibraryBrowser.getQueryPagingHtml({
startIndex: query.StartIndex, startIndex: query.StartIndex,
limit: query.Limit, limit: query.Limit,
@ -133,12 +136,12 @@
$('.btnChangeLayout', page).on('layoutchange', function (e, layout) { $('.btnChangeLayout', page).on('layoutchange', function (e, layout) {
if (layout == 'Timeline') { if (layout == 'Timeline') {
getQuery().SortBy = 'ProductionYear,PremiereDate,SortName'; getQuery(page).SortBy = 'ProductionYear,PremiereDate,SortName';
getQuery().SortOrder = 'Descending'; getQuery(page).SortOrder = 'Descending';
} }
getPageData().view = layout; getPageData(page).view = layout;
LibraryBrowser.saveViewSetting(getSavedQueryKey(), layout); LibraryBrowser.saveViewSetting(getSavedQueryKey(page), layout);
reloadItems(page); reloadItems(page);
}); });
@ -176,7 +179,7 @@
}); });
}); });
LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); LibraryBrowser.saveQueryValues(getSavedQueryKey(page), query);
LibraryBrowser.setLastRefreshed(page); LibraryBrowser.setLastRefreshed(page);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
}); });
@ -187,7 +190,7 @@
require(['components/filterdialog/filterdialog'], function (filterDialogFactory) { require(['components/filterdialog/filterdialog'], function (filterDialogFactory) {
var filterDialog = new filterDialogFactory({ var filterDialog = new filterDialogFactory({
query: getQuery(), query: getQuery(page),
mode: 'albums' mode: 'albums'
}); });
@ -201,7 +204,7 @@
function updateFilterControls(page) { function updateFilterControls(page) {
var query = getQuery(); var query = getQuery(page);
$('.alphabetPicker', page).alphaValue(query.NameStartsWith); $('.alphabetPicker', page).alphaValue(query.NameStartsWith);
} }
@ -210,7 +213,7 @@
$('.alphabetPicker', tabContent).on('alphaselect', function (e, character) { $('.alphabetPicker', tabContent).on('alphaselect', function (e, character) {
var query = getQuery(); var query = getQuery(tabContent);
if (query.SortBy.indexOf('AlbumArtist') == -1) { if (query.SortBy.indexOf('AlbumArtist') == -1) {
query.NameStartsWithOrGreater = character; query.NameStartsWithOrGreater = character;
@ -226,7 +229,7 @@
}).on('alphaclear', function (e) { }).on('alphaclear', function (e) {
var query = getQuery(); var query = getQuery(tabContent);
query.NameStartsWithOrGreater = ''; query.NameStartsWithOrGreater = '';
query.AlbumArtistStartsWithOrGreater = ''; query.AlbumArtistStartsWithOrGreater = '';

33
dashboard-ui/scripts/musicartists.js
View file

@ -1,8 +1,8 @@
(function ($, document) { (function ($, document) {
var data = {}; var data = {};
function getPageData() { function getPageData(context) {
var key = getSavedQueryKey(); var key = getSavedQueryKey(context);
var pageData = data[key]; var pageData = data[key];
if (!pageData) { if (!pageData) {
@ -26,28 +26,31 @@
return pageData; return pageData;
} }
function getQuery() { function getQuery(context) {
return getPageData().query; return getPageData(context).query;
} }
function getSavedQueryKey() { function getSavedQueryKey(context) {
return LibraryBrowser.getSavedQueryKey('artists'); if (!context.savedQueryKey) {
context.savedQueryKey = LibraryBrowser.getSavedQueryKey('artists');
}
return context.savedQueryKey;
} }
function reloadItems(page) { function reloadItems(page) {
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
var query = getQuery(); var query = getQuery(page);
ApiClient.getArtists(Dashboard.getCurrentUserId(), query).then(function (result) { ApiClient.getArtists(Dashboard.getCurrentUserId(), query).then(function (result) {
// Scroll back up so they can see the results from the beginning // Scroll back up so they can see the results from the beginning
window.scrollTo(0, 0); window.scrollTo(0, 0);
var view = getPageData().view; var view = getPageData(page).view;
var html = ''; var html = '';
var pagingHtml = LibraryBrowser.getQueryPagingHtml({ var pagingHtml = LibraryBrowser.getQueryPagingHtml({
@ -114,8 +117,8 @@
}); });
$('.btnChangeLayout', page).on('layoutchange', function (e, layout) { $('.btnChangeLayout', page).on('layoutchange', function (e, layout) {
getPageData().view = layout; getPageData(page).view = layout;
LibraryBrowser.saveViewSetting(getSavedQueryKey(), layout); LibraryBrowser.saveViewSetting(getSavedQueryKey(page), layout);
reloadItems(page); reloadItems(page);
}); });
@ -123,7 +126,7 @@
showFilterMenu(page); showFilterMenu(page);
}); });
LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); LibraryBrowser.saveQueryValues(getSavedQueryKey(page), query);
LibraryBrowser.setLastRefreshed(page); LibraryBrowser.setLastRefreshed(page);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
}); });
@ -134,7 +137,7 @@
require(['components/filterdialog/filterdialog'], function (filterDialogFactory) { require(['components/filterdialog/filterdialog'], function (filterDialogFactory) {
var filterDialog = new filterDialogFactory({ var filterDialog = new filterDialogFactory({
query: getQuery(), query: getQuery(page),
mode: 'artists' mode: 'artists'
}); });
@ -148,7 +151,7 @@
function updateFilterControls(tabContent) { function updateFilterControls(tabContent) {
var query = getQuery(); var query = getQuery(tabContent);
$('.alphabetPicker', tabContent).alphaValue(query.NameStartsWithOrGreater); $('.alphabetPicker', tabContent).alphaValue(query.NameStartsWithOrGreater);
} }
@ -157,7 +160,7 @@
$('.alphabetPicker', tabContent).on('alphaselect', function (e, character) { $('.alphabetPicker', tabContent).on('alphaselect', function (e, character) {
var query = getQuery(); var query = getQuery(tabContent);
query.NameStartsWithOrGreater = character; query.NameStartsWithOrGreater = character;
query.StartIndex = 0; query.StartIndex = 0;
@ -166,7 +169,7 @@
}).on('alphaclear', function (e) { }).on('alphaclear', function (e) {
var query = getQuery(); var query = getQuery(tabContent);
query.NameStartsWithOrGreater = ''; query.NameStartsWithOrGreater = '';

21
dashboard-ui/scripts/songs.js
View file

@ -3,8 +3,8 @@
var defaultSortBy = "Album,SortName"; var defaultSortBy = "Album,SortName";
var data = {}; var data = {};
function getPageData() { function getPageData(context) {
var key = getSavedQueryKey(); var key = getSavedQueryKey(context);
var pageData = data[key]; var pageData = data[key];
if (!pageData) { if (!pageData) {
@ -28,21 +28,24 @@
return pageData; return pageData;
} }
function getQuery() { function getQuery(context) {
return getPageData().query; return getPageData(context).query;
} }
function getSavedQueryKey() { function getSavedQueryKey(context) {
return LibraryBrowser.getSavedQueryKey('songs'); if (!context.savedQueryKey) {
context.savedQueryKey = LibraryBrowser.getSavedQueryKey('songs');
}
return context.savedQueryKey;
} }
function reloadItems(page) { function reloadItems(page) {
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
var query = getQuery(); var query = getQuery(page);
ApiClient.getItems(Dashboard.getCurrentUserId(), query).then(function (result) { ApiClient.getItems(Dashboard.getCurrentUserId(), query).then(function (result) {
// Scroll back up so they can see the results from the beginning // Scroll back up so they can see the results from the beginning
@ -132,7 +135,7 @@
}); });
}); });
LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); LibraryBrowser.saveQueryValues(getSavedQueryKey(page), query);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
}); });
@ -143,7 +146,7 @@
require(['components/filterdialog/filterdialog'], function (filterDialogFactory) { require(['components/filterdialog/filterdialog'], function (filterDialogFactory) {
var filterDialog = new filterDialogFactory({ var filterDialog = new filterDialogFactory({
query: getQuery(), query: getQuery(page),
mode: 'songs' mode: 'songs'
}); });

33
dashboard-ui/scripts/tvshows.js
View file

@ -2,8 +2,8 @@
var data = {}; var data = {};
function getPageData() { function getPageData(context) {
var key = getSavedQueryKey(); var key = getSavedQueryKey(context);
var pageData = data[key]; var pageData = data[key];
if (!pageData) { if (!pageData) {
@ -28,28 +28,31 @@
return pageData; return pageData;
} }
function getQuery() { function getQuery(context) {
return getPageData().query; return getPageData(context).query;
} }
function getSavedQueryKey() { function getSavedQueryKey(context) {
return LibraryBrowser.getSavedQueryKey('series'); if (!context.savedQueryKey) {
context.savedQueryKey = LibraryBrowser.getSavedQueryKey('series');
}
return context.savedQueryKey;
} }
function reloadItems(page) { function reloadItems(page) {
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
var query = getQuery(); var query = getQuery(page);
ApiClient.getItems(Dashboard.getCurrentUserId(), query).then(function (result) { ApiClient.getItems(Dashboard.getCurrentUserId(), query).then(function (result) {
// Scroll back up so they can see the results from the beginning // Scroll back up so they can see the results from the beginning
window.scrollTo(0, 0); window.scrollTo(0, 0);
var view = getPageData().view; var view = getPageData(page).view;
var html = ''; var html = '';
var pagingHtml = LibraryBrowser.getQueryPagingHtml({ var pagingHtml = LibraryBrowser.getQueryPagingHtml({
@ -151,8 +154,8 @@
}); });
$('.btnChangeLayout', page).on('layoutchange', function (e, layout) { $('.btnChangeLayout', page).on('layoutchange', function (e, layout) {
getPageData().view = layout; getPageData(page).view = layout;
LibraryBrowser.saveViewSetting(getSavedQueryKey(), layout); LibraryBrowser.saveViewSetting(getSavedQueryKey(page), layout);
reloadItems(page); reloadItems(page);
}); });
@ -202,7 +205,7 @@
}); });
}); });
LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); LibraryBrowser.saveQueryValues(getSavedQueryKey(page), query);
LibraryBrowser.setLastRefreshed(page); LibraryBrowser.setLastRefreshed(page);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
@ -214,7 +217,7 @@
require(['components/filterdialog/filterdialog'], function (filterDialogFactory) { require(['components/filterdialog/filterdialog'], function (filterDialogFactory) {
var filterDialog = new filterDialogFactory({ var filterDialog = new filterDialogFactory({
query: getQuery(), query: getQuery(page),
mode: 'series' mode: 'series'
}); });
@ -228,7 +231,7 @@
function updateFilterControls(tabContent) { function updateFilterControls(tabContent) {
var query = getQuery(); var query = getQuery(tabContent);
$('.alphabetPicker', tabContent).alphaValue(query.NameStartsWith); $('.alphabetPicker', tabContent).alphaValue(query.NameStartsWith);
} }
@ -236,7 +239,7 @@
$('.alphabetPicker', tabContent).on('alphaselect', function (e, character) { $('.alphabetPicker', tabContent).on('alphaselect', function (e, character) {
var query = getQuery(); var query = getQuery(tabContent);
query.NameStartsWithOrGreater = character; query.NameStartsWithOrGreater = character;
query.StartIndex = 0; query.StartIndex = 0;
@ -244,7 +247,7 @@
}).on('alphaclear', function (e) { }).on('alphaclear', function (e) {
var query = getQuery(); var query = getQuery(tabContent);
query.NameStartsWithOrGreater = ''; query.NameStartsWithOrGreater = '';
reloadItems(tabContent); reloadItems(tabContent);