rework people

This commit is contained in:
Luke Pulverenti 2015-10-04 23:24:24 -04:00
parent 4bc4e81c51
commit 2f11b55964
12 changed files with 27 additions and 518 deletions

View file

@ -2383,7 +2383,7 @@
if (item.Type == "Series" || item.Type == "Season" || item.Type == "BoxSet" || item.MediaType == "Video" || item.MediaType == "Game" || item.MediaType == "Book") {
if (item.UserData.UnplayedItemCount) {
return '<div class="playedIndicator textIndicator">' + item.UserData.UnplayedItemCount + '</div>';
return '<div class="playedIndicator">' + item.UserData.UnplayedItemCount + '</div>';
}
if (item.Type != 'TvChannel') {
@ -2399,7 +2399,7 @@
getGroupCountIndicator: function (item) {
if (item.ChildCount) {
return '<div class="playedIndicator textIndicator">' + item.ChildCount + '</div>';
return '<div class="playedIndicator">' + item.ChildCount + '</div>';
}
return '';

View file

@ -1,177 +0,0 @@
(function ($, document) {
var pageSizeKey = 'people';
var data = {};
function getQuery() {
var key = getSavedQueryKey();
var pageData = data[key];
if (!pageData) {
pageData = data[key] = {
query: {
SortBy: "SortName",
SortOrder: "Ascending",
IncludeItemTypes: "Movie,Trailer",
Recursive: true,
Fields: "DateCreated,ItemCounts",
PersonTypes: "",
StartIndex: 0,
Limit: 100
}
};
pageData.query.ParentId = LibraryMenu.getTopParentId();
LibraryBrowser.loadSavedQueryValues(key, pageData.query);
}
return pageData.query;
}
function getSavedQueryKey() {
return getWindowUrl() + 'people';
}
function reloadItems(page, viewPanel) {
Dashboard.showLoadingMsg();
var query = getQuery();
ApiClient.getPeople(Dashboard.getCurrentUserId(), query).done(function (result) {
// Scroll back up so they can see the results from the beginning
window.scrollTo(0, 0);
var html = '';
var pagingHtml = LibraryBrowser.getQueryPagingHtml({
startIndex: query.StartIndex,
limit: query.Limit,
totalRecordCount: result.TotalRecordCount,
viewButton: true,
viewIcon: 'filter-list',
showLimit: false,
updatePageSizeSetting: false,
pageSizeKey: pageSizeKey,
viewPanelClass: 'peopleViewPanel'
});
page.querySelector('.listTopPaging').innerHTML = pagingHtml;
updateFilterControls(page, viewPanel);
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "portrait",
showTitle: true,
showItemCounts: true,
coverImage: true,
lazy: true
});
var elem = page.querySelector('.itemsContainer');
elem.innerHTML = html + pagingHtml;
ImageLoader.lazyChildren(elem);
$('.btnNextPage', page).on('click', function () {
query.StartIndex += query.Limit;
reloadItems(page, viewPanel);
});
$('.btnPreviousPage', page).on('click', function () {
query.StartIndex -= query.Limit;
reloadItems(page, viewPanel);
});
LibraryBrowser.saveQueryValues(getSavedQueryKey(), query);
Dashboard.hideLoadingMsg();
});
}
function updateFilterControls(tabContent, viewPanel) {
var query = getQuery();
$('.chkPersonTypeFilter', viewPanel).each(function () {
var filters = "," + (query.PersonTypes || "");
var filterName = this.getAttribute('data-filter');
this.checked = filters.indexOf(',' + filterName) != -1;
});
$('.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);
});
$('.chkPersonTypeFilter', viewPanel).on('change', function () {
var query = getQuery();
var filterName = this.getAttribute('data-filter');
var filters = query.PersonTypes || "";
filters = (',' + filters).replace(',' + filterName, '').substring(1);
if (this.checked) {
filters = filters ? (filters + ',' + filterName) : filterName;
}
query.StartIndex = 0;
query.PersonTypes = filters;
reloadItems(tabContent, viewPanel);
});
$('.alphabetPicker', tabContent).on('alphaselect', function (e, character) {
var query = getQuery();
query.NameStartsWithOrGreater = character;
query.StartIndex = 0;
reloadItems(tabContent, viewPanel);
}).on('alphaclear', function (e) {
var query = getQuery();
query.NameStartsWithOrGreater = '';
reloadItems(tabContent, viewPanel);
});
}
window.MoviesPage.initPeopleTab = function (page, tabContent) {
var viewPanel = page.querySelector('.peopleViewPanel');
initPage(tabContent, viewPanel);
};
window.MoviesPage.renderPeopleTab = function (page, tabContent) {
if (LibraryBrowser.needsRefresh(tabContent)) {
var viewPanel = page.querySelector('.peopleViewPanel');
reloadItems(tabContent, viewPanel);
updateFilterControls(tabContent, viewPanel);
}
};
})(jQuery, document);

View file

@ -299,11 +299,6 @@
renderMethod = 'renderGenresTab';
break;
case 5:
depends.push('scripts/moviepeople');
renderMethod = 'renderPeopleTab';
initMethod = 'initPeopleTab';
break;
case 6:
depends.push('scripts/moviestudios');
renderMethod = 'renderStudiosTab';
break;

View file

@ -1777,7 +1777,6 @@ var AppInfo = {};
if (!AppInfo.hasLowImageBandwidth) {
AppInfo.enableStudioTabs = true;
AppInfo.enablePeopleTabs = true;
AppInfo.enableTvEpisodesTab = true;
AppInfo.enableMovieTrailersTab = true;
}
@ -1915,10 +1914,6 @@ var AppInfo = {};
elem.classList.add('studioTabDisabled');
}
if (!AppInfo.enablePeopleTabs) {
elem.classList.add('peopleTabDisabled');
}
if (!AppInfo.enableTvEpisodesTab) {
elem.classList.add('tvEpisodesTabDisabled');
}

View file

@ -1,178 +0,0 @@
(function ($, document) {
var pageSizeKey = 'people';
var data = {};
function getQuery() {
var key = getSavedQueryKey();
var pageData = data[key];
if (!pageData) {
pageData = data[key] = {
query: {
SortBy: "SortName",
SortOrder: "Ascending",
IncludeItemTypes: "Series,Episode",
Recursive: true,
Fields: "DateCreated,ItemCounts",
PersonTypes: "",
StartIndex: 0,
Limit: 100
}
};
pageData.query.ParentId = LibraryMenu.getTopParentId();
LibraryBrowser.loadSavedQueryValues(key, pageData.query);
}
return pageData.query;
}
function getSavedQueryKey() {
return getWindowUrl() + 'people';
}
function reloadItems(page, viewPanel) {
Dashboard.showLoadingMsg();
var query = getQuery();
ApiClient.getPeople(Dashboard.getCurrentUserId(), query).done(function (result) {
// Scroll back up so they can see the results from the beginning
window.scrollTo(0, 0);
var html = '';
var pagingHtml = LibraryBrowser.getQueryPagingHtml({
startIndex: query.StartIndex,
limit: query.Limit,
totalRecordCount: result.TotalRecordCount,
viewButton: true,
viewIcon: 'filter-list',
showLimit: false,
updatePageSizeSetting: false,
pageSizeKey: pageSizeKey,
viewPanelClass: 'peopleViewPanel'
});
page.querySelector('.listTopPaging').innerHTML = pagingHtml;
updateFilterControls(page, viewPanel);
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "portrait",
context: 'tv',
showTitle: true,
showItemCounts: true,
coverImage: true,
lazy: true
});
var elem = page.querySelector('.itemsContainer');
elem.innerHTML = html + pagingHtml;
ImageLoader.lazyChildren(elem);
$('.btnNextPage', page).on('click', function () {
query.StartIndex += query.Limit;
reloadItems(page, viewPanel);
});
$('.btnPreviousPage', page).on('click', function () {
query.StartIndex -= query.Limit;
reloadItems(page, viewPanel);
});
LibraryBrowser.saveQueryValues(getSavedQueryKey(), query);
Dashboard.hideLoadingMsg();
});
}
function updateFilterControls(tabContent, viewPanel) {
var query = getQuery();
$('.chkPersonTypeFilter', viewPanel).each(function () {
var filters = "," + (query.PersonTypes || "");
var filterName = this.getAttribute('data-filter');
this.checked = filters.indexOf(',' + filterName) != -1;
});
$('.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);
});
$('.chkPersonTypeFilter', viewPanel).on('change', function () {
var query = getQuery();
var filterName = this.getAttribute('data-filter');
var filters = query.PersonTypes || "";
filters = (',' + filters).replace(',' + filterName, '').substring(1);
if (this.checked) {
filters = filters ? (filters + ',' + filterName) : filterName;
}
query.StartIndex = 0;
query.PersonTypes = filters;
reloadItems(tabContent, viewPanel);
});
$('.alphabetPicker', tabContent).on('alphaselect', function (e, character) {
var query = getQuery();
query.NameStartsWithOrGreater = character;
query.StartIndex = 0;
reloadItems(tabContent, viewPanel);
}).on('alphaclear', function (e) {
var query = getQuery();
query.NameStartsWithOrGreater = '';
reloadItems(tabContent, viewPanel);
});
}
window.TvPage.initPeopleTab = function (page, tabContent) {
var viewPanel = page.querySelector('.peopleViewPanel');
initPage(tabContent, viewPanel);
};
window.TvPage.renderPeopleTab = function (page, tabContent) {
if (LibraryBrowser.needsRefresh(tabContent)) {
var viewPanel = page.querySelector('.peopleViewPanel');
reloadItems(tabContent, viewPanel);
updateFilterControls(tabContent, viewPanel);
}
};
})(jQuery, document);

View file

@ -222,11 +222,6 @@
renderMethod = 'renderGenresTab';
break;
case 6:
depends.push('scripts/tvpeople');
renderMethod = 'renderPeopleTab';
initMethod = 'initPeopleTab';
break;
case 7:
depends.push('scripts/tvstudios');
renderMethod = 'renderStudiosTab';
break;
@ -284,15 +279,6 @@
var page = this;
if (LibraryBrowser.needsRefresh(page)) {
reload(page);
}
});
pageIdOn('pageshow', "tvRecommendedPage", function () {
var page = this;
if (!page.getAttribute('data-title')) {
var parentId = LibraryMenu.getTopParentId();