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

fix hashbang nav

Browse source
This commit is contained in:
Luke Pulverenti 2016-03-18 15:43:17 -04:00
parent 51fcbbf744
commit ed811fa26a
16 changed files with 1684 additions and 1713 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/favorites.html
View file

@ -1,4 +1,4 @@
<div id="favoritesPage" data-role="page" class="page homePage libraryPage allLibraryPage noSecondaryNavPage" data-title="${TabFavorites}" data-require="scripts/favorites"> <div id="favoritesPage" data-role="page" class="page homePage libraryPage allLibraryPage noSecondaryNavPage" data-title="${TabFavorites}">
<div data-role="content"> <div data-role="content">

2
dashboard-ui/itemlist.html
View file

@ -1,4 +1,4 @@
<div id="itemListPage" data-role="page" class="page libraryPage folderListPage noSecondaryNavPage" data-require="scripts/itemlistpage,paper-checkbox,scripts/alphapicker"> <div id="itemListPage" data-role="page" class="page libraryPage folderListPage noSecondaryNavPage">
<div class="alphabetPicker"> <div class="alphabetPicker">
</div> </div>
<div data-role="content" class="itemListContent"> <div data-role="content" class="itemListContent">

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

@ -1,4 +1,8 @@
(function ($, document) { define([], function () {
return function (view, params, tabContent) {
var self = this;
var data = {}; var data = {};
@ -24,7 +28,7 @@
view: LibraryBrowser.getSavedView(key) || LibraryBrowser.getDefaultItemsView('Poster', 'Poster') view: LibraryBrowser.getSavedView(key) || LibraryBrowser.getDefaultItemsView('Poster', 'Poster')
}; };
pageData.query.ParentId = LibraryMenu.getTopParentId(); pageData.query.ParentId = params.topParentId;
LibraryBrowser.loadSavedQueryValues(key, pageData.query); LibraryBrowser.loadSavedQueryValues(key, pageData.query);
} }
return pageData; return pageData;
@ -228,17 +232,16 @@
}); });
} }
window.TvPage.initEpisodesTab = function (page, tabContent) { self.initTab = function () {
initPage(tabContent); initPage(tabContent);
}; };
self.renderTab = function () {
window.TvPage.renderEpisodesTab = function (page, tabContent) {
if (LibraryBrowser.needsRefresh(tabContent)) { if (LibraryBrowser.needsRefresh(tabContent)) {
reloadItems(tabContent); reloadItems(tabContent);
updateFilterControls(tabContent); updateFilterControls(tabContent);
} }
}; };
};
})(jQuery, document); });

2
dashboard-ui/scripts/itembynamedetailpage.js
View file

@ -264,7 +264,7 @@
function getMoreItemsHref(item, type) { function getMoreItemsHref(item, type) {
return 'secondaryitems.html?type=' + type + '&parentid=' + item.Id; return 'secondaryitems.html?type=' + type + '&parentId=' + item.Id;
} }
function addCurrentItemToQuery(query, item) { function addCurrentItemToQuery(query, item) {

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

@ -1,15 +1,16 @@
(function ($, document) { define(['libraryBrowser', 'jQuery'], function (libraryBrowser, $) {
return function (view, params) {
var currentItem; var currentItem;
var data = {}; var data;
function getPageData(context) { function getPageData() {
var key = getSavedQueryKey(context); var pageData = data;
var pageData = data[key];
if (!pageData) { if (!pageData) {
pageData = data[key] = { pageData = data = {
query: { query: {
SortBy: "SortName", SortBy: "SortName",
SortOrder: "Ascending", SortOrder: "Ascending",
@ -17,50 +18,38 @@
ImageTypeLimit: 1, ImageTypeLimit: 1,
EnableImageTypes: "Primary,Backdrop,Banner,Thumb", EnableImageTypes: "Primary,Backdrop,Banner,Thumb",
StartIndex: 0, StartIndex: 0,
Limit: LibraryBrowser.getDefaultPageSize() Limit: libraryBrowser.getDefaultPageSize()
} }
}; };
pageData.query.Filters = ""; pageData.query.Filters = "";
pageData.query.NameStartsWithOrGreater = ''; pageData.query.NameStartsWithOrGreater = '';
pageData.view = LibraryBrowser.getSavedView(key) || LibraryBrowser.getDefaultItemsView('Poster', 'Poster'); var key = getSavedQueryKey();
pageData.view = libraryBrowser.getSavedView(key) || libraryBrowser.getDefaultItemsView('Poster', 'Poster');
pageData.query.ParentId = getParam(context, 'parentId'); pageData.query.ParentId = params.parentId || null;
LibraryBrowser.loadSavedQueryValues(key, pageData.query); libraryBrowser.loadSavedQueryValues(key, pageData.query);
} }
return pageData; return pageData;
} }
function getParam(context, name) { function getQuery() {
if (!context.pageParams) { return getPageData().query;
context.pageParams = {}; }
function getSavedQueryKey() {
if (!view.savedQueryKey) {
view.savedQueryKey = libraryBrowser.getSavedQueryKey('items');
}
return view.savedQueryKey;
} }
if (!context.pageParams[name]) { function reloadItems() {
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) {
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
var query = getQuery(page); var query = getQuery();
var userId = Dashboard.getCurrentUserId(); var userId = Dashboard.getCurrentUserId();
var parentItemPromise = query.ParentId ? var parentItemPromise = query.ParentId ?
@ -78,26 +67,26 @@
// 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(page).view; var viewStyle = getPageData(view).view;
var html = ''; var html = '';
var pagingHtml = LibraryBrowser.getQueryPagingHtml({ var pagingHtml = libraryBrowser.getQueryPagingHtml({
startIndex: query.StartIndex, startIndex: query.StartIndex,
limit: query.Limit, limit: query.Limit,
totalRecordCount: result.TotalRecordCount, totalRecordCount: result.TotalRecordCount,
showLimit: false, showLimit: false,
addLayoutButton: true, addLayoutButton: true,
currentLayout: view, currentLayout: viewStyle,
sortButton: true, sortButton: true,
layouts: 'Poster,PosterCard,Thumb', layouts: 'Poster,PosterCard,Thumb',
filterButton: true filterButton: true
}); });
page.querySelector('.listTopPaging').innerHTML = pagingHtml; view.querySelector('.listTopPaging').innerHTML = pagingHtml;
updateFilterControls(page); updateFilterControls();
var context = getParam(page, 'context'); var context = params.context;
var posterOptions = { var posterOptions = {
items: result.Items, items: result.Items,
@ -107,64 +96,64 @@
coverImage: item.Type == 'PhotoAlbum' coverImage: item.Type == 'PhotoAlbum'
}; };
if (view == "Backdrop") { if (viewStyle == "Backdrop") {
posterOptions.shape = 'backdrop'; posterOptions.shape = 'backdrop';
posterOptions.showTitle = true; posterOptions.showTitle = true;
posterOptions.preferBackdrop = true; posterOptions.preferBackdrop = true;
html = LibraryBrowser.getPosterViewHtml(posterOptions); html = libraryBrowser.getPosterViewHtml(posterOptions);
} }
else if (view == "Poster") { else if (viewStyle == "Poster") {
posterOptions.showTitle = context == 'photos' ? 'auto' : true; posterOptions.showTitle = context == 'photos' ? 'auto' : true;
posterOptions.overlayText = context == 'photos'; posterOptions.overlayText = context == 'photos';
html = LibraryBrowser.getPosterViewHtml(posterOptions); html = libraryBrowser.getPosterViewHtml(posterOptions);
} }
else if (view == "PosterCard") { else if (viewStyle == "PosterCard") {
posterOptions.showTitle = true; posterOptions.showTitle = true;
posterOptions.showYear = true; posterOptions.showYear = true;
posterOptions.cardLayout = true; posterOptions.cardLayout = true;
posterOptions.centerText = false; posterOptions.centerText = false;
html = LibraryBrowser.getPosterViewHtml(posterOptions); html = libraryBrowser.getPosterViewHtml(posterOptions);
} }
else if (view == "Thumb") { else if (viewStyle == "Thumb") {
posterOptions.preferThumb = true; posterOptions.preferThumb = true;
posterOptions.shape = "backdrop"; posterOptions.shape = "backdrop";
html = LibraryBrowser.getPosterViewHtml(posterOptions); html = libraryBrowser.getPosterViewHtml(posterOptions);
} }
var elem = page.querySelector('#items'); var elem = view.querySelector('#items');
elem.innerHTML = html + pagingHtml; elem.innerHTML = html + pagingHtml;
ImageLoader.lazyChildren(elem); ImageLoader.lazyChildren(elem);
$('.btnFilter', page).on('click', function () { $('.btnFilter', view).on('click', function () {
showFilterMenu(page); showFilterMenu();
}); });
$('.btnNextPage', page).on('click', function () { $('.btnNextPage', view).on('click', function () {
query.StartIndex += query.Limit; query.StartIndex += query.Limit;
reloadItems(page); reloadItems(view);
}); });
$('.btnPreviousPage', page).on('click', function () { $('.btnPreviousPage', view).on('click', function () {
query.StartIndex -= query.Limit; query.StartIndex -= query.Limit;
reloadItems(page); reloadItems(view);
}); });
$('.btnChangeLayout', page).on('layoutchange', function (e, layout) { $('.btnChangeLayout', view).on('layoutchange', function (e, layout) {
getPageData(page).view = layout; getPageData(view).view = layout;
LibraryBrowser.saveViewSetting(getSavedQueryKey(page), layout); libraryBrowser.saveViewSetting(getSavedQueryKey(), layout);
reloadItems(page); reloadItems(view);
}); });
// On callback make sure to set StartIndex = 0 // On callback make sure to set StartIndex = 0
$('.btnSort', page).on('click', function () { $('.btnSort', view).on('click', function () {
LibraryBrowser.showSortMenu({ libraryBrowser.showSortMenu({
items: [{ items: [{
name: Globalize.translate('OptionNameSort'), name: Globalize.translate('OptionNameSort'),
id: 'SortName' id: 'SortName'
@ -202,13 +191,13 @@
id: 'Runtime,SortName' id: 'Runtime,SortName'
}], }],
callback: function () { callback: function () {
reloadItems(page); reloadItems(view);
}, },
query: query query: query
}); });
}); });
LibraryBrowser.saveQueryValues(getParam(page, 'parentId'), query); libraryBrowser.saveQueryValues(params.parentId, query);
var name = item.Name; var name = item.Name;
@ -221,93 +210,76 @@
LibraryMenu.setTitle(name); LibraryMenu.setTitle(name);
page.dispatchEvent(new CustomEvent("displayingitem", { view.dispatchEvent(new CustomEvent("displayingitem", {
detail: { detail: {
item: item item: item
}, },
bubbles: true bubbles: true
})); }));
LibraryBrowser.setLastRefreshed(page); libraryBrowser.setLastRefreshed(view);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
}); });
} }
function showFilterMenu(page) { function showFilterMenu() {
require(['components/filterdialog/filterdialog'], function (filterDialogFactory) { require(['components/filterdialog/filterdialog'], function (filterDialogFactory) {
var filterDialog = new filterDialogFactory({ var filterDialog = new filterDialogFactory({
query: getQuery(page) query: getQuery()
}); });
Events.on(filterDialog, 'filterchange', function () { Events.on(filterDialog, 'filterchange', function () {
reloadItems(page); reloadItems();
}); });
filterDialog.show(); filterDialog.show();
}); });
} }
function updateFilterControls(page) { function updateFilterControls() {
var query = getQuery(page); var query = getQuery();
$('.alphabetPicker', page).alphaValue(query.NameStartsWithOrGreater); $('.alphabetPicker', view).alphaValue(query.NameStartsWithOrGreater);
} }
function onListItemClick(e) { function onListItemClick(e) {
var page = $(this).parents('.page')[0]; var query = getQuery();
var query = getQuery(page); var info = libraryBrowser.getListItemInfo(this);
var info = LibraryBrowser.getListItemInfo(this);
if (info.mediaType == 'Photo') { if (info.mediaType == 'Photo') {
require(['scripts/photos'], function () { require(['scripts/photos'], function () {
Photos.startSlideshow(page, query, info.id); Photos.startSlideshow(view, query, info.id);
}); });
return false; return false;
} }
} }
pageIdOn('pageinit', "itemListPage", function () {
var page = this;
$('.alphabetPicker', this).on('alphaselect', function (e, character) { $('.alphabetPicker', this).on('alphaselect', function (e, character) {
var query = getQuery(page); var query = getQuery();
query.NameStartsWithOrGreater = character; query.NameStartsWithOrGreater = character;
query.StartIndex = 0; query.StartIndex = 0;
reloadItems(page); reloadItems(view);
}).on('alphaclear', function (e) { }).on('alphaclear', function (e) {
var query = getQuery(page); var query = getQuery();
query.NameStartsWithOrGreater = ''; query.NameStartsWithOrGreater = '';
reloadItems(page); reloadItems(view);
}); });
$(page).on('click', '.mediaItem', onListItemClick); $(view).on('click', '.mediaItem', onListItemClick);
view.addEventListener('viewbeforeshow', function (e) {
reloadItems(view);
updateFilterControls();
LibraryMenu.setBackButtonVisible(params.context);
}); });
};
pageIdOn('pagebeforeshow', "itemListPage", function () {
var page = this;
reloadItems(page);
updateFilterControls(page);
LibraryMenu.setBackButtonVisible(getParam(page, 'context'));
}); });
pageIdOn('pagebeforehide', "itemListPage", function () {
currentItem = null;
});
})(jQuery, document);

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

@ -1157,7 +1157,7 @@
} }
} }
if (item.Type == 'CollectionFolder') { if (item.Type == 'CollectionFolder') {
return 'itemlist.html?topParentId=' + item.Id + '&parentid=' + item.Id; return 'itemlist.html?topParentId=' + item.Id + '&parentId=' + item.Id;
} }
if (item.Type == "PhotoAlbum") { if (item.Type == "PhotoAlbum") {

58
dashboard-ui/scripts/livetvtunerprovider-satip.js
View file

@ -18,34 +18,6 @@
} }
} }
function submitForm(page) {
Dashboard.showLoadingMsg();
var id = getParameterByName('id');
if (id) {
ApiClient.getNamedConfiguration("livetv").then(function (config) {
var info = config.TunerHosts.filter(function (i) {
return i.Id == id;
})[0];
fillInfoFromPage(page, info);
submitTunerInfo(page, info);
});
} else {
var info = {
Type: 'satip'
};
fillInfoFromPage(page, info);
submitTunerInfo(page, info);
}
}
function fillInfoFromPage(page, info) { function fillInfoFromPage(page, info) {
info.Url = page.querySelector('.txtDevicePath').value; info.Url = page.querySelector('.txtDevicePath').value;
info.M3UUrl = page.querySelector('.txtM3uUrl').value; info.M3UUrl = page.querySelector('.txtM3uUrl').value;
@ -91,6 +63,34 @@
return function (view, params) { return function (view, params) {
function submitForm() {
Dashboard.showLoadingMsg();
var id = params.id;
if (id) {
ApiClient.getNamedConfiguration("livetv").then(function (config) {
var info = config.TunerHosts.filter(function (i) {
return i.Id == id;
})[0];
fillInfoFromPage(view, info);
submitTunerInfo(view, info);
});
} else {
var info = {
Type: 'satip'
};
fillInfoFromPage(view, info);
submitTunerInfo(view, info);
}
}
function onSelectDiseqCChange(e) { function onSelectDiseqCChange(e) {
var select = e.target; var select = e.target;
@ -113,7 +113,7 @@
} }
view.querySelector('form').addEventListener('submit', function (e) { view.querySelector('form').addEventListener('submit', function (e) {
submitForm(view); submitForm();
e.preventDefault(); e.preventDefault();
return false; return false;
}); });

72
dashboard-ui/scripts/secondaryitems.js
View file

@ -1,4 +1,6 @@
(function ($, document) { define(['libraryBrowser', 'jQuery'], function (libraryBrowser, $) {
return function (view, params) {
var data = {}; var data = {};
@ -36,16 +38,16 @@
query: { query: {
SortBy: "SortName", SortBy: "SortName",
SortOrder: "Ascending", SortOrder: "Ascending",
Recursive: getParameterByName('recursive') !== 'false', Recursive: params.recursive !== 'false',
Fields: "PrimaryImageAspectRatio,SortName,SyncInfo", Fields: "PrimaryImageAspectRatio,SortName,SyncInfo",
ImageTypeLimit: 1, ImageTypeLimit: 1,
EnableImageTypes: "Primary,Backdrop,Banner,Thumb", EnableImageTypes: "Primary,Backdrop,Banner,Thumb",
StartIndex: 0, StartIndex: 0,
Limit: LibraryBrowser.getDefaultPageSize() Limit: libraryBrowser.getDefaultPageSize()
} }
}; };
var type = getParameterByName('type'); var type = params.type;
if (type) { if (type) {
pageData.query.IncludeItemTypes = type; pageData.query.IncludeItemTypes = type;
@ -54,7 +56,7 @@
} }
} }
var filters = getParameterByName('filters'); var filters = params.filters;
if (type) { if (type) {
pageData.query.Filters = filters; pageData.query.Filters = filters;
} }
@ -63,32 +65,31 @@
addCurrentItemToQuery(pageData.query, parentItem); addCurrentItemToQuery(pageData.query, parentItem);
} }
LibraryBrowser.loadSavedQueryValues(key, pageData.query); libraryBrowser.loadSavedQueryValues(key, pageData.query);
} }
return pageData.query; return pageData.query;
} }
function getSavedQueryKey() { function getSavedQueryKey() {
return LibraryBrowser.getSavedQueryKey(); return libraryBrowser.getSavedQueryKey();
} }
function onListItemClick(e) { function onListItemClick(e) {
var page = $(this).parents('.page')[0]; var info = libraryBrowser.getListItemInfo(this);
var info = LibraryBrowser.getListItemInfo(this);
if (info.mediaType == 'Photo') { if (info.mediaType == 'Photo') {
var query = getQuery(); var query = getQuery();
require(['scripts/photos'], function () { require(['scripts/photos'], function () {
Photos.startSlideshow(page, query, info.id); Photos.startSlideshow(view, query, info.id);
}); });
return false; return false;
} }
} }
function reloadItems(page, parentItem) { function reloadItems(parentItem) {
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
@ -100,18 +101,18 @@
window.scrollTo(0, 0); window.scrollTo(0, 0);
var html = ''; var html = '';
var pagingHtml = LibraryBrowser.getQueryPagingHtml({ var pagingHtml = libraryBrowser.getQueryPagingHtml({
startIndex: query.StartIndex, startIndex: query.StartIndex,
limit: query.Limit, limit: query.Limit,
totalRecordCount: result.TotalRecordCount, totalRecordCount: result.TotalRecordCount,
showLimit: false showLimit: false
}); });
page.querySelector('.listTopPaging').innerHTML = pagingHtml; view.querySelector('.listTopPaging').innerHTML = pagingHtml;
if (query.IncludeItemTypes == "Audio") { if (query.IncludeItemTypes == "Audio") {
html = '<div style="max-width:1000px;margin:auto;">' + LibraryBrowser.getListViewHtml({ html = '<div style="max-width:1000px;margin:auto;">' + libraryBrowser.getListViewHtml({
items: result.Items, items: result.Items,
playFromHere: true, playFromHere: true,
defaultAction: 'playallfromhere', defaultAction: 'playallfromhere',
@ -143,53 +144,46 @@
} }
// Poster // Poster
html = LibraryBrowser.getPosterViewHtml(posterOptions); html = libraryBrowser.getPosterViewHtml(posterOptions);
} }
var elem = page.querySelector('#items'); var elem = view.querySelector('#items');
elem.innerHTML = html + pagingHtml; elem.innerHTML = html + pagingHtml;
ImageLoader.lazyChildren(elem); ImageLoader.lazyChildren(elem);
$('.btnNextPage', page).on('click', function () { $('.btnNextPage', view).on('click', function () {
query.StartIndex += query.Limit; query.StartIndex += query.Limit;
reloadItems(page, parentItem); reloadItems(parentItem);
}); });
$('.btnPreviousPage', page).on('click', function () { $('.btnPreviousPage', view).on('click', function () {
query.StartIndex -= query.Limit; query.StartIndex -= query.Limit;
reloadItems(page, parentItem); reloadItems(parentItem);
}); });
LibraryBrowser.setLastRefreshed(page); libraryBrowser.setLastRefreshed(view);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
}); });
} }
pageIdOn('pageinit', "secondaryItemsPage", function () { $(view).on('click', '.mediaItem', onListItemClick);
var page = this; view.addEventListener('viewbeforeshow', function (e) {
if (params.parentId) {
$(page).on('click', '.mediaItem', onListItemClick); ApiClient.getItem(Dashboard.getCurrentUserId(), params.parentId).then(function (parent) {
});
pageIdOn('pagebeforeshow', "secondaryItemsPage", function () {
var page = this;
if (getParameterByName('parentid')) {
ApiClient.getItem(Dashboard.getCurrentUserId(), getParameterByName('parentid')).then(function (parent) {
LibraryMenu.setTitle(parent.Name); LibraryMenu.setTitle(parent.Name);
if (LibraryBrowser.needsRefresh(page)) { if (libraryBrowser.needsRefresh(view)) {
reloadItems(page, parent); reloadItems(parent);
} }
}); });
} }
else if (LibraryBrowser.needsRefresh(page)) { else if (libraryBrowser.needsRefresh(view)) {
reloadItems(page); reloadItems();
} }
}); });
};
})(jQuery, document);
});

10
dashboard-ui/scripts/site.js
View file

@ -2447,8 +2447,9 @@ var AppInfo = {};
defineRoute({ defineRoute({
path: '/itemlist.html', path: '/itemlist.html',
dependencies: ['jQuery'], dependencies: ['paper-checkbox', 'scripts/alphapicker'],
autoFocus: false autoFocus: false,
controller: 'scripts/itemlistpage'
}); });
defineRoute({ defineRoute({
@ -2746,8 +2747,9 @@ var AppInfo = {};
defineRoute({ defineRoute({
path: '/secondaryitems.html', path: '/secondaryitems.html',
dependencies: ['jQuery'], dependencies: [],
autoFocus: false autoFocus: false,
controller: 'scripts/secondaryitems'
}); });
defineRoute({ defineRoute({

45
dashboard-ui/scripts/tvgenres.js
View file

@ -1,4 +1,8 @@
(function ($, document) { define([], function () {
return function (view, params, tabContent) {
var self = this;
var data = {}; var data = {};
function getPageData() { function getPageData() {
@ -19,7 +23,7 @@
view: LibraryBrowser.getSavedView(key) || LibraryBrowser.getDefaultItemsView('Thumb', 'Thumb') view: LibraryBrowser.getSavedView(key) || LibraryBrowser.getDefaultItemsView('Thumb', 'Thumb')
}; };
pageData.query.ParentId = LibraryMenu.getTopParentId(); pageData.query.ParentId = params.topParentId;
LibraryBrowser.loadSavedQueryValues(key, pageData.query); LibraryBrowser.loadSavedQueryValues(key, pageData.query);
} }
return pageData; return pageData;
@ -35,7 +39,7 @@
return LibraryBrowser.getSavedQueryKey('genres'); return LibraryBrowser.getSavedQueryKey('genres');
} }
function reloadItems(page) { function reloadItems(context) {
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
var query = getQuery(); var query = getQuery();
@ -47,9 +51,9 @@
var html = ''; var html = '';
var view = getPageData().view; var viewStyle = getPageData().view;
$('.listTopPaging', page).html(LibraryBrowser.getQueryPagingHtml({ $('.listTopPaging', context).html(LibraryBrowser.getQueryPagingHtml({
startIndex: query.StartIndex, startIndex: query.StartIndex,
limit: query.Limit, limit: query.Limit,
totalRecordCount: result.TotalRecordCount, totalRecordCount: result.TotalRecordCount,
@ -57,10 +61,10 @@
showLimit: false, showLimit: false,
updatePageSizeSetting: false, updatePageSizeSetting: false,
addLayoutButton: true, addLayoutButton: true,
currentLayout: view currentLayout: viewStyle
})); }));
if (view == "Thumb") { if (viewStyle == "Thumb") {
html = LibraryBrowser.getPosterViewHtml({ html = LibraryBrowser.getPosterViewHtml({
items: result.Items, items: result.Items,
shape: "backdrop", shape: "backdrop",
@ -72,7 +76,7 @@
overlayPlayButton: true overlayPlayButton: true
}); });
} }
else if (view == "ThumbCard") { else if (viewStyle == "ThumbCard") {
html = LibraryBrowser.getPosterViewHtml({ html = LibraryBrowser.getPosterViewHtml({
items: result.Items, items: result.Items,
@ -85,7 +89,7 @@
lazy: true lazy: true
}); });
} }
else if (view == "PosterCard") { else if (viewStyle == "PosterCard") {
html = LibraryBrowser.getPosterViewHtml({ html = LibraryBrowser.getPosterViewHtml({
items: result.Items, items: result.Items,
shape: "portrait", shape: "portrait",
@ -96,7 +100,7 @@
showTitle: true showTitle: true
}); });
} }
else if (view == "Poster") { else if (viewStyle == "Poster") {
html = LibraryBrowser.getPosterViewHtml({ html = LibraryBrowser.getPosterViewHtml({
items: result.Items, items: result.Items,
shape: "portrait", shape: "portrait",
@ -108,24 +112,24 @@
}); });
} }
var elem = page.querySelector('#items'); var elem = context.querySelector('#items');
elem.innerHTML = html; elem.innerHTML = html;
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) {
getPageData().view = layout; getPageData().view = layout;
LibraryBrowser.saveViewSetting(getSavedQueryKey(), layout); LibraryBrowser.saveViewSetting(getSavedQueryKey(), layout);
reloadItems(page); reloadItems(context);
}); });
LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); LibraryBrowser.saveQueryValues(getSavedQueryKey(), query);
@ -133,12 +137,11 @@
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
}); });
} }
self.renderTab = function () {
window.TvPage.renderGenresTab = function (page, tabContent) {
if (LibraryBrowser.needsRefresh(tabContent)) { if (LibraryBrowser.needsRefresh(tabContent)) {
reloadItems(tabContent); reloadItems(tabContent);
} }
}; };
};
})(jQuery, document); });

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

@ -1,17 +1,17 @@
(function ($, document) { define([], function () {
function getView() { function getView() {
return 'Thumb'; return 'Thumb';
} }
function loadLatest(page) { function loadLatest(context, params) {
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
var userId = Dashboard.getCurrentUserId(); var userId = Dashboard.getCurrentUserId();
var parentId = LibraryMenu.getTopParentId(); var parentId = params.topParentId;
var limit = 30; var limit = 30;
@ -68,20 +68,23 @@
}); });
} }
var elem = page.querySelector('#latestEpisodes'); var elem = context.querySelector('#latestEpisodes');
elem.innerHTML = html; elem.innerHTML = html;
ImageLoader.lazyChildren(elem); ImageLoader.lazyChildren(elem);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
LibraryBrowser.setLastRefreshed(page); LibraryBrowser.setLastRefreshed(context);
}); });
} }
return function (view, params, tabContent) {
window.TvPage.renderLatestTab = function (page, tabContent) { var self = this;
self.renderTab = function() {
if (LibraryBrowser.needsRefresh(tabContent)) { if (LibraryBrowser.needsRefresh(tabContent)) {
loadLatest(tabContent); loadLatest(tabContent, params);
} }
}; };
};
})(jQuery, document); });

103
dashboard-ui/scripts/tvrecommended.js
View file

@ -1,5 +1,9 @@
define(['libraryBrowser', 'scripts/alphapicker'], function (libraryBrowser) { define(['libraryBrowser', 'scripts/alphapicker'], function (libraryBrowser) {
return function (view, params) {
var self = this;
function getView() { function getView() {
return 'Thumb'; return 'Thumb';
@ -10,15 +14,15 @@
return 'Poster'; return 'Poster';
} }
function reload(page) { function reload() {
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
loadResume(page); loadResume();
loadNextUp(page); loadNextUp();
} }
function loadNextUp(page) { function loadNextUp() {
var limit = AppInfo.hasLowImageBandwidth ? var limit = AppInfo.hasLowImageBandwidth ?
16 : 16 :
@ -38,15 +42,15 @@
ApiClient.getNextUpEpisodes(query).then(function (result) { ApiClient.getNextUpEpisodes(query).then(function (result) {
if (result.Items.length) { if (result.Items.length) {
page.querySelector('.noNextUpItems').classList.add('hide'); view.querySelector('.noNextUpItems').classList.add('hide');
} else { } else {
page.querySelector('.noNextUpItems').classList.remove('hide'); view.querySelector('.noNextUpItems').classList.remove('hide');
} }
var view = getView(); var viewStyle = getView();
var html = ''; var html = '';
if (view == 'ThumbCard') { if (viewStyle == 'ThumbCard') {
html += libraryBrowser.getPosterViewHtml({ html += libraryBrowser.getPosterViewHtml({
items: result.Items, items: result.Items,
@ -59,7 +63,7 @@
showDetailsMenu: true showDetailsMenu: true
}); });
} else if (view == 'Thumb') { } else if (viewStyle == 'Thumb') {
html += libraryBrowser.getPosterViewHtml({ html += libraryBrowser.getPosterViewHtml({
items: result.Items, items: result.Items,
@ -75,12 +79,12 @@
}); });
} }
var elem = page.querySelector('#nextUpItems'); var elem = view.querySelector('#nextUpItems');
elem.innerHTML = html; elem.innerHTML = html;
ImageLoader.lazyChildren(elem); ImageLoader.lazyChildren(elem);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
libraryBrowser.setLastRefreshed(page); libraryBrowser.setLastRefreshed(view);
}); });
} }
@ -92,7 +96,7 @@
return enableScrollX() ? 'overflowBackdrop' : 'backdrop'; return enableScrollX() ? 'overflowBackdrop' : 'backdrop';
} }
function loadResume(page) { function loadResume() {
var parentId = LibraryMenu.getTopParentId(); var parentId = LibraryMenu.getTopParentId();
@ -116,15 +120,15 @@
ApiClient.getItems(Dashboard.getCurrentUserId(), options).then(function (result) { ApiClient.getItems(Dashboard.getCurrentUserId(), options).then(function (result) {
if (result.Items.length) { if (result.Items.length) {
page.querySelector('#resumableSection').classList.remove('hide'); view.querySelector('#resumableSection').classList.remove('hide');
} else { } else {
page.querySelector('#resumableSection').classList.add('hide'); view.querySelector('#resumableSection').classList.add('hide');
} }
var view = getResumeView(); var viewStyle = getResumeView();
var html = ''; var html = '';
if (view == 'PosterCard') { if (viewStyle == 'PosterCard') {
html += libraryBrowser.getPosterViewHtml({ html += libraryBrowser.getPosterViewHtml({
items: result.Items, items: result.Items,
@ -137,7 +141,7 @@
preferThumb: true preferThumb: true
}); });
} else if (view == 'Poster') { } else if (viewStyle == 'Poster') {
html += libraryBrowser.getPosterViewHtml({ html += libraryBrowser.getPosterViewHtml({
items: result.Items, items: result.Items,
@ -152,107 +156,91 @@
}); });
} }
var elem = page.querySelector('#resumableItems'); var elem = view.querySelector('#resumableItems');
elem.innerHTML = html; elem.innerHTML = html;
ImageLoader.lazyChildren(elem); ImageLoader.lazyChildren(elem);
}); });
} }
function initSuggestedTab(page, tabContent) { self.initTab = function () {
var tabContent = self.tabContent;
if (enableScrollX()) { if (enableScrollX()) {
tabContent.querySelector('#resumableItems').classList.add('hiddenScrollX'); tabContent.querySelector('#resumableItems').classList.add('hiddenScrollX');
} else { } else {
tabContent.querySelector('#resumableItems').classList.remove('hiddenScrollX'); tabContent.querySelector('#resumableItems').classList.remove('hiddenScrollX');
} }
libraryBrowser.createCardMenus(tabContent.querySelector('#resumableItems')); libraryBrowser.createCardMenus(tabContent.querySelector('#resumableItems'));
} };
function loadSuggestionsTab(page, tabContent) {
self.renderTab = function () {
var tabContent = self.tabContent;
if (libraryBrowser.needsRefresh(tabContent)) { if (libraryBrowser.needsRefresh(tabContent)) {
reload(tabContent); reload();
}
} }
};
function loadTab(page, index) { function loadTab(page, index) {
var tabContent = page.querySelector('.pageTabContent[data-index=\'' + index + '\']'); var tabContent = page.querySelector('.pageTabContent[data-index=\'' + index + '\']');
var depends = []; var depends = [];
var scope = 'TvPage';
var renderMethod = '';
var initMethod = '';
switch (index) { switch (index) {
case 0: case 0:
initMethod = 'initSuggestedTab';
renderMethod = 'renderSuggestedTab';
break; break;
case 1: case 1:
depends.push('scripts/tvlatest'); depends.push('scripts/tvlatest');
renderMethod = 'renderLatestTab';
break; break;
case 2: case 2:
depends.push('scripts/tvupcoming'); depends.push('scripts/tvupcoming');
renderMethod = 'renderUpcomingTab';
break; break;
case 3: case 3:
depends.push('scripts/tvshows'); depends.push('scripts/tvshows');
renderMethod = 'renderSeriesTab';
initMethod = 'initSeriesTab';
break; break;
case 4: case 4:
depends.push('scripts/episodes'); depends.push('scripts/episodes');
renderMethod = 'renderEpisodesTab';
initMethod = 'initEpisodesTab';
break; break;
case 5: case 5:
depends.push('scripts/tvgenres'); depends.push('scripts/tvgenres');
renderMethod = 'renderGenresTab';
break; break;
case 6: case 6:
depends.push('scripts/tvstudios'); depends.push('scripts/tvstudios');
renderMethod = 'renderStudiosTab';
break; break;
default: default:
break; break;
} }
require(depends, function () { require(depends, function (controllerFactory) {
if (initMethod && !tabContent.initComplete) { if (index == 0) {
self.tabContent = tabContent;
}
var controller = index ? new controllerFactory(view, params, tabContent) : self;
window[scope][initMethod](page, tabContent); if (controller.initTab) {
controller.initTab();
tabContent.initComplete = true; tabContent.initComplete = true;
} }
window[scope][renderMethod](page, tabContent); controller.renderTab();
}); });
} }
window.TvPage = window.TvPage || {};
window.TvPage.renderSuggestedTab = loadSuggestionsTab;
window.TvPage.initSuggestedTab = initSuggestedTab;
function onPlaybackStop(e, state) { function onPlaybackStop(e, state) {
if (state.NowPlayingItem && state.NowPlayingItem.MediaType == 'Video') { if (state.NowPlayingItem && state.NowPlayingItem.MediaType == 'Video') {
var page = $.mobile.activePage; var pages = view.querySelector('neon-animated-pages');
var pages = page.querySelector('neon-animated-pages');
pages.dispatchEvent(new CustomEvent("tabchange", {})); pages.dispatchEvent(new CustomEvent("tabchange", {}));
} }
} }
return function (view, params) {
var tabs = view.querySelector('paper-tabs');
var pages = view.querySelector('neon-animated-pages'); var pages = view.querySelector('neon-animated-pages');
var baseUrl = 'tv.html'; var baseUrl = 'tv.html';
var topParentId = LibraryMenu.getTopParentId(); var topParentId = params.topParentId;
if (topParentId) { if (topParentId) {
baseUrl += '?topParentId=' + topParentId; baseUrl += '?topParentId=' + topParentId;
} }
@ -264,7 +252,7 @@
} }
libraryBrowser.createCardMenus(view.querySelector('#resumableItems')); libraryBrowser.createCardMenus(view.querySelector('#resumableItems'));
libraryBrowser.configurePaperLibraryTabs(view, tabs, pages, baseUrl); libraryBrowser.configurePaperLibraryTabs(view, view.querySelector('paper-tabs'), pages, baseUrl);
pages.addEventListener('tabchange', function (e) { pages.addEventListener('tabchange', function (e) {
loadTab(view, parseInt(this.selected)); loadTab(view, parseInt(this.selected));
@ -272,23 +260,21 @@
view.addEventListener('viewbeforeshow', function (e) { view.addEventListener('viewbeforeshow', function (e) {
var page = this; if (!view.getAttribute('data-title')) {
if (!page.getAttribute('data-title')) { var parentId = params.topParentId;
var parentId = LibraryMenu.getTopParentId();
if (parentId) { if (parentId) {
ApiClient.getItem(Dashboard.getCurrentUserId(), parentId).then(function (item) { ApiClient.getItem(Dashboard.getCurrentUserId(), parentId).then(function (item) {
page.setAttribute('data-title', item.Name); view.setAttribute('data-title', item.Name);
LibraryMenu.setTitle(item.Name); LibraryMenu.setTitle(item.Name);
}); });
} else { } else {
page.setAttribute('data-title', Globalize.translate('TabShows')); view.setAttribute('data-title', Globalize.translate('TabShows'));
LibraryMenu.setTitle(Globalize.translate('TabShows')); LibraryMenu.setTitle(Globalize.translate('TabShows'));
} }
} }
@ -298,7 +284,6 @@
view.addEventListener('viewbeforehide', function (e) { view.addEventListener('viewbeforehide', function (e) {
var page = this;
Events.off(MediaController, 'playbackstop', onPlaybackStop); Events.off(MediaController, 'playbackstop', onPlaybackStop);
}); });
}; };

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

@ -1,4 +1,8 @@
(function ($, document) { define([], function () {
return function (view, params, tabContent) {
var self = this;
var data = {}; var data = {};
@ -22,7 +26,7 @@
view: LibraryBrowser.getSavedView(key) || LibraryBrowser.getDefaultItemsView('Poster', 'Thumb') view: LibraryBrowser.getSavedView(key) || LibraryBrowser.getDefaultItemsView('Poster', 'Thumb')
}; };
pageData.query.ParentId = LibraryMenu.getTopParentId(); pageData.query.ParentId = params.topParentId;
LibraryBrowser.loadSavedQueryValues(key, pageData.query); LibraryBrowser.loadSavedQueryValues(key, pageData.query);
} }
return pageData; return pageData;
@ -254,17 +258,16 @@
}); });
} }
window.TvPage.initSeriesTab = function (page, tabContent) { self.initTab = function () {
initPage(tabContent); initPage(tabContent);
}; };
self.renderTab = function () {
window.TvPage.renderSeriesTab = function (page, tabContent) {
if (LibraryBrowser.needsRefresh(tabContent)) { if (LibraryBrowser.needsRefresh(tabContent)) {
reloadItems(tabContent); reloadItems(tabContent);
updateFilterControls(tabContent); updateFilterControls(tabContent);
} }
}; };
};
})(jQuery, document); });

35
dashboard-ui/scripts/tvstudios.js
View file

@ -1,9 +1,9 @@
(function ($, document) { define([], function () {
// The base query options // The base query options
var data = {}; var data = {};
function getQuery() { function getQuery(params) {
var key = getSavedQueryKey(); var key = getSavedQueryKey();
var pageData = data[key]; var pageData = data[key];
@ -21,7 +21,7 @@
} }
}; };
pageData.query.ParentId = LibraryMenu.getTopParentId(); pageData.query.ParentId = params.topParentId;
LibraryBrowser.loadSavedQueryValues(key, pageData.query); LibraryBrowser.loadSavedQueryValues(key, pageData.query);
} }
return pageData.query; return pageData.query;
@ -32,9 +32,9 @@
return LibraryBrowser.getSavedQueryKey('studios'); return LibraryBrowser.getSavedQueryKey('studios');
} }
function reloadItems(page) { function reloadItems(context, params) {
var query = getQuery(); var query = getQuery(params);
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
@ -45,7 +45,7 @@
var html = ''; var html = '';
$('.listTopPaging', page).html(LibraryBrowser.getQueryPagingHtml({ $('.listTopPaging', context).html(LibraryBrowser.getQueryPagingHtml({
startIndex: query.StartIndex, startIndex: query.StartIndex,
limit: query.Limit, limit: query.Limit,
totalRecordCount: result.TotalRecordCount, totalRecordCount: result.TotalRecordCount,
@ -64,32 +64,35 @@
}); });
var elem = page.querySelector('#items'); var elem = context.querySelector('#items');
elem.innerHTML = html; elem.innerHTML = html;
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, params);
}); });
$('.btnPreviousPage', page).on('click', function () { $('.btnPreviousPage', context).on('click', function () {
query.StartIndex -= query.Limit; query.StartIndex -= query.Limit;
reloadItems(page); reloadItems(context, params);
}); });
LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); LibraryBrowser.saveQueryValues(getSavedQueryKey(), query);
LibraryBrowser.setLastRefreshed(page); LibraryBrowser.setLastRefreshed(context);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
}); });
} }
return function (view, params, tabContent) {
window.TvPage.renderStudiosTab = function (page, tabContent) { var self = this;
self.renderTab = function () {
if (LibraryBrowser.needsRefresh(tabContent)) { if (LibraryBrowser.needsRefresh(tabContent)) {
reloadItems(tabContent); reloadItems(tabContent, params);
} }
}; };
};
})(jQuery, document); });

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

@ -1,6 +1,6 @@
(function ($, document) { define([], function () {
function loadUpcoming(page) { function loadUpcoming(context, params) {
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
@ -17,24 +17,24 @@
EnableImageTypes: "Primary,Backdrop,Banner,Thumb" EnableImageTypes: "Primary,Backdrop,Banner,Thumb"
}; };
query.ParentId = LibraryMenu.getTopParentId(); query.ParentId = params.topParentId;
ApiClient.getJSON(ApiClient.getUrl("Shows/Upcoming", query)).then(function (result) { ApiClient.getJSON(ApiClient.getUrl("Shows/Upcoming", query)).then(function (result) {
var items = result.Items; var items = result.Items;
if (items.length) { if (items.length) {
page.querySelector('.noItemsMessage').style.display = 'none'; context.querySelector('.noItemsMessage').style.display = 'none';
} else { } else {
page.querySelector('.noItemsMessage').style.display = 'block'; context.querySelector('.noItemsMessage').style.display = 'block';
} }
var elem = page.querySelector('#upcomingItems'); var elem = context.querySelector('#upcomingItems');
renderUpcoming(elem, items); renderUpcoming(elem, items);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
LibraryBrowser.setLastRefreshed(page); LibraryBrowser.setLastRefreshed(context);
}); });
} }
@ -122,12 +122,15 @@
elem.innerHTML = html; elem.innerHTML = html;
ImageLoader.lazyChildren(elem); ImageLoader.lazyChildren(elem);
} }
return function (view, params, tabContent) {
window.TvPage.renderUpcomingTab = function (page, tabContent) { var self = this;
self.renderTab = function () {
if (LibraryBrowser.needsRefresh(tabContent)) { if (LibraryBrowser.needsRefresh(tabContent)) {
loadUpcoming(tabContent); loadUpcoming(tabContent, params);
} }
}; };
};
})(jQuery, document); });

2
dashboard-ui/secondaryitems.html
View file

@ -1,4 +1,4 @@
<div id="secondaryItemsPage" data-role="page" class="page libraryPage noSecondaryNavPage" data-require="scripts/secondaryitems" data-backbutton="true" data-menubutton="false"> <div id="secondaryItemsPage" data-role="page" class="page libraryPage noSecondaryNavPage" data-backbutton="true" data-menubutton="false">
<div data-role="content"> <div data-role="content">
<div class="viewSettings"> <div class="viewSettings">