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 recording layout

Browse source
This commit is contained in:
Luke Pulverenti 2016-09-05 01:39:14 -04:00
parent 80948f62fa
commit 25dbf665dd
24 changed files with 341 additions and 256 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -843,6 +843,7 @@
self.tryPair = function (target) {
castPlayer.launchApp();
return new Promise(function (resolve, reject) {
if (castPlayer.deviceState != DEVICE_STATE.ACTIVE && castPlayer.isInitialized) {
@ -866,6 +867,7 @@
castPlayer = new CastPlayer();
var registeredPlayer = new chromecastPlayer();
window.CCastPlayer = registeredPlayer;
MediaController.registerPlayer(registeredPlayer);
// To allow the native android app to override

7
dashboard-ui/scripts/dashboardpage.js
View file

@ -115,7 +115,12 @@
page.querySelector('.serverNameHeader').innerHTML = systemInfo.ServerName;
$('#appVersionNumber', page).html(Globalize.translate('LabelVersionNumber').replace('{0}', systemInfo.Version));
var localizedVersion = Globalize.translate('LabelVersionNumber', systemInfo.Version);
if (systemInfo.SystemUpdateLevel && systemInfo.SystemUpdateLevel != 'Release') {
localizedVersion += " " + Globalize.translate('Option' + systemInfo.SystemUpdateLevel).toLowerCase();
}
$('#appVersionNumber', page).html(localizedVersion);
if (systemInfo.SupportsHttps) {
$('#ports', page).html(Globalize.translate('LabelRunningOnPorts', '<b>' + systemInfo.HttpServerPortNumber + '</b>', '<b>' + systemInfo.HttpsPortNumber + '</b>'));

219
dashboard-ui/scripts/livetvitems.js
View file

@ -1,108 +1,133 @@
define(['cardBuilder', 'emby-itemscontainer'], function (cardBuilder) {
var currentDate = new Date();
currentDate.setHours(0, 0, 0, 0);
return function (view, params) {
// The base query options
var query = {
UserId: Dashboard.getCurrentUserId(),
SortBy: "StartDate,SortName",
SortOrder: "Ascending",
StartIndex: 0,
HasAired: false
};
// The base query options
var query = {
UserId: Dashboard.getCurrentUserId(),
StartIndex: 0,
Fields: "ChannelInfo"
};
function getSavedQueryKey() {
return LibraryBrowser.getSavedQueryKey();
}
function reloadItems(page) {
Dashboard.showLoadingMsg();
ApiClient.getLiveTvPrograms(query).then(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,
showLimit: false
});
page.querySelector('.listTopPaging').innerHTML = pagingHtml;
html = cardBuilder.getCardsHtml({
items: result.Items,
shape: query.IsMovie ? 'portrait' : "auto",
context: 'livetv',
showTitle: false,
centerText: true,
lazy: true,
showStartDateIndex: true,
overlayText: false,
showProgramAirInfo: true,
overlayMoreButton: true
});
var elem = page.querySelector('.itemsContainer');
elem.innerHTML = html + pagingHtml;
ImageLoader.lazyChildren(elem);
var i, length;
var elems;
function onNextPageClick() {
query.StartIndex += query.Limit;
reloadItems(page);
}
function onPreviousPageClick() {
query.StartIndex -= query.Limit;
reloadItems(page);
}
elems = page.querySelectorAll('.btnNextPage');
for (i = 0, length = elems.length; i < length; i++) {
elems[i].addEventListener('click', onNextPageClick);
}
elems = page.querySelectorAll('.btnPreviousPage');
for (i = 0, length = elems.length; i < length; i++) {
elems[i].addEventListener('click', onPreviousPageClick);
}
LibraryBrowser.saveQueryValues(getSavedQueryKey(), query);
Dashboard.hideLoadingMsg();
});
}
pageIdOn('pagebeforeshow', "liveTvItemsPage", function () {
query.ParentId = LibraryMenu.getTopParentId();
var page = this;
var limit = LibraryBrowser.getDefaultPageSize();
// If the default page size has changed, the start index will have to be reset
if (limit != query.Limit) {
query.Limit = limit;
query.StartIndex = 0;
if (params.type == 'Recordings') {
query.IsInProgress = false;
} else {
query.HasAired = false;
query.SortBy = 'StartDate,SortName';
query.SortOrder = 'Ascending';
}
query.IsMovie = getParameterByName('type') == 'movies' ? true : null;
query.IsSports = getParameterByName('type') == 'sports' ? true : null;
query.IsKids = getParameterByName('type') == 'kids' ? true : null;
function getSavedQueryKey() {
return LibraryBrowser.getSavedQueryKey();
}
var viewkey = getSavedQueryKey();
function reloadItems(page) {
LibraryBrowser.loadSavedQueryValues(viewkey, query);
Dashboard.showLoadingMsg();
reloadItems(page);
});
var promise = params.type == 'Recordings' ?
ApiClient.getLiveTvRecordings(query) :
ApiClient.getLiveTvPrograms(query);
promise.then(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,
showLimit: false
});
page.querySelector('.listTopPaging').innerHTML = pagingHtml;
html = cardBuilder.getCardsHtml({
items: result.Items,
shape: query.IsMovie ? 'portrait' : "backdrop",
context: 'livetv',
centerText: true,
lazy: true,
overlayText: false,
showTitle: true,
showParentTitle: query.IsSeries !== false && !query.IsMovie,
showProgramAirInfo: params.type != 'Recordings',
overlayMoreButton: true,
showYear: query.IsMovie && params.type == 'Recordings'
});
var elem = page.querySelector('.itemsContainer');
elem.innerHTML = html + pagingHtml;
ImageLoader.lazyChildren(elem);
var i, length;
var elems;
function onNextPageClick() {
query.StartIndex += query.Limit;
reloadItems(page);
}
function onPreviousPageClick() {
query.StartIndex -= query.Limit;
reloadItems(page);
}
elems = page.querySelectorAll('.btnNextPage');
for (i = 0, length = elems.length; i < length; i++) {
elems[i].addEventListener('click', onNextPageClick);
}
elems = page.querySelectorAll('.btnPreviousPage');
for (i = 0, length = elems.length; i < length; i++) {
elems[i].addEventListener('click', onPreviousPageClick);
}
LibraryBrowser.saveQueryValues(getSavedQueryKey(), query);
Dashboard.hideLoadingMsg();
});
}
view.addEventListener('viewbeforeshow', function () {
query.ParentId = LibraryMenu.getTopParentId();
var page = this;
var limit = LibraryBrowser.getDefaultPageSize();
// If the default page size has changed, the start index will have to be reset
if (limit != query.Limit) {
query.Limit = limit;
query.StartIndex = 0;
}
if (params.IsMovie == 'true') {
query.IsMovie = true;
}
else if (params.IsMovie == 'true') {
query.IsMovie = false;
}
if (params.IsSports == 'true') {
query.IsSports = true;
}
else if (params.IsSports == 'true') {
query.IsSports = false;
}
if (params.IsKids == 'true') {
query.IsKids = true;
}
else if (params.IsKids == 'true') {
query.IsKids = false;
}
var viewkey = getSavedQueryKey();
LibraryBrowser.loadSavedQueryValues(viewkey, query);
reloadItems(page);
});
};
});

159
dashboard-ui/scripts/livetvrecordings.js
View file

@ -1,64 +1,10 @@
define(['components/categorysyncbuttons', 'cardBuilder', 'scripts/livetvcomponents', 'emby-button', 'listViewStyle', 'emby-itemscontainer'], function (categorysyncbuttons, cardBuilder) {
function getRecordingGroupHtml(group) {
var html = '';
html += '<div class="listItem">';
html += '<button type="button" is="emby-button" class="fab mini autoSize blue" item-icon><i class="md-icon">live_tv</i></button>';
html += '<div class="listItemBody two-line">';
html += '<a href="livetvrecordinglist.html?groupid=' + group.Id + '" class="clearLink">';
html += '<div>';
html += group.Name;
html += '</div>';
html += '<div class="secondary">';
if (group.RecordingCount == 1) {
html += Globalize.translate('ValueItemCount', group.RecordingCount);
} else {
html += Globalize.translate('ValueItemCountPlural', group.RecordingCount);
}
html += '</div>';
html += '</a>';
html += '</div>';
html += '</div>';
return html;
}
function renderRecordingGroups(context, groups) {
if (groups.length) {
context.querySelector('#recordingGroups').classList.remove('hide');
} else {
context.querySelector('#recordingGroups').classList.add('hide');
}
var html = '';
html += '<div class="paperList">';
for (var i = 0, length = groups.length; i < length; i++) {
html += getRecordingGroupHtml(groups[i]);
}
html += '</div>';
context.querySelector('#recordingGroupItems').innerHTML = html;
Dashboard.hideLoadingMsg();
}
function enableScrollX() {
return browserInfo.mobile && AppInfo.enableAppLayouts;
}
function renderRecordings(elem, recordings) {
function renderRecordings(elem, recordings, cardOptions) {
if (recordings.length) {
elem.classList.remove('hide');
@ -76,7 +22,7 @@
recordingItems.classList.add('vertical-wrap');
}
recordingItems.innerHTML = cardBuilder.getCardsHtml({
recordingItems.innerHTML = cardBuilder.getCardsHtml(Object.assign({
items: recordings,
shape: (enableScrollX() ? 'autooverflow' : 'auto'),
showTitle: true,
@ -85,7 +31,7 @@
lazy: true,
cardLayout: true,
allowBottomPadding: !enableScrollX()
});
}, cardOptions || {}));
ImageLoader.lazyChildren(recordingItems);
}
@ -125,15 +71,75 @@
ApiClient.getLiveTvRecordings({
userId: Dashboard.getCurrentUserId(),
limit: enableScrollX() ? 12 : 4,
UserId: Dashboard.getCurrentUserId(),
Limit: enableScrollX() ? 12 : 8,
IsInProgress: false,
Fields: 'CanDelete,PrimaryImageAspectRatio',
Fields: 'CanDelete,PrimaryImageAspectRatio,BasicSyncInfo',
EnableTotalRecordCount: false
}).then(function (result) {
renderRecordings(context.querySelector('#latestRecordings'), result.Items);
Dashboard.hideLoadingMsg();
});
}
function renderMovieRecordings(context) {
ApiClient.getLiveTvRecordings({
UserId: Dashboard.getCurrentUserId(),
Limit: enableScrollX() ? 12 : 8,
IsInProgress: false,
Fields: 'CanDelete,PrimaryImageAspectRatio,BasicSyncInfo',
EnableTotalRecordCount: false,
IsMovie: true
}).then(function (result) {
renderRecordings(context.querySelector('#movieRecordings'), result.Items, {
showYear: true,
showParentTitle: false
});
});
}
function renderEpisodeRecordings(context) {
ApiClient.getLiveTvRecordings({
UserId: Dashboard.getCurrentUserId(),
Limit: enableScrollX() ? 12 : 8,
IsInProgress: false,
Fields: 'CanDelete,PrimaryImageAspectRatio,BasicSyncInfo',
EnableTotalRecordCount: false,
IsSeries: true
}).then(function (result) {
renderRecordings(context.querySelector('#episodeRecordings'), result.Items);
});
}
function renderProgramRecordings(context) {
ApiClient.getLiveTvRecordings({
UserId: Dashboard.getCurrentUserId(),
Limit: enableScrollX() ? 12 : 8,
IsInProgress: false,
Fields: 'CanDelete,PrimaryImageAspectRatio,BasicSyncInfo',
EnableTotalRecordCount: false,
IsMovie: false,
IsSeries: false
}).then(function (result) {
renderRecordings(context.querySelector('#programRecordings'), result.Items, {
showYear: true,
showParentTitle: false
});
});
}
@ -161,15 +167,31 @@
renderActiveRecordings(context);
renderLatestRecordings(context);
renderMovieRecordings(context);
renderEpisodeRecordings(context);
renderProgramRecordings(context);
}
ApiClient.getLiveTvRecordingGroups({
function onMoreClick(e) {
userId: Dashboard.getCurrentUserId()
var type = this.getAttribute('data-type');
}).then(function (result) {
renderRecordingGroups(context, result.Items);
});
switch(type) {
case 'latest':
Dashboard.navigate('livetvitems.html?type=Recordings');
break;
case 'movies':
Dashboard.navigate('livetvitems.html?type=Recordings&IsMovie=true');
break;
case 'episodes':
Dashboard.navigate('livetvitems.html?type=Recordings&IsSeries=true');
break;
case 'programs':
Dashboard.navigate('livetvitems.html?type=Recordings&IsSeries=false&IsMovie=false');
break;
default:
break;
}
}
return function (view, params, tabContent) {
@ -177,6 +199,11 @@
var self = this;
categorysyncbuttons.init(tabContent);
var moreButtons = tabContent.querySelectorAll('.more');
for (var i = 0, length = moreButtons.length; i < length; i++) {
moreButtons[i].addEventListener('click', onMoreClick);
}
tabContent.querySelector('#activeRecordings .recordingItems').addEventListener('timercancelled', function () {
reload(tabContent);
});

3
dashboard-ui/scripts/livetvsuggested.js
View file

@ -109,7 +109,8 @@
lazy: true,
overlayMoreButton: overlayButton != 'play',
overlayPlayButton: overlayButton == 'play',
allowBottomPadding: !enableScrollX()
allowBottomPadding: !enableScrollX(),
showProgramAirInfo: true
});
var elem = page.querySelector('.' + sectionClass);

28
dashboard-ui/scripts/mediacontroller.js
View file

@ -1,4 +1,4 @@
define(['appStorage', 'events'], function (appStorage, events) {
define(['appStorage', 'events', 'browser'], function (appStorage, events, browser) {
var currentDisplayInfo;
var datetime;
@ -103,17 +103,22 @@
title: Globalize.translate('HeaderSelectPlayer'),
items: menuItems,
positionTo: button,
enableHistory: enableHistory !== false,
callback: function (id) {
var target = targets.filter(function (t) {
return t.id == id;
})[0];
// Unfortunately we can't allow the url to change or chromecast will throw a security error
// Might be able to solve this in the future by moving the dialogs to hashbangs
enableHistory: enableHistory !== false && !browser.chrome,
resolveOnClick: true
MediaController.trySetActivePlayer(target.playerName, target);
}).then(function (id) {
var target = targets.filter(function (t) {
return t.id == id;
})[0];
MediaController.trySetActivePlayer(target.playerName, target);
mirrorIfEnabled();
mirrorIfEnabled();
}
});
});
});
@ -313,6 +318,11 @@
console.log('Active player: ' + JSON.stringify(currentTargetInfo));
triggerPlayerChange(player, targetInfo, previousPlayer);
}, function () {
if (currentPairingId == targetInfo.id) {
currentPairingId = null;
}
});
};

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

@ -18,7 +18,7 @@
SortOrder: "Ascending",
IncludeItemTypes: "Movie",
Recursive: true,
Fields: "PrimaryImageAspectRatio,MediaSourceCount,SortName,BasicSyncInfo",
Fields: "PrimaryImageAspectRatio,MediaSourceCount,BasicSyncInfo",
ImageTypeLimit: 1,
EnableImageTypes: "Primary,Backdrop,Banner,Thumb",
StartIndex: 0,

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

@ -2137,7 +2137,8 @@ var AppInfo = {};
defineRoute({
path: '/livetvitems.html',
dependencies: [],
autoFocus: false
autoFocus: false,
controller: 'scripts/livetvitems'
});
defineRoute({

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

@ -18,7 +18,7 @@
SortOrder: "Ascending",
IncludeItemTypes: "Series",
Recursive: true,
Fields: "PrimaryImageAspectRatio,SortName,BasicSyncInfo",
Fields: "PrimaryImageAspectRatio,BasicSyncInfo",
ImageTypeLimit: 1,
EnableImageTypes: "Primary,Backdrop,Banner,Thumb",
StartIndex: 0,