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

restore saved movie views

Browse source
This commit is contained in:
Luke Pulverenti 2015-08-15 14:46:57 -04:00
parent 68c88cbf97
commit 7f44f00a69
7 changed files with 59 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/movies.html
View file

@ -4,7 +4,7 @@
<title>Emby</title> <title>Emby</title>
</head> </head>
<body> <body>
<div id="moviesRecommendedPage" data-role="page" class="page libraryPage backdropPage pageWithAbsoluteTabs" data-backdroptype="movie" data-require="jqmicons,scripts/moviesrecommended,paperbuttonstyle,scripts/moviestudios,scripts/moviepeople,scripts/moviegenres,scripts/movietrailers,scripts/queryfilters,scripts/movies,scripts/moviecollections"> <div id="moviesRecommendedPage" data-role="page" class="page libraryPage backdropPage pageWithAbsoluteTabs collectionEditorPage" data-backdroptype="movie" data-require="jqmicons,scripts/moviesrecommended,paperbuttonstyle,scripts/moviestudios,scripts/moviepeople,scripts/moviegenres,scripts/movietrailers,scripts/queryfilters,scripts/movies,scripts/moviecollections">
<div class="libraryViewNav libraryViewNavWithMinHeight"> <div class="libraryViewNav libraryViewNavWithMinHeight">
<paper-tabs style="display:none;min-width:800px;margin:auto;"> <paper-tabs style="display:none;min-width:800px;margin:auto;">

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

@ -68,10 +68,17 @@
} }
}, },
getSavedView: function (key) {
var val = appStorage.getItem(key + '_' + Dashboard.getCurrentUserId() + '_view');
return val;
},
getSavedViewSetting: function (key) { getSavedViewSetting: function (key) {
var deferred = $.Deferred(); var deferred = $.Deferred();
var val = appStorage.getItem(key + '_' + Dashboard.getCurrentUserId() + '_view'); var val = LibraryBrowser.getSavedView(key);
deferred.resolveWith(null, [val]); deferred.resolveWith(null, [val]);
return deferred.promise(); return deferred.promise();

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

@ -395,10 +395,10 @@
// id: 'SchedulesDirect' // id: 'SchedulesDirect'
//}); //});
menuItems.push({ //menuItems.push({
name: 'Emby Guide', // name: 'Emby Guide',
id: 'emby' // id: 'emby'
}); //});
require(['actionsheet'], function () { require(['actionsheet'], function () {

25
dashboard-ui/scripts/moviecollections.js
View file

@ -1,10 +1,7 @@
(function ($, document) { (function ($, document) {
var view = LibraryBrowser.getDefaultItemsView('Poster', 'Poster');
var data = {}; var data = {};
function getQuery() { function getPageData() {
var key = getSavedQueryKey(); var key = getSavedQueryKey();
var pageData = data[key]; var pageData = data[key];
@ -20,13 +17,19 @@
EnableImageTypes: "Primary,Backdrop,Banner,Thumb", EnableImageTypes: "Primary,Backdrop,Banner,Thumb",
StartIndex: 0, StartIndex: 0,
Limit: LibraryBrowser.getDefaultPageSize() Limit: LibraryBrowser.getDefaultPageSize()
} },
view: LibraryBrowser.getSavedView(key) || LibraryBrowser.getDefaultItemsView('Poster', 'Poster')
}; };
//pageData.query.ParentId = LibraryMenu.getTopParentId(); pageData.query.ParentId = LibraryMenu.getTopParentId();
LibraryBrowser.loadSavedQueryValues(key, pageData.query); LibraryBrowser.loadSavedQueryValues(key, pageData.query);
} }
return pageData.query; return pageData;
}
function getQuery() {
return getPageData().query;
} }
function getSavedQueryKey() { function getSavedQueryKey() {
@ -67,6 +70,7 @@
if (result.TotalRecordCount) { if (result.TotalRecordCount) {
var view = getPageData().view;
var context = getParameterByName('context'); var context = getParameterByName('context');
if (view == "List") { if (view == "List") {
@ -179,7 +183,7 @@
}).checkboxradio('refresh'); }).checkboxradio('refresh');
$('select.selectView', viewPanel).val(view).selectmenu('refresh'); $('select.selectView', viewPanel).val(getPageData().view).selectmenu('refresh');
$('.chkTrailer', viewPanel).checked(query.HasTrailer == true).checkboxradio('refresh'); $('.chkTrailer', viewPanel).checked(query.HasTrailer == true).checkboxradio('refresh');
$('.chkThemeSong', viewPanel).checked(query.HasThemeSong == true).checkboxradio('refresh'); $('.chkThemeSong', viewPanel).checked(query.HasThemeSong == true).checkboxradio('refresh');
@ -249,11 +253,12 @@
$('select.selectView', viewPanel).on('change', function () { $('select.selectView', viewPanel).on('change', function () {
view = this.value; var newView = this.value;
getPageData().view = newView;
reloadItems(tabContent, viewPanel); reloadItems(tabContent, viewPanel);
LibraryBrowser.saveViewSetting(getSavedQueryKey(), view); LibraryBrowser.saveViewSetting(getSavedQueryKey(), newView);
}); });
$('select.selectPageSize', viewPanel).on('change', function () { $('select.selectPageSize', viewPanel).on('change', function () {

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

@ -1,10 +1,7 @@
(function ($, document) { (function ($, document) {
var view = LibraryBrowser.getDefaultItemsView('Thumb', 'Thumb');
var data = {}; var data = {};
function getQuery() { function getPageData() {
var key = getSavedQueryKey(); var key = getSavedQueryKey();
var pageData = data[key]; var pageData = data[key];
@ -18,13 +15,19 @@
Fields: "DateCreated,SyncInfo,ItemCounts", Fields: "DateCreated,SyncInfo,ItemCounts",
StartIndex: 0, StartIndex: 0,
Limit: LibraryBrowser.getDefaultPageSize() Limit: LibraryBrowser.getDefaultPageSize()
} },
view: LibraryBrowser.getSavedView(key) || LibraryBrowser.getDefaultItemsView('Thumb', 'Thumb')
}; };
pageData.query.ParentId = LibraryMenu.getTopParentId(); pageData.query.ParentId = LibraryMenu.getTopParentId();
LibraryBrowser.loadSavedQueryValues(key, pageData.query); LibraryBrowser.loadSavedQueryValues(key, pageData.query);
} }
return pageData.query; return pageData;
}
function getQuery() {
return getPageData().query;
} }
function getSavedQueryKey() { function getSavedQueryKey() {
@ -55,6 +58,7 @@
})).trigger('create'); })).trigger('create');
updateFilterControls(page); updateFilterControls(page);
var view = getPageData().view;
if (view == "Thumb") { if (view == "Thumb") {
html = LibraryBrowser.getPosterViewHtml({ html = LibraryBrowser.getPosterViewHtml({
@ -126,7 +130,7 @@
var query = getQuery(); var query = getQuery();
$('select.selectPageSize', page).val(query.Limit).selectmenu('refresh'); $('select.selectPageSize', page).val(query.Limit).selectmenu('refresh');
$('select.selectView', page).val(view).selectmenu('refresh'); $('select.selectView', page).val(getPageData().view).selectmenu('refresh');
} }
function initPage(tabContent, viewPanel) { function initPage(tabContent, viewPanel) {
@ -158,10 +162,11 @@
$('select.selectView', viewPanel).on('change', function () { $('select.selectView', viewPanel).on('change', function () {
view = this.value; var newView = this.value;
getPageData().view = newView;
reloadItems(tabContent, viewPanel); reloadItems(tabContent, viewPanel);
LibraryBrowser.saveViewSetting(getSavedQueryKey(), view); LibraryBrowser.saveViewSetting(getSavedQueryKey(), newView);
}); });
} }

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

@ -1,11 +1,8 @@
(function ($, document) { (function ($, document) {
var view = LibraryBrowser.getDefaultItemsView('Poster', 'Poster');
var data = {}; var data = {};
function getQuery() { function getPageData() {
var key = getSavedQueryKey(); var key = getSavedQueryKey();
var pageData = data[key]; var pageData = data[key];
@ -21,13 +18,19 @@
EnableImageTypes: "Primary,Backdrop,Banner,Thumb", EnableImageTypes: "Primary,Backdrop,Banner,Thumb",
StartIndex: 0, StartIndex: 0,
Limit: LibraryBrowser.getDefaultPageSize() Limit: LibraryBrowser.getDefaultPageSize()
} },
view: LibraryBrowser.getSavedView(key) || LibraryBrowser.getDefaultItemsView('Poster', 'Poster')
}; };
pageData.query.ParentId = LibraryMenu.getTopParentId(); pageData.query.ParentId = LibraryMenu.getTopParentId();
LibraryBrowser.loadSavedQueryValues(key, pageData.query); LibraryBrowser.loadSavedQueryValues(key, pageData.query);
} }
return pageData.query; return pageData;
}
function getQuery() {
return getPageData().query;
} }
function getSavedQueryKey() { function getSavedQueryKey() {
@ -42,6 +45,7 @@
var userId = Dashboard.getCurrentUserId(); var userId = Dashboard.getCurrentUserId();
var query = getQuery(); var query = getQuery();
var view = getPageData().view;
ApiClient.getItems(userId, query).done(function (result) { ApiClient.getItems(userId, query).done(function (result) {
@ -208,7 +212,7 @@
}).checkboxradio('refresh'); }).checkboxradio('refresh');
$('select.selectView', viewPanel).val(view).selectmenu('refresh'); $('select.selectView', viewPanel).val(getPageData().view).selectmenu('refresh');
$('.chk3D', viewPanel).checked(query.Is3D == true).checkboxradio('refresh'); $('.chk3D', viewPanel).checked(query.Is3D == true).checkboxradio('refresh');
$('.chkHD', viewPanel).checked(query.IsHD == true).checkboxradio('refresh'); $('.chkHD', viewPanel).checked(query.IsHD == true).checkboxradio('refresh');
@ -280,10 +284,11 @@
$('select.selectView', viewPanel).on('change', function () { $('select.selectView', viewPanel).on('change', function () {
view = this.value; var newView = this.value;
getPageData().view = newView;
var query = getQuery(); var query = getQuery();
if (view == "Timeline") { if (newView == "Timeline") {
query.SortBy = "PremiereDate"; query.SortBy = "PremiereDate";
query.SortOrder = "Descending"; query.SortOrder = "Descending";
@ -294,7 +299,7 @@
reloadItems(tabContent, viewPanel); reloadItems(tabContent, viewPanel);
} }
LibraryBrowser.saveViewSetting(getSavedQueryKey(), view); LibraryBrowser.saveViewSetting(getSavedQueryKey(), newView);
}); });
$('.chkVideoTypeFilter', viewPanel).on('change', function () { $('.chkVideoTypeFilter', viewPanel).on('change', function () {
@ -453,6 +458,7 @@
} }
if (LibraryBrowser.needsRefresh(tabContent)) { if (LibraryBrowser.needsRefresh(tabContent)) {
reloadItems(tabContent, viewPanel); reloadItems(tabContent, viewPanel);
updateFilterControls(tabContent, viewPanel); updateFilterControls(tabContent, viewPanel);
} }

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

@ -68,6 +68,7 @@
} }
$('#recentlyAddedItems', page).html(html).lazyChildren(); $('#recentlyAddedItems', page).html(html).lazyChildren();
LibraryBrowser.setLastRefreshed(page);
}); });
} }