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

update live tv tabs

This commit is contained in:
Luke Pulverenti 2016-05-15 13:11:26 -04:00
parent 26dcecb51f
commit 2fd65cdcd9
7 changed files with 513 additions and 502 deletions

View file

@ -1,4 +1,4 @@
<div id="liveTvSuggestedPage" data-dom-cache="true" data-role="page" class="page libraryPage liveTvPage pageWithAbsoluteTabs" data-contextname="${HeaderLiveTv}" data-backdroptype="series,movie" data-require="scripts/livetvsuggested,livetvcss,scripts/livetvcomponents,paper-checkbox"> <div id="liveTvSuggestedPage" data-dom-cache="true" data-role="page" class="page libraryPage liveTvPage pageWithAbsoluteTabs" data-contextname="${HeaderLiveTv}" data-backdroptype="series,movie">
<div class="libraryViewNav"> <div class="libraryViewNav">
<button class="pageTabButton is-active" data-index="0">${TabSuggestions}</button> <button class="pageTabButton is-active" data-index="0">${TabSuggestions}</button>

View file

@ -1,122 +1,126 @@
define(['jQuery'], function ($) { define(['jQuery'], function ($) {
var data = {}; return function (view, params, tabContent) {
function getPageData(context) { var self = this;
var key = getSavedQueryKey(context); var data = {};
var pageData = data[key];
if (!pageData) { function getPageData(context) {
pageData = data[key] = { var key = getSavedQueryKey(context);
query: { var pageData = data[key];
StartIndex: 0,
EnableFavoriteSorting: true,
Limit: LibraryBrowser.getDefaultPageSize()
}
};
LibraryBrowser.loadSavedQueryValues(key, pageData.query); if (!pageData) {
pageData = data[key] = {
query: {
StartIndex: 0,
EnableFavoriteSorting: true,
Limit: LibraryBrowser.getDefaultPageSize()
}
};
LibraryBrowser.loadSavedQueryValues(key, pageData.query);
}
return pageData;
} }
return pageData;
}
function getQuery(context) { function getQuery(context) {
return getPageData(context).query; return getPageData(context).query;
}
function getSavedQueryKey(context) {
if (!context.savedQueryKey) {
context.savedQueryKey = LibraryBrowser.getSavedQueryKey('channels');
} }
return context.savedQueryKey;
}
function getChannelsHtml(channels) { function getSavedQueryKey(context) {
return LibraryBrowser.getPosterViewHtml({ if (!context.savedQueryKey) {
items: channels, context.savedQueryKey = LibraryBrowser.getSavedQueryKey('channels');
shape: "square", }
showTitle: true, return context.savedQueryKey;
lazy: true, }
cardLayout: true,
showDetailsMenu: true
});
}
function renderChannels(page, result) { function getChannelsHtml(channels) {
var query = getQuery(page); return LibraryBrowser.getPosterViewHtml({
items: channels,
shape: "square",
showTitle: true,
lazy: true,
cardLayout: true,
showDetailsMenu: true
});
}
$('.listTopPaging', page).html(LibraryBrowser.getQueryPagingHtml({ function renderChannels(context, result) {
startIndex: query.StartIndex,
limit: query.Limit,
totalRecordCount: result.TotalRecordCount,
showLimit: false,
updatePageSizeSetting: false,
filterButton: true
}));
var html = getChannelsHtml(result.Items); var query = getQuery(context);
var elem = page.querySelector('#items'); $('.listTopPaging', context).html(LibraryBrowser.getQueryPagingHtml({
elem.innerHTML = html; startIndex: query.StartIndex,
ImageLoader.lazyChildren(elem); limit: query.Limit,
totalRecordCount: result.TotalRecordCount,
showLimit: false,
updatePageSizeSetting: false,
filterButton: true
}));
$('.btnNextPage', page).on('click', function () { var html = getChannelsHtml(result.Items);
query.StartIndex += query.Limit;
reloadItems(page);
});
$('.btnPreviousPage', page).on('click', function () { var elem = context.querySelector('#items');
query.StartIndex -= query.Limit; elem.innerHTML = html;
reloadItems(page); ImageLoader.lazyChildren(elem);
});
$('.btnFilter', page).on('click', function () { $('.btnNextPage', context).on('click', function () {
showFilterMenu(page); query.StartIndex += query.Limit;
}); reloadItems(context);
LibraryBrowser.saveQueryValues(getSavedQueryKey(page), query);
}
function showFilterMenu(page) {
require(['components/filterdialog/filterdialog'], function (filterDialogFactory) {
var filterDialog = new filterDialogFactory({
query: getQuery(page),
mode: 'livetvchannels'
}); });
Events.on(filterDialog, 'filterchange', function () { $('.btnPreviousPage', context).on('click', function () {
reloadItems(page); query.StartIndex -= query.Limit;
reloadItems(context);
}); });
filterDialog.show(); $('.btnFilter', context).on('click', function () {
}); showFilterMenu(context);
} });
function reloadItems(page) { LibraryBrowser.saveQueryValues(getSavedQueryKey(context), query);
}
Dashboard.showLoadingMsg(); function showFilterMenu(context) {
var query = getQuery(page); require(['components/filterdialog/filterdialog'], function (filterDialogFactory) {
query.UserId = Dashboard.getCurrentUserId(); var filterDialog = new filterDialogFactory({
query: getQuery(context),
mode: 'livetvchannels'
});
ApiClient.getLiveTvChannels(query).then(function (result) { Events.on(filterDialog, 'filterchange', function () {
reloadItems(context);
});
renderChannels(page, result); filterDialog.show();
});
}
Dashboard.hideLoadingMsg(); function reloadItems(context) {
});
}
window.LiveTvPage.renderChannelsTab = function (page, tabContent) { Dashboard.showLoadingMsg();
reloadItems(tabContent); var query = getQuery(context);
query.UserId = Dashboard.getCurrentUserId();
ApiClient.getLiveTvChannels(query).then(function (result) {
renderChannels(context, result);
Dashboard.hideLoadingMsg();
});
}
self.renderTab = function () {
reloadItems(tabContent);
};
}; };
}); });

View file

@ -1,17 +1,15 @@
define(['tvguide'], function (tvguide) { define(['tvguide'], function (tvguide) {
window.LiveTvPage.initGuideTab = function (page, tabContent) { return function (view, params, tabContent) {
var self = this;
var guideInstance;
self.renderTab = function () {
if (!guideInstance) {
guideInstance = new tvguide({
element: tabContent
});
}
};
}; };
window.LiveTvPage.renderGuideTab = function (page, tabContent) {
if (!page.guideInstance) {
page.guideInstance = new tvguide({
element: tabContent
});
}
};
}); });

View file

@ -1,4 +1,4 @@
define(['jQuery'], function ($) { define(['jQuery', 'scripts/livetvcomponents'], function ($) {
function getRecordingGroupHtml(group) { function getRecordingGroupHtml(group) {
@ -30,12 +30,12 @@
return html; return html;
} }
function renderRecordingGroups(page, groups) { function renderRecordingGroups(context, groups) {
if (groups.length) { if (groups.length) {
$('#recordingGroups', page).show(); $('#recordingGroups', context).show();
} else { } else {
$('#recordingGroups', page).hide(); $('#recordingGroups', context).hide();
} }
var html = ''; var html = '';
@ -49,7 +49,7 @@
html += '</div>'; html += '</div>';
page.querySelector('#recordingGroupItems').innerHTML = html; context.querySelector('#recordingGroupItems').innerHTML = html;
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
} }
@ -78,7 +78,7 @@
ImageLoader.lazyChildren(recordingItems); ImageLoader.lazyChildren(recordingItems);
} }
function renderActiveRecordings(page) { function renderActiveRecordings(context) {
ApiClient.getLiveTvRecordings({ ApiClient.getLiveTvRecordings({
@ -88,12 +88,12 @@
}).then(function (result) { }).then(function (result) {
renderRecordings(page.querySelector('#activeRecordings'), result.Items); renderRecordings(context.querySelector('#activeRecordings'), result.Items);
}); });
} }
function renderLatestRecordings(page) { function renderLatestRecordings(context) {
ApiClient.getLiveTvRecordings({ ApiClient.getLiveTvRecordings({
@ -104,15 +104,15 @@
}).then(function (result) { }).then(function (result) {
renderRecordings(page.querySelector('#latestRecordings'), result.Items); renderRecordings(context.querySelector('#latestRecordings'), result.Items);
}); });
} }
function renderTimers(page, timers) { function renderTimers(context, timers) {
LiveTvHelpers.getTimersHtml(timers).then(function (html) { LiveTvHelpers.getTimersHtml(timers).then(function (html) {
var elem = page.querySelector('#upcomingRecordings'); var elem = context.querySelector('#upcomingRecordings');
if (html) { if (html) {
elem.classList.remove('hide'); elem.classList.remove('hide');
@ -127,21 +127,21 @@
}); });
} }
function renderUpcomingRecordings(page) { function renderUpcomingRecordings(context) {
ApiClient.getLiveTvTimers().then(function (result) { ApiClient.getLiveTvTimers().then(function (result) {
renderTimers(page, result.Items); renderTimers(context, result.Items);
}); });
} }
function reload(page) { function reload(context) {
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
renderUpcomingRecordings(page); renderUpcomingRecordings(context);
renderActiveRecordings(page); renderActiveRecordings(context);
renderLatestRecordings(page); renderLatestRecordings(context);
ApiClient.getLiveTvRecordingGroups({ ApiClient.getLiveTvRecordingGroups({
@ -150,21 +150,21 @@
}).then(function (result) { }).then(function (result) {
require(['paper-fab', 'paper-item-body', 'paper-icon-item'], function () { require(['paper-fab', 'paper-item-body', 'paper-icon-item'], function () {
renderRecordingGroups(page, result.Items); renderRecordingGroups(context, result.Items);
}); });
}); });
} }
window.LiveTvPage.initRecordingsTab = function (page, tabContent) { return function (view, params, tabContent) {
tabContent.querySelector('#upcomingRecordings .recordingItems').addEventListener('timercancelled', function () { var self = this;
tabContent.querySelector('#upcomingRecordings .recordingItems').addEventListener('timercancelled', function () {
reload(tabContent); reload(tabContent);
}); });
};
window.LiveTvPage.renderRecordingsTab = function (page, tabContent) { self.renderTab = function () {
reload(tabContent);
reload(tabContent); };
}; };
}); });

View file

@ -6,7 +6,7 @@
SortOrder: "Ascending" SortOrder: "Ascending"
}; };
function deleteSeriesTimer(page, id) { function deleteSeriesTimer(context, id) {
require(['confirm'], function (confirm) { require(['confirm'], function (confirm) {
@ -20,13 +20,13 @@
toast(Globalize.translate('MessageSeriesCancelled')); toast(Globalize.translate('MessageSeriesCancelled'));
}); });
reload(page); reload(context);
}); });
}); });
}); });
} }
function renderTimers(page, timers) { function renderTimers(context, timers) {
var html = ''; var html = '';
@ -88,32 +88,36 @@
html += '</div>'; html += '</div>';
} }
var elem = $('#items', page).html(html); var elem = $('#items', context).html(html);
$('.btnCancelSeries', elem).on('click', function () { $('.btnCancelSeries', elem).on('click', function () {
deleteSeriesTimer(page, this.getAttribute('data-seriestimerid')); deleteSeriesTimer(context, this.getAttribute('data-seriestimerid'));
}); });
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
} }
function reload(page) { function reload(context) {
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
ApiClient.getLiveTvSeriesTimers(query).then(function (result) { ApiClient.getLiveTvSeriesTimers(query).then(function (result) {
require(['paper-fab', 'paper-item-body', 'paper-icon-item'], function () { require(['paper-fab', 'paper-item-body', 'paper-icon-item'], function () {
renderTimers(page, result.Items); renderTimers(context, result.Items);
}); });
}); });
} }
window.LiveTvPage.renderSeriesTimersTab = function (page, tabContent) { return function (view, params, tabContent) {
reload(tabContent); var self = this;
self.renderTab = function () {
reload(tabContent);
};
}; };
}); });

View file

@ -125,106 +125,110 @@
ImageLoader.lazyChildren(elem); ImageLoader.lazyChildren(elem);
} }
function initSuggestedTab(page, tabContent) { return function (view, params) {
if (enableScrollX()) { var self = this;
$('.itemsContainer', tabContent).addClass('hiddenScrollX').createCardMenus();
} else {
$('.itemsContainer', tabContent).removeClass('hiddenScrollX').createCardMenus();
}
}
function renderSuggestedTab(page, tabContent) { self.initTab = function () {
reload(tabContent); var tabContent = view.querySelector('.pageTabContent[data-index=\'' + 0 + '\']');
} if (enableScrollX()) {
$('.itemsContainer', tabContent).addClass('hiddenScrollX').createCardMenus();
} else {
$('.itemsContainer', tabContent).removeClass('hiddenScrollX').createCardMenus();
}
};
function loadTab(page, index) { self.renderTab = function () {
var tabContent = view.querySelector('.pageTabContent[data-index=\'' + 0 + '\']');
reload(tabContent);
};
var tabContent = page.querySelector('.pageTabContent[data-index=\'' + index + '\']'); var tabControllers = [];
var depends = []; var renderedTabs = [];
var scope = 'LiveTvPage';
var renderMethod = '';
var initMethod = '';
var viewMenuBar = document.querySelector('.viewMenuBar'); function loadTab(page, index) {
switch (index) { var tabContent = page.querySelector('.pageTabContent[data-index=\'' + index + '\']');
var depends = [];
case 0: switch (index) {
renderMethod = 'renderSuggestedTab';
initMethod = 'initSuggestedTab';
break;
case 1:
depends.push('registrationservices');
depends.push('scripts/livetvguide');
renderMethod = 'renderGuideTab';
initMethod = 'initGuideTab';
break;
case 2:
depends.push('scripts/livetvchannels');
depends.push('paper-icon-item');
depends.push('paper-item-body');
renderMethod = 'renderChannelsTab';
break;
case 3:
depends.push('scripts/livetvrecordings');
initMethod = 'initRecordingsTab';
renderMethod = 'renderRecordingsTab';
break;
case 4:
depends.push('scripts/livetvseriestimers');
renderMethod = 'renderSeriesTimersTab';
break;
default:
break;
}
require(depends, function () { case 0:
break;
if (initMethod && !tabContent.initComplete) { case 1:
depends.push('scripts/livetvguide');
window[scope][initMethod](page, tabContent); break;
tabContent.initComplete = true; case 2:
depends.push('scripts/livetvchannels');
depends.push('paper-icon-item');
depends.push('paper-item-body');
break;
case 3:
depends.push('scripts/livetvrecordings');
break;
case 4:
depends.push('scripts/livetvseriestimers');
break;
default:
break;
} }
window[scope][renderMethod](page, tabContent); require(depends, function (controllerFactory) {
}); if (index == 0) {
} self.tabContent = tabContent;
}
var controller = tabControllers[index];
if (!controller) {
controller = index ? new controllerFactory(view, params, tabContent) : self;
tabControllers[index] = controller;
pageIdOn('pageinit', "liveTvSuggestedPage", function () { if (controller.initTab) {
controller.initTab();
}
}
var page = this; if (renderedTabs.indexOf(index) == -1) {
renderedTabs.push(index);
controller.renderTab();
}
});
}
var mdlTabs = page.querySelector('.libraryViewNav'); var mdlTabs = view.querySelector('.libraryViewNav');
libraryBrowser.configurePaperLibraryTabs(page, mdlTabs, page.querySelectorAll('.pageTabContent')); var baseUrl = 'tv.html';
var topParentId = params.topParentId;
if (topParentId) {
baseUrl += '?topParentId=' + topParentId;
}
libraryBrowser.configurePaperLibraryTabs(view, mdlTabs, view.querySelectorAll('.pageTabContent'));
mdlTabs.addEventListener('tabchange', function (e) { mdlTabs.addEventListener('tabchange', function (e) {
loadTab(page, parseInt(e.detail.selectedTabIndex)); loadTab(view, parseInt(e.detail.selectedTabIndex));
}); });
});
pageIdOn('viewshow', "liveTvSuggestedPage", function () { view.addEventListener('viewshow', function (e) {
var page = this; // Needed on the guide tab
// Ideally this should be moved to the guide tab on show/hide
document.body.classList.add('autoScrollY');
});
// Needed on the guide tab view.addEventListener('viewbeforehide', function (e) {
// Ideally this should be moved to the guide tab on show/hide
document.body.classList.add('autoScrollY');
});
pageIdOn('viewbeforehide', "liveTvSuggestedPage", function () { document.body.classList.remove('autoScrollY');
});
var page = this; view.addEventListener('viewdestroy', function (e) {
document.body.classList.remove('autoScrollY'); tabControllers.forEach(function (t) {
}); if (t.destroy) {
t.destroy();
window.LiveTvPage = { }
renderSuggestedTab: renderSuggestedTab, });
initSuggestedTab: initSuggestedTab });
}; };
}); });

View file

@ -2613,7 +2613,8 @@ var AppInfo = {};
defineRoute({ defineRoute({
path: '/livetv.html', path: '/livetv.html',
dependencies: ['paper-button'], dependencies: ['paper-button', 'livetvcss', 'paper-checkbox'],
controller: 'scripts/livetvsuggested',
autoFocus: false autoFocus: false
}); });