mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
Merge pull request #1759 from Camc314/migrate-to-ES6-57
Migration of guide and guide-settings to ES6 modules
This commit is contained in:
Bond-009
GitHub
commit
25cddbcce3
6 changed files with 1292 additions and 1275 deletions
|
|
@ -112,6 +112,8 @@
|
|||
"src/components/filterdialog/filterdialog.js",
|
||||
"src/components/focusManager.js",
|
||||
"src/components/groupedcards.js",
|
||||
"src/components/guide/guide.js",
|
||||
"src/components/guide/guide-settings.js",
|
||||
"src/components/homeScreenSettings/homeScreenSettings.js",
|
||||
"src/components/homesections/homesections.js",
|
||||
"src/components/htmlMediaHelper.js",
|
||||
|
|
|
|||
|
|
@ -1,17 +1,21 @@
|
|||
define(['dialogHelper', 'globalize', 'userSettings', 'layoutManager', 'connectionManager', 'require', 'loading', 'scrollHelper', 'emby-checkbox', 'emby-radio', 'css!./../formdialog', 'material-icons'], function (dialogHelper, globalize, userSettings, layoutManager, connectionManager, require, loading, scrollHelper) {
|
||||
'use strict';
|
||||
|
||||
layoutManager = layoutManager.default || layoutManager;
|
||||
scrollHelper = scrollHelper.default || scrollHelper;
|
||||
import dialogHelper from 'dialogHelper';
|
||||
import globalize from 'globalize';
|
||||
import * as userSettings from 'userSettings';
|
||||
import layoutManager from 'layoutManager';
|
||||
import scrollHelper from 'scrollHelper';
|
||||
import 'emby-checkbox';
|
||||
import 'emby-radio';
|
||||
import 'css!./../formdialog';
|
||||
import 'material-icons';
|
||||
|
||||
function saveCategories(context, options) {
|
||||
var categories = [];
|
||||
const categories = [];
|
||||
|
||||
var chkCategorys = context.querySelectorAll('.chkCategory');
|
||||
for (var i = 0, length = chkCategorys.length; i < length; i++) {
|
||||
var type = chkCategorys[i].getAttribute('data-type');
|
||||
const chkCategorys = context.querySelectorAll('.chkCategory');
|
||||
for (const chkCategory of chkCategorys) {
|
||||
const type = chkCategory.getAttribute('data-type');
|
||||
|
||||
if (chkCategorys[i].checked) {
|
||||
if (chkCategory.checked) {
|
||||
categories.push(type);
|
||||
}
|
||||
}
|
||||
|
|
@ -26,70 +30,66 @@ define(['dialogHelper', 'globalize', 'userSettings', 'layoutManager', 'connectio
|
|||
}
|
||||
|
||||
function loadCategories(context, options) {
|
||||
var selectedCategories = options.categories || [];
|
||||
const selectedCategories = options.categories || [];
|
||||
|
||||
var chkCategorys = context.querySelectorAll('.chkCategory');
|
||||
for (var i = 0, length = chkCategorys.length; i < length; i++) {
|
||||
var type = chkCategorys[i].getAttribute('data-type');
|
||||
const chkCategorys = context.querySelectorAll('.chkCategory');
|
||||
for (const chkCategory of chkCategorys) {
|
||||
const type = chkCategory.getAttribute('data-type');
|
||||
|
||||
chkCategorys[i].checked = !selectedCategories.length || selectedCategories.indexOf(type) !== -1;
|
||||
chkCategory.checked = !selectedCategories.length || selectedCategories.indexOf(type) !== -1;
|
||||
}
|
||||
}
|
||||
|
||||
function save(context) {
|
||||
var i;
|
||||
var length;
|
||||
const chkIndicators = context.querySelectorAll('.chkIndicator');
|
||||
|
||||
var chkIndicators = context.querySelectorAll('.chkIndicator');
|
||||
for (i = 0, length = chkIndicators.length; i < length; i++) {
|
||||
var type = chkIndicators[i].getAttribute('data-type');
|
||||
userSettings.set('guide-indicator-' + type, chkIndicators[i].checked);
|
||||
for (const chkIndicator of chkIndicators) {
|
||||
const type = chkIndicator.getAttribute('data-type');
|
||||
userSettings.set('guide-indicator-' + type, chkIndicator.checked);
|
||||
}
|
||||
|
||||
userSettings.set('guide-colorcodedbackgrounds', context.querySelector('.chkColorCodedBackgrounds').checked);
|
||||
userSettings.set('livetv-favoritechannelsattop', context.querySelector('.chkFavoriteChannelsAtTop').checked);
|
||||
|
||||
var sortBys = context.querySelectorAll('.chkSortOrder');
|
||||
for (i = 0, length = sortBys.length; i < length; i++) {
|
||||
if (sortBys[i].checked) {
|
||||
userSettings.set('livetv-channelorder', sortBys[i].value);
|
||||
const sortBys = context.querySelectorAll('.chkSortOrder');
|
||||
for (const sortBy of sortBys) {
|
||||
if (sortBy.checked) {
|
||||
userSettings.set('livetv-channelorder', sortBy.value);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function load(context) {
|
||||
var i;
|
||||
var length;
|
||||
const chkIndicators = context.querySelectorAll('.chkIndicator');
|
||||
|
||||
var chkIndicators = context.querySelectorAll('.chkIndicator');
|
||||
for (i = 0, length = chkIndicators.length; i < length; i++) {
|
||||
var type = chkIndicators[i].getAttribute('data-type');
|
||||
for (const chkIndicator of chkIndicators) {
|
||||
const type = chkIndicator.getAttribute('data-type');
|
||||
|
||||
if (chkIndicators[i].getAttribute('data-default') === 'true') {
|
||||
chkIndicators[i].checked = userSettings.get('guide-indicator-' + type) !== 'false';
|
||||
if (chkIndicator.getAttribute('data-default') === 'true') {
|
||||
chkIndicator.checked = userSettings.get('guide-indicator-' + type) !== 'false';
|
||||
} else {
|
||||
chkIndicators[i].checked = userSettings.get('guide-indicator-' + type) === 'true';
|
||||
chkIndicator.checked = userSettings.get('guide-indicator-' + type) === 'true';
|
||||
}
|
||||
}
|
||||
|
||||
context.querySelector('.chkColorCodedBackgrounds').checked = userSettings.get('guide-colorcodedbackgrounds') === 'true';
|
||||
context.querySelector('.chkFavoriteChannelsAtTop').checked = userSettings.get('livetv-favoritechannelsattop') !== 'false';
|
||||
|
||||
var sortByValue = userSettings.get('livetv-channelorder') || 'Number';
|
||||
const sortByValue = userSettings.get('livetv-channelorder') || 'Number';
|
||||
|
||||
var sortBys = context.querySelectorAll('.chkSortOrder');
|
||||
for (i = 0, length = sortBys.length; i < length; i++) {
|
||||
sortBys[i].checked = sortBys[i].value === sortByValue;
|
||||
const sortBys = context.querySelectorAll('.chkSortOrder');
|
||||
for (const sortBy of sortBys) {
|
||||
sortBy.checked = sortBy.value === sortByValue;
|
||||
}
|
||||
}
|
||||
|
||||
function showEditor(options) {
|
||||
return new Promise(function (resolve, reject) {
|
||||
var settingsChanged = false;
|
||||
let settingsChanged = false;
|
||||
|
||||
require(['text!./guide-settings.template.html'], function (template) {
|
||||
var dialogOptions = {
|
||||
import('text!./guide-settings.template.html').then(({ default: template }) => {
|
||||
const dialogOptions = {
|
||||
removeOnClose: true,
|
||||
scrollY: false
|
||||
};
|
||||
|
|
@ -100,11 +100,11 @@ define(['dialogHelper', 'globalize', 'userSettings', 'layoutManager', 'connectio
|
|||
dialogOptions.size = 'small';
|
||||
}
|
||||
|
||||
var dlg = dialogHelper.createDialog(dialogOptions);
|
||||
const dlg = dialogHelper.createDialog(dialogOptions);
|
||||
|
||||
dlg.classList.add('formDialog');
|
||||
|
||||
var html = '';
|
||||
let html = '';
|
||||
|
||||
html += globalize.translateHtml(template, 'core');
|
||||
|
||||
|
|
@ -144,7 +144,6 @@ define(['dialogHelper', 'globalize', 'userSettings', 'layoutManager', 'connectio
|
|||
});
|
||||
}
|
||||
|
||||
return {
|
||||
export default {
|
||||
show: showEditor
|
||||
};
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,16 +1,33 @@
|
|||
define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager', 'scrollHelper', 'serverNotifications', 'loading', 'datetime', 'focusManager', 'playbackManager', 'userSettings', 'imageLoader', 'events', 'layoutManager', 'itemShortcuts', 'dom', 'css!./guide.css', 'programStyles', 'material-icons', 'scrollStyles', 'emby-programcell', 'emby-button', 'paper-icon-button-light', 'emby-tabs', 'emby-scroller', 'flexStyles', 'webcomponents'], function (require, inputManager, browser, globalize, connectionManager, scrollHelper, serverNotifications, loading, datetime, focusManager, playbackManager, userSettings, imageLoader, events, layoutManager, itemShortcuts, dom) {
|
||||
'use strict';
|
||||
|
||||
playbackManager = playbackManager.default || playbackManager;
|
||||
browser = browser.default || browser;
|
||||
loading = loading.default || loading;
|
||||
layoutManager = layoutManager.default || layoutManager;
|
||||
focusManager = focusManager.default || focusManager;
|
||||
scrollHelper = scrollHelper.default || scrollHelper;
|
||||
serverNotifications = serverNotifications.default || serverNotifications;
|
||||
import inputManager from 'inputManager';
|
||||
import browser from 'browser';
|
||||
import globalize from 'globalize';
|
||||
import connectionManager from 'connectionManager';
|
||||
import scrollHelper from 'scrollHelper';
|
||||
import serverNotifications from 'serverNotifications';
|
||||
import loading from 'loading';
|
||||
import datetime from 'datetime';
|
||||
import focusManager from 'focusManager';
|
||||
import playbackManager from 'playbackManager';
|
||||
import * as userSettings from 'userSettings';
|
||||
import imageLoader from 'imageLoader';
|
||||
import events from 'events';
|
||||
import layoutManager from 'layoutManager';
|
||||
import itemShortcuts from 'itemShortcuts';
|
||||
import dom from 'dom';
|
||||
import 'css!./guide.css';
|
||||
import 'programStyles';
|
||||
import 'material-icons';
|
||||
import 'scrollStyles';
|
||||
import 'emby-programcell';
|
||||
import 'emby-button';
|
||||
import 'paper-icon-button-light';
|
||||
import 'emby-tabs';
|
||||
import 'emby-scroller';
|
||||
import 'flexStyles';
|
||||
import 'webcomponents';
|
||||
|
||||
function showViewSettings(instance) {
|
||||
require(['guide-settings-dialog'], function (guideSettingsDialog) {
|
||||
import('guide-settings-dialog').then(({default: guideSettingsDialog}) => {
|
||||
guideSettingsDialog.show(instance.categoryOptions).then(function () {
|
||||
instance.refresh();
|
||||
});
|
||||
|
|
@ -18,30 +35,30 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
}
|
||||
|
||||
function updateProgramCellOnScroll(cell, scrollPct) {
|
||||
var left = cell.posLeft;
|
||||
let left = cell.posLeft;
|
||||
if (!left) {
|
||||
left = parseFloat(cell.style.left.replace('%', ''));
|
||||
cell.posLeft = left;
|
||||
}
|
||||
var width = cell.posWidth;
|
||||
let width = cell.posWidth;
|
||||
if (!width) {
|
||||
width = parseFloat(cell.style.width.replace('%', ''));
|
||||
cell.posWidth = width;
|
||||
}
|
||||
|
||||
var right = left + width;
|
||||
var newPct = Math.max(Math.min(scrollPct, right), left);
|
||||
const right = left + width;
|
||||
const newPct = Math.max(Math.min(scrollPct, right), left);
|
||||
|
||||
var offset = newPct - left;
|
||||
var pctOfWidth = (offset / width) * 100;
|
||||
const offset = newPct - left;
|
||||
const pctOfWidth = (offset / width) * 100;
|
||||
|
||||
var guideProgramName = cell.guideProgramName;
|
||||
let guideProgramName = cell.guideProgramName;
|
||||
if (!guideProgramName) {
|
||||
guideProgramName = cell.querySelector('.guideProgramName');
|
||||
cell.guideProgramName = guideProgramName;
|
||||
}
|
||||
|
||||
var caret = cell.caret;
|
||||
let caret = cell.caret;
|
||||
if (!caret) {
|
||||
caret = cell.querySelector('.guide-programNameCaret');
|
||||
cell.caret = caret;
|
||||
|
|
@ -58,7 +75,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
}
|
||||
}
|
||||
|
||||
var isUpdatingProgramCellScroll = false;
|
||||
let isUpdatingProgramCellScroll = false;
|
||||
function updateProgramCellsOnScroll(programGrid, programCells) {
|
||||
if (isUpdatingProgramCellScroll) {
|
||||
return;
|
||||
|
|
@ -67,12 +84,12 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
isUpdatingProgramCellScroll = true;
|
||||
|
||||
requestAnimationFrame(function () {
|
||||
var scrollLeft = programGrid.scrollLeft;
|
||||
const scrollLeft = programGrid.scrollLeft;
|
||||
|
||||
var scrollPct = scrollLeft ? (scrollLeft / programGrid.scrollWidth) * 100 : 0;
|
||||
const scrollPct = scrollLeft ? (scrollLeft / programGrid.scrollWidth) * 100 : 0;
|
||||
|
||||
for (var i = 0, length = programCells.length; i < length; i++) {
|
||||
updateProgramCellOnScroll(programCells[i], scrollPct);
|
||||
for (const programCell of programCells) {
|
||||
updateProgramCellOnScroll(programCell, scrollPct);
|
||||
}
|
||||
|
||||
isUpdatingProgramCellScroll = false;
|
||||
|
|
@ -84,17 +101,17 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
return;
|
||||
}
|
||||
|
||||
var programCell = dom.parentWithClass(e.target, 'programCell');
|
||||
const programCell = dom.parentWithClass(e.target, 'programCell');
|
||||
if (programCell) {
|
||||
var startDate = programCell.getAttribute('data-startdate');
|
||||
var endDate = programCell.getAttribute('data-enddate');
|
||||
let startDate = programCell.getAttribute('data-startdate');
|
||||
let endDate = programCell.getAttribute('data-enddate');
|
||||
startDate = datetime.parseISO8601Date(startDate, { toLocal: true }).getTime();
|
||||
endDate = datetime.parseISO8601Date(endDate, { toLocal: true }).getTime();
|
||||
|
||||
var now = new Date().getTime();
|
||||
const now = new Date().getTime();
|
||||
if (now >= startDate && now < endDate) {
|
||||
var channelId = programCell.getAttribute('data-channelid');
|
||||
var serverId = programCell.getAttribute('data-serverid');
|
||||
const channelId = programCell.getAttribute('data-channelid');
|
||||
const serverId = programCell.getAttribute('data-serverid');
|
||||
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
|
|
@ -108,24 +125,24 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
}
|
||||
|
||||
function Guide(options) {
|
||||
var self = this;
|
||||
var items = {};
|
||||
const self = this;
|
||||
let items = {};
|
||||
|
||||
self.options = options;
|
||||
self.categoryOptions = { categories: [] };
|
||||
|
||||
// 30 mins
|
||||
var cellCurationMinutes = 30;
|
||||
var cellDurationMs = cellCurationMinutes * 60 * 1000;
|
||||
var msPerDay = 86400000;
|
||||
const cellCurationMinutes = 30;
|
||||
const cellDurationMs = cellCurationMinutes * 60 * 1000;
|
||||
const msPerDay = 86400000;
|
||||
|
||||
var currentDate;
|
||||
var currentStartIndex = 0;
|
||||
var currentChannelLimit = 0;
|
||||
var autoRefreshInterval;
|
||||
var programCells;
|
||||
var lastFocusDirection;
|
||||
var programGrid;
|
||||
let currentDate;
|
||||
let currentStartIndex = 0;
|
||||
let currentChannelLimit = 0;
|
||||
let autoRefreshInterval;
|
||||
let programCells;
|
||||
let lastFocusDirection;
|
||||
let programGrid;
|
||||
|
||||
self.refresh = function () {
|
||||
currentDate = null;
|
||||
|
|
@ -161,7 +178,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
function restartAutoRefresh() {
|
||||
stopAutoRefresh();
|
||||
|
||||
var intervalMs = 60000 * 15; // (minutes)
|
||||
const intervalMs = 60000 * 15; // (minutes)
|
||||
|
||||
autoRefreshInterval = setInterval(function () {
|
||||
self.refresh();
|
||||
|
|
@ -176,7 +193,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
}
|
||||
|
||||
function normalizeDateToTimeslot(date) {
|
||||
var minutesOffset = date.getMinutes() - cellCurationMinutes;
|
||||
const minutesOffset = date.getMinutes() - cellCurationMinutes;
|
||||
|
||||
if (minutesOffset >= 0) {
|
||||
date.setHours(date.getHours(), cellCurationMinutes, 0, 0);
|
||||
|
|
@ -196,9 +213,9 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
}
|
||||
|
||||
function reloadGuide(context, newStartDate, scrollToTimeMs, focusToTimeMs, startTimeOfDayMs, focusProgramOnRender) {
|
||||
var apiClient = connectionManager.getApiClient(options.serverId);
|
||||
const apiClient = connectionManager.getApiClient(options.serverId);
|
||||
|
||||
var channelQuery = {
|
||||
const channelQuery = {
|
||||
|
||||
StartIndex: 0,
|
||||
EnableFavoriteSorting: userSettings.get('livetv-favoritechannelsattop') !== 'false'
|
||||
|
|
@ -206,7 +223,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
|
||||
channelQuery.UserId = apiClient.getCurrentUserId();
|
||||
|
||||
var channelLimit = 500;
|
||||
const channelLimit = 500;
|
||||
currentChannelLimit = channelLimit;
|
||||
|
||||
showLoading();
|
||||
|
|
@ -217,12 +234,12 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
channelQuery.EnableUserData = false;
|
||||
channelQuery.EnableImageTypes = 'Primary';
|
||||
|
||||
var categories = self.categoryOptions.categories || [];
|
||||
var displayMovieContent = !categories.length || categories.indexOf('movies') !== -1;
|
||||
var displaySportsContent = !categories.length || categories.indexOf('sports') !== -1;
|
||||
var displayNewsContent = !categories.length || categories.indexOf('news') !== -1;
|
||||
var displayKidsContent = !categories.length || categories.indexOf('kids') !== -1;
|
||||
var displaySeriesContent = !categories.length || categories.indexOf('series') !== -1;
|
||||
const categories = self.categoryOptions.categories || [];
|
||||
const displayMovieContent = !categories.length || categories.indexOf('movies') !== -1;
|
||||
const displaySportsContent = !categories.length || categories.indexOf('sports') !== -1;
|
||||
const displayNewsContent = !categories.length || categories.indexOf('news') !== -1;
|
||||
const displayKidsContent = !categories.length || categories.indexOf('kids') !== -1;
|
||||
const displaySeriesContent = !categories.length || categories.indexOf('series') !== -1;
|
||||
|
||||
if (displayMovieContent && displaySportsContent && displayNewsContent && displayKidsContent) {
|
||||
channelQuery.IsMovie = null;
|
||||
|
|
@ -256,19 +273,19 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
channelQuery.SortOrder = null;
|
||||
}
|
||||
|
||||
var date = newStartDate;
|
||||
let date = newStartDate;
|
||||
// Add one second to avoid getting programs that are just ending
|
||||
date = new Date(date.getTime() + 1000);
|
||||
|
||||
// Subtract to avoid getting programs that are starting when the grid ends
|
||||
var nextDay = new Date(date.getTime() + msPerDay - 2000);
|
||||
const nextDay = new Date(date.getTime() + msPerDay - 2000);
|
||||
|
||||
// Normally we'd want to just let responsive css handle this,
|
||||
// but since mobile browsers are often underpowered,
|
||||
// it can help performance to get them out of the markup
|
||||
var allowIndicators = dom.getWindowSize().innerWidth >= 600;
|
||||
const allowIndicators = dom.getWindowSize().innerWidth >= 600;
|
||||
|
||||
var renderOptions = {
|
||||
const renderOptions = {
|
||||
showHdIcon: allowIndicators && userSettings.get('guide-indicator-hd') === 'true',
|
||||
showLiveIndicator: allowIndicators && userSettings.get('guide-indicator-live') !== 'false',
|
||||
showPremiereIndicator: allowIndicators && userSettings.get('guide-indicator-premiere') !== 'false',
|
||||
|
|
@ -278,8 +295,8 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
};
|
||||
|
||||
apiClient.getLiveTvChannels(channelQuery).then(function (channelsResult) {
|
||||
var btnPreviousPage = context.querySelector('.btnPreviousPage');
|
||||
var btnNextPage = context.querySelector('.btnNextPage');
|
||||
const btnPreviousPage = context.querySelector('.btnPreviousPage');
|
||||
const btnNextPage = context.querySelector('.btnNextPage');
|
||||
|
||||
if (channelsResult.TotalRecordCount > channelLimit) {
|
||||
context.querySelector('.guideOptions').classList.remove('hide');
|
||||
|
|
@ -302,9 +319,9 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
context.querySelector('.guideOptions').classList.add('hide');
|
||||
}
|
||||
|
||||
var programFields = [];
|
||||
const programFields = [];
|
||||
|
||||
var programQuery = {
|
||||
const programQuery = {
|
||||
UserId: apiClient.getCurrentUserId(),
|
||||
MaxStartDate: nextDay.toISOString(),
|
||||
MinEndDate: date.toISOString(),
|
||||
|
|
@ -348,7 +365,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
}
|
||||
|
||||
function getTimeslotHeadersHtml(startDate, endDateTime) {
|
||||
var html = '';
|
||||
let html = '';
|
||||
|
||||
// clone
|
||||
startDate = new Date(startDate.getTime());
|
||||
|
|
@ -389,7 +406,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
}
|
||||
|
||||
function getTimerIndicator(item) {
|
||||
var status;
|
||||
let status;
|
||||
|
||||
if (item.Type === 'SeriesTimer') {
|
||||
return '<span class="material-icons programIcon seriesTimerIcon fiber_smart_record"></span>';
|
||||
|
|
@ -413,30 +430,30 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
}
|
||||
|
||||
function getChannelProgramsHtml(context, date, channel, programs, options, listInfo) {
|
||||
var html = '';
|
||||
let html = '';
|
||||
|
||||
var startMs = date.getTime();
|
||||
var endMs = startMs + msPerDay - 1;
|
||||
const startMs = date.getTime();
|
||||
const endMs = startMs + msPerDay - 1;
|
||||
|
||||
var outerCssClass = layoutManager.tv ? 'channelPrograms channelPrograms-tv' : 'channelPrograms';
|
||||
const outerCssClass = layoutManager.tv ? 'channelPrograms channelPrograms-tv' : 'channelPrograms';
|
||||
|
||||
html += '<div class="' + outerCssClass + '" data-channelid="' + channel.Id + '">';
|
||||
|
||||
var clickAction = layoutManager.tv ? 'link' : 'programdialog';
|
||||
const clickAction = layoutManager.tv ? 'link' : 'programdialog';
|
||||
|
||||
var categories = self.categoryOptions.categories || [];
|
||||
var displayMovieContent = !categories.length || categories.indexOf('movies') !== -1;
|
||||
var displaySportsContent = !categories.length || categories.indexOf('sports') !== -1;
|
||||
var displayNewsContent = !categories.length || categories.indexOf('news') !== -1;
|
||||
var displayKidsContent = !categories.length || categories.indexOf('kids') !== -1;
|
||||
var displaySeriesContent = !categories.length || categories.indexOf('series') !== -1;
|
||||
var enableColorCodedBackgrounds = userSettings.get('guide-colorcodedbackgrounds') === 'true';
|
||||
const categories = self.categoryOptions.categories || [];
|
||||
const displayMovieContent = !categories.length || categories.indexOf('movies') !== -1;
|
||||
const displaySportsContent = !categories.length || categories.indexOf('sports') !== -1;
|
||||
const displayNewsContent = !categories.length || categories.indexOf('news') !== -1;
|
||||
const displayKidsContent = !categories.length || categories.indexOf('kids') !== -1;
|
||||
const displaySeriesContent = !categories.length || categories.indexOf('series') !== -1;
|
||||
const enableColorCodedBackgrounds = userSettings.get('guide-colorcodedbackgrounds') === 'true';
|
||||
|
||||
var programsFound;
|
||||
var now = new Date().getTime();
|
||||
let programsFound;
|
||||
const now = new Date().getTime();
|
||||
|
||||
for (var i = listInfo.startIndex, length = programs.length; i < length; i++) {
|
||||
var program = programs[i];
|
||||
for (let i = listInfo.startIndex, length = programs.length; i < length; i++) {
|
||||
const program = programs[i];
|
||||
|
||||
if (program.ChannelId !== channel.Id) {
|
||||
if (programsFound) {
|
||||
|
|
@ -451,8 +468,8 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
|
||||
parseDates(program);
|
||||
|
||||
var startDateLocalMs = program.StartDateLocal.getTime();
|
||||
var endDateLocalMs = program.EndDateLocal.getTime();
|
||||
const startDateLocalMs = program.StartDateLocal.getTime();
|
||||
const endDateLocalMs = program.EndDateLocal.getTime();
|
||||
|
||||
if (endDateLocalMs < startMs) {
|
||||
continue;
|
||||
|
|
@ -464,18 +481,18 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
|
||||
items[program.Id] = program;
|
||||
|
||||
var renderStartMs = Math.max(startDateLocalMs, startMs);
|
||||
var startPercent = (startDateLocalMs - startMs) / msPerDay;
|
||||
const renderStartMs = Math.max(startDateLocalMs, startMs);
|
||||
let startPercent = (startDateLocalMs - startMs) / msPerDay;
|
||||
startPercent *= 100;
|
||||
startPercent = Math.max(startPercent, 0);
|
||||
|
||||
var renderEndMs = Math.min(endDateLocalMs, endMs);
|
||||
var endPercent = (renderEndMs - renderStartMs) / msPerDay;
|
||||
const renderEndMs = Math.min(endDateLocalMs, endMs);
|
||||
let endPercent = (renderEndMs - renderStartMs) / msPerDay;
|
||||
endPercent *= 100;
|
||||
|
||||
var cssClass = 'programCell itemAction';
|
||||
var accentCssClass = null;
|
||||
var displayInnerContent = true;
|
||||
let cssClass = 'programCell itemAction';
|
||||
let accentCssClass = null;
|
||||
let displayInnerContent = true;
|
||||
|
||||
if (program.IsKids) {
|
||||
displayInnerContent = displayKidsContent;
|
||||
|
|
@ -503,7 +520,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
cssClass += ' programCell-active';
|
||||
}
|
||||
|
||||
var timerAttributes = '';
|
||||
let timerAttributes = '';
|
||||
if (program.TimerId) {
|
||||
timerAttributes += ' data-timerid="' + program.TimerId + '"';
|
||||
}
|
||||
|
|
@ -511,12 +528,12 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
timerAttributes += ' data-seriestimerid="' + program.SeriesTimerId + '"';
|
||||
}
|
||||
|
||||
var isAttribute = endPercent >= 2 ? ' is="emby-programcell"' : '';
|
||||
const isAttribute = endPercent >= 2 ? ' is="emby-programcell"' : '';
|
||||
|
||||
html += '<button' + isAttribute + ' data-action="' + clickAction + '"' + timerAttributes + ' data-channelid="' + program.ChannelId + '" data-id="' + program.Id + '" data-serverid="' + program.ServerId + '" data-startdate="' + program.StartDate + '" data-enddate="' + program.EndDate + '" data-type="' + program.Type + '" class="' + cssClass + '" style="left:' + startPercent + '%;width:' + endPercent + '%;">';
|
||||
|
||||
if (displayInnerContent) {
|
||||
var guideProgramNameClass = 'guideProgramName';
|
||||
const guideProgramNameClass = 'guideProgramName';
|
||||
|
||||
html += '<div class="' + guideProgramNameClass + '">';
|
||||
|
||||
|
|
@ -524,7 +541,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
|
||||
html += '<div class="guideProgramNameText">' + program.Name;
|
||||
|
||||
var indicatorHtml = null;
|
||||
let indicatorHtml = null;
|
||||
if (program.IsLive && options.showLiveIndicator) {
|
||||
indicatorHtml = '<span class="liveTvProgram guideProgramIndicator">' + globalize.translate('Live') + '</span>';
|
||||
} else if (program.IsPremiere && options.showPremiereIndicator) {
|
||||
|
|
@ -569,19 +586,18 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
}
|
||||
|
||||
function renderChannelHeaders(context, channels, apiClient) {
|
||||
var html = '';
|
||||
let html = '';
|
||||
|
||||
for (var i = 0, length = channels.length; i < length; i++) {
|
||||
var channel = channels[i];
|
||||
var hasChannelImage = channel.ImageTags.Primary;
|
||||
for (const channel of channels) {
|
||||
const hasChannelImage = channel.ImageTags.Primary;
|
||||
|
||||
var cssClass = 'guide-channelHeaderCell itemAction';
|
||||
let cssClass = 'guide-channelHeaderCell itemAction';
|
||||
|
||||
if (layoutManager.tv) {
|
||||
cssClass += ' guide-channelHeaderCell-tv';
|
||||
}
|
||||
|
||||
var title = [];
|
||||
const title = [];
|
||||
if (channel.ChannelNumber) {
|
||||
title.push(channel.ChannelNumber);
|
||||
}
|
||||
|
|
@ -592,7 +608,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
html += '<button title="' + title.join(' ') + '" type="button" class="' + cssClass + '"' + ' data-action="link" data-isfolder="' + channel.IsFolder + '" data-id="' + channel.Id + '" data-serverid="' + channel.ServerId + '" data-type="' + channel.Type + '">';
|
||||
|
||||
if (hasChannelImage) {
|
||||
var url = apiClient.getScaledImageUrl(channel.Id, {
|
||||
const url = apiClient.getScaledImageUrl(channel.Id, {
|
||||
maxHeight: 220,
|
||||
tag: channel.ImageTags.Primary,
|
||||
type: 'Primary'
|
||||
|
|
@ -612,20 +628,20 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
html += '</button>';
|
||||
}
|
||||
|
||||
var channelList = context.querySelector('.channelsContainer');
|
||||
const channelList = context.querySelector('.channelsContainer');
|
||||
channelList.innerHTML = html;
|
||||
imageLoader.lazyChildren(channelList);
|
||||
}
|
||||
|
||||
function renderPrograms(context, date, channels, programs, options) {
|
||||
var listInfo = {
|
||||
const listInfo = {
|
||||
startIndex: 0
|
||||
};
|
||||
|
||||
var html = [];
|
||||
const html = [];
|
||||
|
||||
for (var i = 0, length = channels.length; i < length; i++) {
|
||||
html.push(getChannelProgramsHtml(context, date, channels[i], programs, options, listInfo));
|
||||
for (const channel of channels) {
|
||||
html.push(getChannelProgramsHtml(context, date, channel, programs, options, listInfo));
|
||||
}
|
||||
|
||||
programGrid.innerHTML = html.join('');
|
||||
|
|
@ -636,17 +652,17 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
}
|
||||
|
||||
function getProgramSortOrder(program, channels) {
|
||||
var channelId = program.ChannelId;
|
||||
var channelIndex = -1;
|
||||
const channelId = program.ChannelId;
|
||||
let channelIndex = -1;
|
||||
|
||||
for (var i = 0, length = channels.length; i < length; i++) {
|
||||
for (let i = 0, length = channels.length; i < length; i++) {
|
||||
if (channelId === channels[i].Id) {
|
||||
channelIndex = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
var start = datetime.parseISO8601Date(program.StartDate, { toLocal: true });
|
||||
const start = datetime.parseISO8601Date(program.StartDate, { toLocal: true });
|
||||
|
||||
return (channelIndex * 10000000) + (start.getTime() / 60000);
|
||||
}
|
||||
|
|
@ -656,9 +672,9 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
return getProgramSortOrder(a, channels) - getProgramSortOrder(b, channels);
|
||||
});
|
||||
|
||||
var activeElement = document.activeElement;
|
||||
var itemId = activeElement && activeElement.getAttribute ? activeElement.getAttribute('data-id') : null;
|
||||
var channelRowId = null;
|
||||
const activeElement = document.activeElement;
|
||||
const itemId = activeElement && activeElement.getAttribute ? activeElement.getAttribute('data-id') : null;
|
||||
let channelRowId = null;
|
||||
|
||||
if (activeElement) {
|
||||
channelRowId = dom.parentWithClass(activeElement, 'channelPrograms');
|
||||
|
|
@ -667,8 +683,8 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
|
||||
renderChannelHeaders(context, channels, apiClient);
|
||||
|
||||
var startDate = date;
|
||||
var endDate = new Date(startDate.getTime() + msPerDay);
|
||||
const startDate = date;
|
||||
const endDate = new Date(startDate.getTime() + msPerDay);
|
||||
context.querySelector('.timeslotHeaders').innerHTML = getTimeslotHeadersHtml(startDate, endDate);
|
||||
items = {};
|
||||
renderPrograms(context, date, channels, programs, renderOptions);
|
||||
|
|
@ -683,17 +699,17 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
function scrollProgramGridToTimeMs(context, scrollToTimeMs, startTimeOfDayMs) {
|
||||
scrollToTimeMs -= startTimeOfDayMs;
|
||||
|
||||
var pct = scrollToTimeMs / msPerDay;
|
||||
const pct = scrollToTimeMs / msPerDay;
|
||||
|
||||
programGrid.scrollTop = 0;
|
||||
|
||||
var scrollPos = pct * programGrid.scrollWidth;
|
||||
const scrollPos = pct * programGrid.scrollWidth;
|
||||
|
||||
nativeScrollTo(programGrid, scrollPos, true);
|
||||
}
|
||||
|
||||
function focusProgram(context, itemId, channelRowId, focusToTimeMs, startTimeOfDayMs) {
|
||||
var focusElem;
|
||||
let focusElem;
|
||||
if (itemId) {
|
||||
focusElem = context.querySelector('[data-id="' + itemId + '"]');
|
||||
}
|
||||
|
|
@ -701,7 +717,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
if (focusElem) {
|
||||
focusManager.focus(focusElem);
|
||||
} else {
|
||||
var autoFocusParent;
|
||||
let autoFocusParent;
|
||||
|
||||
if (channelRowId) {
|
||||
autoFocusParent = context.querySelector('[data-channelid="' + channelRowId + '"]');
|
||||
|
|
@ -713,14 +729,14 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
|
||||
focusToTimeMs -= startTimeOfDayMs;
|
||||
|
||||
var pct = (focusToTimeMs / msPerDay) * 100;
|
||||
const pct = (focusToTimeMs / msPerDay) * 100;
|
||||
|
||||
var programCell = autoFocusParent.querySelector('.programCell');
|
||||
let programCell = autoFocusParent.querySelector('.programCell');
|
||||
|
||||
while (programCell) {
|
||||
var left = (programCell.style.left || '').replace('%', '');
|
||||
let left = (programCell.style.left || '').replace('%', '');
|
||||
left = left ? parseFloat(left) : 0;
|
||||
var width = (programCell.style.width || '').replace('%', '');
|
||||
let width = (programCell.style.width || '').replace('%', '');
|
||||
width = width ? parseFloat(width) : 0;
|
||||
|
||||
if (left >= pct || (left + width) >= pct) {
|
||||
|
|
@ -753,14 +769,14 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
}
|
||||
}
|
||||
|
||||
var lastGridScroll = 0;
|
||||
var lastHeaderScroll = 0;
|
||||
var scrollXPct = 0;
|
||||
let lastGridScroll = 0;
|
||||
let lastHeaderScroll = 0;
|
||||
let scrollXPct = 0;
|
||||
function onProgramGridScroll(context, elem, timeslotHeaders) {
|
||||
if ((new Date().getTime() - lastHeaderScroll) >= 1000) {
|
||||
lastGridScroll = new Date().getTime();
|
||||
|
||||
var scrollLeft = elem.scrollLeft;
|
||||
const scrollLeft = elem.scrollLeft;
|
||||
scrollXPct = (scrollLeft * 100) / elem.scrollWidth;
|
||||
nativeScrollTo(timeslotHeaders, scrollLeft, true);
|
||||
}
|
||||
|
|
@ -776,17 +792,17 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
}
|
||||
|
||||
function changeDate(page, date, scrollToTimeMs, focusToTimeMs, startTimeOfDayMs, focusProgramOnRender) {
|
||||
var newStartDate = normalizeDateToTimeslot(date);
|
||||
const newStartDate = normalizeDateToTimeslot(date);
|
||||
currentDate = newStartDate;
|
||||
|
||||
reloadGuide(page, newStartDate, scrollToTimeMs, focusToTimeMs, startTimeOfDayMs, focusProgramOnRender);
|
||||
}
|
||||
|
||||
function getDateTabText(date, isActive, tabIndex) {
|
||||
var cssClass = isActive ? 'emby-tab-button guide-date-tab-button emby-tab-button-active' : 'emby-tab-button guide-date-tab-button';
|
||||
const cssClass = isActive ? 'emby-tab-button guide-date-tab-button emby-tab-button-active' : 'emby-tab-button guide-date-tab-button';
|
||||
|
||||
var html = '<button is="emby-button" class="' + cssClass + '" data-index="' + tabIndex + '" data-date="' + date.getTime() + '">';
|
||||
var tabText = datetime.toLocaleDateString(date, { weekday: 'short' });
|
||||
let html = '<button is="emby-button" class="' + cssClass + '" data-index="' + tabIndex + '" data-date="' + date.getTime() + '">';
|
||||
let tabText = datetime.toLocaleDateString(date, { weekday: 'short' });
|
||||
|
||||
tabText += '<br/>';
|
||||
tabText += date.getDate();
|
||||
|
|
@ -797,12 +813,12 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
}
|
||||
|
||||
function setDateRange(page, guideInfo) {
|
||||
var today = new Date();
|
||||
var nowHours = today.getHours();
|
||||
const today = new Date();
|
||||
const nowHours = today.getHours();
|
||||
today.setHours(nowHours, 0, 0, 0);
|
||||
|
||||
var start = datetime.parseISO8601Date(guideInfo.StartDate, { toLocal: true });
|
||||
var end = datetime.parseISO8601Date(guideInfo.EndDate, { toLocal: true });
|
||||
let start = datetime.parseISO8601Date(guideInfo.StartDate, { toLocal: true });
|
||||
const end = datetime.parseISO8601Date(guideInfo.EndDate, { toLocal: true });
|
||||
|
||||
start.setHours(nowHours, 0, 0, 0);
|
||||
end.setHours(0, 0, 0, 0);
|
||||
|
|
@ -813,11 +829,11 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
|
||||
start = new Date(Math.max(today, start));
|
||||
|
||||
var dateTabsHtml = '';
|
||||
var tabIndex = 0;
|
||||
let dateTabsHtml = '';
|
||||
let tabIndex = 0;
|
||||
|
||||
// TODO: Use date-fns
|
||||
var date = new Date();
|
||||
const date = new Date();
|
||||
|
||||
if (currentDate) {
|
||||
date.setTime(currentDate.getTime());
|
||||
|
|
@ -825,11 +841,11 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
|
||||
date.setHours(nowHours, 0, 0, 0);
|
||||
|
||||
var startTimeOfDayMs = (start.getHours() * 60 * 60 * 1000);
|
||||
let startTimeOfDayMs = (start.getHours() * 60 * 60 * 1000);
|
||||
startTimeOfDayMs += start.getMinutes() * 60 * 1000;
|
||||
|
||||
while (start <= end) {
|
||||
var isActive = date.getDate() === start.getDate() && date.getMonth() === start.getMonth() && date.getFullYear() === start.getFullYear();
|
||||
const isActive = date.getDate() === start.getDate() && date.getMonth() === start.getMonth() && date.getFullYear() === start.getFullYear();
|
||||
|
||||
dateTabsHtml += getDateTabText(start, isActive, tabIndex);
|
||||
|
||||
|
|
@ -841,23 +857,23 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
page.querySelector('.emby-tabs-slider').innerHTML = dateTabsHtml;
|
||||
page.querySelector('.guideDateTabs').refresh();
|
||||
|
||||
var newDate = new Date();
|
||||
var newDateHours = newDate.getHours();
|
||||
var scrollToTimeMs = newDateHours * 60 * 60 * 1000;
|
||||
const newDate = new Date();
|
||||
const newDateHours = newDate.getHours();
|
||||
let scrollToTimeMs = newDateHours * 60 * 60 * 1000;
|
||||
|
||||
var minutes = newDate.getMinutes();
|
||||
const minutes = newDate.getMinutes();
|
||||
if (minutes >= 30) {
|
||||
scrollToTimeMs += 30 * 60 * 1000;
|
||||
}
|
||||
|
||||
var focusToTimeMs = ((newDateHours * 60) + minutes) * 60 * 1000;
|
||||
const focusToTimeMs = ((newDateHours * 60) + minutes) * 60 * 1000;
|
||||
changeDate(page, date, scrollToTimeMs, focusToTimeMs, startTimeOfDayMs, layoutManager.tv);
|
||||
}
|
||||
|
||||
function reloadPage(page) {
|
||||
showLoading();
|
||||
|
||||
var apiClient = connectionManager.getApiClient(options.serverId);
|
||||
const apiClient = connectionManager.getApiClient(options.serverId);
|
||||
|
||||
apiClient.getLiveTvGuideInfo().then(function (guideInfo) {
|
||||
setDateRange(page, guideInfo);
|
||||
|
|
@ -865,18 +881,17 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
}
|
||||
|
||||
function getChannelProgramsFocusableElements(container) {
|
||||
var elements = container.querySelectorAll('.programCell');
|
||||
const elements = container.querySelectorAll('.programCell');
|
||||
|
||||
var list = [];
|
||||
const list = [];
|
||||
// add 1 to avoid programs that are out of view to the left
|
||||
var currentScrollXPct = scrollXPct + 1;
|
||||
const currentScrollXPct = scrollXPct + 1;
|
||||
|
||||
for (var i = 0, length = elements.length; i < length; i++) {
|
||||
var elem = elements[i];
|
||||
|
||||
var left = (elem.style.left || '').replace('%', '');
|
||||
for (const elem of elements) {
|
||||
let left = (elem.style.left || '').replace('%', '');
|
||||
left = left ? parseFloat(left) : 0;
|
||||
var width = (elem.style.width || '').replace('%', '');
|
||||
|
||||
let width = (elem.style.width || '').replace('%', '');
|
||||
width = width ? parseFloat(width) : 0;
|
||||
|
||||
if ((left + width) >= currentScrollXPct) {
|
||||
|
|
@ -888,12 +903,12 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
}
|
||||
|
||||
function onInputCommand(e) {
|
||||
var target = e.target;
|
||||
var programCell = dom.parentWithClass(target, 'programCell');
|
||||
var container;
|
||||
var channelPrograms;
|
||||
var focusableElements;
|
||||
var newRow;
|
||||
const target = e.target;
|
||||
const programCell = dom.parentWithClass(target, 'programCell');
|
||||
let container;
|
||||
let channelPrograms;
|
||||
let focusableElements;
|
||||
let newRow;
|
||||
|
||||
switch (e.detail.command) {
|
||||
case 'up':
|
||||
|
|
@ -977,14 +992,14 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
}
|
||||
|
||||
function onScrollerFocus(e) {
|
||||
var target = e.target;
|
||||
var programCell = dom.parentWithClass(target, 'programCell');
|
||||
const target = e.target;
|
||||
const programCell = dom.parentWithClass(target, 'programCell');
|
||||
|
||||
if (programCell) {
|
||||
var focused = target;
|
||||
const focused = target;
|
||||
|
||||
var id = focused.getAttribute('data-id');
|
||||
var item = items[id];
|
||||
const id = focused.getAttribute('data-id');
|
||||
const item = items[id];
|
||||
|
||||
if (item) {
|
||||
events.trigger(self, 'focus', [
|
||||
|
|
@ -1003,9 +1018,9 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
scrollHelper.toCenter(programGrid, programCell, true, true);
|
||||
}
|
||||
} else if (lastFocusDirection === 'up' || lastFocusDirection === 'down') {
|
||||
var verticalScroller = dom.parentWithClass(target, 'guideVerticalScroller');
|
||||
const verticalScroller = dom.parentWithClass(target, 'guideVerticalScroller');
|
||||
if (verticalScroller) {
|
||||
var focusedElement = programCell || dom.parentWithTag(target, 'BUTTON');
|
||||
const focusedElement = programCell || dom.parentWithTag(target, 'BUTTON');
|
||||
verticalScroller.toCenter(focusedElement, true);
|
||||
}
|
||||
}
|
||||
|
|
@ -1013,7 +1028,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
|
||||
function setScrollEvents(view, enabled) {
|
||||
if (layoutManager.tv) {
|
||||
var guideVerticalScroller = view.querySelector('.guideVerticalScroller');
|
||||
const guideVerticalScroller = view.querySelector('.guideVerticalScroller');
|
||||
|
||||
if (enabled) {
|
||||
inputManager.on(guideVerticalScroller, onInputCommand);
|
||||
|
|
@ -1024,16 +1039,14 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
}
|
||||
|
||||
function onTimerCreated(e, apiClient, data) {
|
||||
var programId = data.ProgramId;
|
||||
const programId = data.ProgramId;
|
||||
// This could be null, not supported by all tv providers
|
||||
var newTimerId = data.Id;
|
||||
const newTimerId = data.Id;
|
||||
|
||||
// find guide cells by program id, ensure timer icon
|
||||
var cells = options.element.querySelectorAll('.programCell[data-id="' + programId + '"]');
|
||||
for (var i = 0, length = cells.length; i < length; i++) {
|
||||
var cell = cells[i];
|
||||
|
||||
var icon = cell.querySelector('.timerIcon');
|
||||
const cells = options.element.querySelectorAll('.programCell[data-id="' + programId + '"]');
|
||||
for (const cell of cells) {
|
||||
const icon = cell.querySelector('.timerIcon');
|
||||
if (!icon) {
|
||||
cell.querySelector('.guideProgramName').insertAdjacentHTML('beforeend', '<span class="timerIcon material-icons programIcon fiber_manual_record"></span>');
|
||||
}
|
||||
|
|
@ -1048,42 +1061,46 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
}
|
||||
|
||||
function onTimerCancelled(e, apiClient, data) {
|
||||
var id = data.Id;
|
||||
const id = data.Id;
|
||||
// find guide cells by timer id, remove timer icon
|
||||
var cells = options.element.querySelectorAll('.programCell[data-timerid="' + id + '"]');
|
||||
for (var i = 0, length = cells.length; i < length; i++) {
|
||||
var cell = cells[i];
|
||||
var icon = cell.querySelector('.timerIcon');
|
||||
const cells = options.element.querySelectorAll('.programCell[data-timerid="' + id + '"]');
|
||||
|
||||
for (const cell of cells) {
|
||||
const icon = cell.querySelector('.timerIcon');
|
||||
|
||||
if (icon) {
|
||||
icon.parentNode.removeChild(icon);
|
||||
}
|
||||
|
||||
cell.removeAttribute('data-timerid');
|
||||
}
|
||||
}
|
||||
|
||||
function onSeriesTimerCancelled(e, apiClient, data) {
|
||||
var id = data.Id;
|
||||
const id = data.Id;
|
||||
// find guide cells by timer id, remove timer icon
|
||||
var cells = options.element.querySelectorAll('.programCell[data-seriestimerid="' + id + '"]');
|
||||
for (var i = 0, length = cells.length; i < length; i++) {
|
||||
var cell = cells[i];
|
||||
var icon = cell.querySelector('.seriesTimerIcon');
|
||||
const cells = options.element.querySelectorAll('.programCell[data-seriestimerid="' + id + '"]');
|
||||
|
||||
for (const cell of cells) {
|
||||
const icon = cell.querySelector('.seriesTimerIcon');
|
||||
|
||||
if (icon) {
|
||||
icon.parentNode.removeChild(icon);
|
||||
}
|
||||
|
||||
cell.removeAttribute('data-seriestimerid');
|
||||
}
|
||||
}
|
||||
|
||||
require(['text!./tvguide.template.html'], function (template) {
|
||||
var context = options.element;
|
||||
import('text!./tvguide.template.html').then(({default: template}) => {
|
||||
const context = options.element;
|
||||
|
||||
context.classList.add('tvguide');
|
||||
|
||||
context.innerHTML = globalize.translateHtml(template, 'core');
|
||||
|
||||
programGrid = context.querySelector('.programGrid');
|
||||
var timeslotHeaders = context.querySelector('.timeslotHeaders');
|
||||
const timeslotHeaders = context.querySelector('.timeslotHeaders');
|
||||
|
||||
if (layoutManager.tv) {
|
||||
dom.addEventListener(context.querySelector('.guideVerticalScroller'), 'focus', onScrollerFocus, {
|
||||
|
|
@ -1132,17 +1149,17 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
});
|
||||
|
||||
context.querySelector('.guideDateTabs').addEventListener('tabchange', function (e) {
|
||||
var allTabButtons = e.target.querySelectorAll('.guide-date-tab-button');
|
||||
const allTabButtons = e.target.querySelectorAll('.guide-date-tab-button');
|
||||
|
||||
var tabButton = allTabButtons[parseInt(e.detail.selectedTabIndex)];
|
||||
const tabButton = allTabButtons[parseInt(e.detail.selectedTabIndex)];
|
||||
if (tabButton) {
|
||||
var previousButton = e.detail.previousIndex == null ? null : allTabButtons[parseInt(e.detail.previousIndex)];
|
||||
const previousButton = e.detail.previousIndex == null ? null : allTabButtons[parseInt(e.detail.previousIndex)];
|
||||
|
||||
var date = new Date();
|
||||
const date = new Date();
|
||||
date.setTime(parseInt(tabButton.getAttribute('data-date')));
|
||||
|
||||
var scrollWidth = programGrid.scrollWidth;
|
||||
var scrollToTimeMs;
|
||||
const scrollWidth = programGrid.scrollWidth;
|
||||
let scrollToTimeMs;
|
||||
if (scrollWidth) {
|
||||
scrollToTimeMs = (programGrid.scrollLeft / scrollWidth) * msPerDay;
|
||||
} else {
|
||||
|
|
@ -1150,14 +1167,14 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
}
|
||||
|
||||
if (previousButton) {
|
||||
var previousDate = new Date();
|
||||
const previousDate = new Date();
|
||||
previousDate.setTime(parseInt(previousButton.getAttribute('data-date')));
|
||||
|
||||
scrollToTimeMs += (previousDate.getHours() * 60 * 60 * 1000);
|
||||
scrollToTimeMs += (previousDate.getMinutes() * 60 * 1000);
|
||||
}
|
||||
|
||||
var startTimeOfDayMs = (date.getHours() * 60 * 60 * 1000);
|
||||
let startTimeOfDayMs = (date.getHours() * 60 * 60 * 1000);
|
||||
startTimeOfDayMs += (date.getMinutes() * 60 * 1000);
|
||||
|
||||
changeDate(context, date, scrollToTimeMs, scrollToTimeMs, startTimeOfDayMs, false);
|
||||
|
|
@ -1178,5 +1195,4 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
|||
});
|
||||
}
|
||||
|
||||
return Guide;
|
||||
});
|
||||
export default Guide;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ define(['tvguide'], function (tvguide) {
|
|||
|
||||
self.renderTab = function () {
|
||||
if (!guideInstance) {
|
||||
guideInstance = new tvguide({
|
||||
guideInstance = new tvguide.default({
|
||||
element: tabContent,
|
||||
serverId: ApiClient.serverId()
|
||||
});
|
||||
|
|
|
|||
|
|
@ -584,7 +584,7 @@ class ChromecastPlayer {
|
|||
this.isLocalPlayer = false;
|
||||
this.lastPlayerData = {};
|
||||
|
||||
new castSenderApiLoader.default().load().then(initializeChromecast.bind(this));
|
||||
new castSenderApiLoader().load().then(initializeChromecast.bind(this));
|
||||
}
|
||||
|
||||
tryPair(target) {
|
||||
|
|
|
|||
|
|
@ -850,7 +850,7 @@ import 'flexStyles';
|
|||
let requiresUserRefresh = true;
|
||||
|
||||
function setTabs (type, selectedIndex, builder) {
|
||||
import('mainTabsManager').then(({default: mainTabsManager}) => {
|
||||
import('mainTabsManager').then((mainTabsManager) => {
|
||||
if (type) {
|
||||
mainTabsManager.setTabs(viewManager.currentView(), selectedIndex, builder, function () {
|
||||
return [];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue