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

Migration of tvupcomming to ES6 module

Browse source
This commit is contained in:
Cameron 2020-07-12 15:27:05 +01:00
parent 91fc196b78
commit eec81ac54d
2 changed files with 34 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -143,6 +143,7 @@
"src/controllers/shows/tvrecommended.js", "src/controllers/shows/tvrecommended.js",
"src/controllers/shows/tvshows.js", "src/controllers/shows/tvshows.js",
"src/controllers/shows/tvstudios.js", "src/controllers/shows/tvstudios.js",
"src/controllers/shows/tvupcoming.js",
"src/plugins/bookPlayer/plugin.js", "src/plugins/bookPlayer/plugin.js",
"src/plugins/bookPlayer/tableOfContents.js", "src/plugins/bookPlayer/tableOfContents.js",
"src/plugins/photoPlayer/plugin.js", "src/plugins/photoPlayer/plugin.js",

57
src/controllers/shows/tvupcoming.js
View file

@ -1,9 +1,19 @@
define(['layoutManager', 'loading', 'datetime', 'libraryBrowser', 'cardBuilder', 'apphost', 'imageLoader', 'globalize', 'scrollStyles', 'emby-itemscontainer'], function (layoutManager, loading, datetime, libraryBrowser, cardBuilder, appHost, imageLoader, globalize) { import layoutManager from 'layoutManager';
'use strict'; import loading from 'loading';
import datetime from 'datetime';
import libraryBrowser from 'libraryBrowser';
import cardBuilder from 'cardBuilder';
import appHost from 'apphost';
import imageLoader from 'imageLoader';
import globalize from 'globalize';
import 'scrollStyles';
import 'emby-itemscontainer';
/* eslint-disable indent */
function getUpcomingPromise(context, params) { function getUpcomingPromise(context, params) {
loading.show(); loading.show();
var query = { const query = {
Limit: 48, Limit: 48,
Fields: 'AirTime,UserData', Fields: 'AirTime,UserData',
UserId: ApiClient.getCurrentUserId(), UserId: ApiClient.getCurrentUserId(),
@ -17,7 +27,7 @@ define(['layoutManager', 'loading', 'datetime', 'libraryBrowser', 'cardBuilder',
function loadUpcoming(context, params, promise) { function loadUpcoming(context, params, promise) {
promise.then(function (result) { promise.then(function (result) {
var items = result.Items; const items = result.Items;
if (items.length) { if (items.length) {
context.querySelector('.noItemsMessage').style.display = 'none'; context.querySelector('.noItemsMessage').style.display = 'none';
@ -39,19 +49,17 @@ define(['layoutManager', 'loading', 'datetime', 'libraryBrowser', 'cardBuilder',
} }
function renderUpcoming(elem, items) { function renderUpcoming(elem, items) {
var i; const groups = [];
var length; let currentGroupName = '';
var groups = []; let currentGroup = [];
var currentGroupName = '';
var currentGroup = [];
for (i = 0, length = items.length; i < length; i++) { for (let i = 0, length = items.length; i < length; i++) {
var item = items[i]; const item = items[i];
var dateText = ''; let dateText = '';
if (item.PremiereDate) { if (item.PremiereDate) {
try { try {
var premiereDate = datetime.parseISO8601Date(item.PremiereDate, true); const premiereDate = datetime.parseISO8601Date(item.PremiereDate, true);
dateText = datetime.isRelativeDay(premiereDate, -1) ? globalize.translate('Yesterday') : datetime.toLocaleDateString(premiereDate, { dateText = datetime.isRelativeDay(premiereDate, -1) ? globalize.translate('Yesterday') : datetime.toLocaleDateString(premiereDate, {
weekday: 'long', weekday: 'long',
month: 'short', month: 'short',
@ -77,17 +85,17 @@ define(['layoutManager', 'loading', 'datetime', 'libraryBrowser', 'cardBuilder',
} }
} }
var html = ''; let html = '';
for (i = 0, length = groups.length; i < length; i++) { for (let i = 0, length = groups.length; i < length; i++) {
var group = groups[i]; const group = groups[i];
html += '<div class="verticalSection">'; html += '<div class="verticalSection">';
html += '<h2 class="sectionTitle sectionTitle-cards padded-left">' + group.name + '</h2>'; html += '<h2 class="sectionTitle sectionTitle-cards padded-left">' + group.name + '</h2>';
var allowBottomPadding = true; let allowBottomPadding = true;
if (enableScrollX()) { if (enableScrollX()) {
allowBottomPadding = false; allowBottomPadding = false;
var scrollXClass = 'scrollX hiddenScrollX'; let scrollXClass = 'scrollX hiddenScrollX';
if (layoutManager.tv) { if (layoutManager.tv) {
scrollXClass += ' smoothScrollX'; scrollXClass += ' smoothScrollX';
@ -98,7 +106,7 @@ define(['layoutManager', 'loading', 'datetime', 'libraryBrowser', 'cardBuilder',
html += '<div is="emby-itemscontainer" class="itemsContainer vertical-wrap padded-left padded-right">'; html += '<div is="emby-itemscontainer" class="itemsContainer vertical-wrap padded-left padded-right">';
} }
var supportsImageAnalysis = appHost.supports('imageanalysis'); let supportsImageAnalysis = appHost.supports('imageanalysis');
supportsImageAnalysis = false; supportsImageAnalysis = false;
html += cardBuilder.getCardsHtml({ html += cardBuilder.getCardsHtml({
items: group.items, items: group.items,
@ -124,9 +132,9 @@ define(['layoutManager', 'loading', 'datetime', 'libraryBrowser', 'cardBuilder',
imageLoader.lazyChildren(elem); imageLoader.lazyChildren(elem);
} }
return function (view, params, tabContent) { export default function (view, params, tabContent) {
var upcomingPromise; let upcomingPromise;
var self = this; const self = this;
self.preRender = function () { self.preRender = function () {
upcomingPromise = getUpcomingPromise(view, params); upcomingPromise = getUpcomingPromise(view, params);
@ -135,5 +143,6 @@ define(['layoutManager', 'loading', 'datetime', 'libraryBrowser', 'cardBuilder',
self.renderTab = function () { self.renderTab = function () {
loadUpcoming(tabContent, params, upcomingPromise); loadUpcoming(tabContent, params, upcomingPromise);
}; };
}; }
});
/* eslint-enable indent */