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

Merge pull request #1173 from sarab97/es6-migration

Browse source 
Migrate deleteHelper, actionSheet, indicators and playMenu to ES6
This commit is contained in:
Anthony Lavado 2020-05-16 09:29:29 -04:00 • committed by GitHub
commit f45a4d1a8c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 563 additions and 595 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -9,3 +9,6 @@ node_modules
# ide # ide
.idea .idea
.vscode .vscode
#log
yarn-error.log

4
package.json
View file

@ -102,6 +102,10 @@
"src/scripts/filesystem.js", "src/scripts/filesystem.js",
"src/scripts/imagehelper.js", "src/scripts/imagehelper.js",
"src/scripts/inputManager.js", "src/scripts/inputManager.js",
"src/components/deletehelper.js",
"src/components/actionsheet/actionsheet.js",
"src/components/playmenu.js",
"src/components/indicators/indicators.js",
"src/scripts/keyboardnavigation.js", "src/scripts/keyboardnavigation.js",
"src/scripts/settings/appSettings.js", "src/scripts/settings/appSettings.js",
"src/scripts/settings/userSettings.js", "src/scripts/settings/userSettings.js",

135
src/components/actionsheet/actionsheet.js
View file

@ -1,21 +1,23 @@
define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'dom', 'emby-button', 'css!./actionsheet', 'material-icons', 'scrollStyles', 'listViewStyle'], function (dialogHelper, layoutManager, globalize, browser, dom) { import dialogHelper from 'dialogHelper';
'use strict'; import layoutManager from 'layoutManager';
import globalize from 'globalize';
import dom from 'dom';
import 'emby-button';
import 'css!./actionsheet';
import 'material-icons';
import 'scrollStyles';
import 'listViewStyle';
function getOffsets(elems) { function getOffsets(elems) {
var doc = document; let results = [];
var results = [];
if (!doc) { if (!document) {
return results; return results;
} }
var box; let box;
var elem; for (let elem of elems) {
for (var i = 0, length = elems.length; i < length; i++) {
elem = elems[i];
// Support: BlackBerry 5, iOS 3 (original iPhone) // Support: BlackBerry 5, iOS 3 (original iPhone)
// If we don't have gBCR, just use 0,0 rather than error // If we don't have gBCR, just use 0,0 rather than error
if (elem.getBoundingClientRect) { if (elem.getBoundingClientRect) {
@ -24,12 +26,12 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'dom', 'emby-bu
box = { top: 0, left: 0 }; box = { top: 0, left: 0 };
} }
results[i] = { results.push({
top: box.top, top: box.top,
left: box.left, left: box.left,
width: box.width, width: box.width,
height: box.height height: box.height
}; });
} }
return results; return results;
@ -37,11 +39,11 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'dom', 'emby-bu
function getPosition(options, dlg) { function getPosition(options, dlg) {
var windowSize = dom.getWindowSize(); const windowSize = dom.getWindowSize();
var windowHeight = windowSize.innerHeight; const windowHeight = windowSize.innerHeight;
var windowWidth = windowSize.innerWidth; const windowWidth = windowSize.innerWidth;
var pos = getOffsets([options.positionTo])[0]; let pos = getOffsets([options.positionTo])[0];
if (options.positionY !== 'top') { if (options.positionY !== 'top') {
pos.top += (pos.height || 0) / 2; pos.top += (pos.height || 0) / 2;
@ -49,16 +51,16 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'dom', 'emby-bu
pos.left += (pos.width || 0) / 2; pos.left += (pos.width || 0) / 2;
var height = dlg.offsetHeight || 300; const height = dlg.offsetHeight || 300;
var width = dlg.offsetWidth || 160; const width = dlg.offsetWidth || 160;
// Account for popup size // Account for popup size
pos.top -= height / 2; pos.top -= height / 2;
pos.left -= width / 2; pos.left -= width / 2;
// Avoid showing too close to the bottom // Avoid showing too close to the bottom
var overflowX = pos.left + width - windowWidth; const overflowX = pos.left + width - windowWidth;
var overflowY = pos.top + height - windowHeight; const overflowY = pos.top + height - windowHeight;
if (overflowX > 0) { if (overflowX > 0) {
pos.left -= (overflowX + 20); pos.left -= (overflowX + 20);
@ -79,30 +81,28 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'dom', 'emby-bu
function centerFocus(elem, horiz, on) { function centerFocus(elem, horiz, on) {
require(['scrollHelper'], function (scrollHelper) { require(['scrollHelper'], function (scrollHelper) {
var fn = on ? 'on' : 'off'; const fn = on ? 'on' : 'off';
scrollHelper.centerFocus[fn](elem, horiz); scrollHelper.centerFocus[fn](elem, horiz);
}); });
} }
function show(options) { export function show(options) {
// items // items
// positionTo // positionTo
// showCancel // showCancel
// title // title
var dialogOptions = { let dialogOptions = {
removeOnClose: true, removeOnClose: true,
enableHistory: options.enableHistory, enableHistory: options.enableHistory,
scrollY: false scrollY: false
}; };
var backButton = false; let isFullscreen;
var isFullscreen;
if (layoutManager.tv) { if (layoutManager.tv) {
dialogOptions.size = 'fullscreen'; dialogOptions.size = 'fullscreen';
isFullscreen = true; isFullscreen = true;
backButton = true;
dialogOptions.autoFocus = true; dialogOptions.autoFocus = true;
} else { } else {
@ -114,7 +114,7 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'dom', 'emby-bu
dialogOptions.autoFocus = false; dialogOptions.autoFocus = false;
} }
var dlg = dialogHelper.createDialog(dialogOptions); let dlg = dialogHelper.createDialog(dialogOptions);
if (isFullscreen) { if (isFullscreen) {
dlg.classList.add('actionsheet-fullscreen'); dlg.classList.add('actionsheet-fullscreen');
@ -128,28 +128,23 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'dom', 'emby-bu
dlg.classList.add(options.dialogClass); dlg.classList.add(options.dialogClass);
} }
var html = ''; let html = '';
var scrollClassName = layoutManager.tv ? 'scrollY smoothScrollY hiddenScrollY' : 'scrollY'; const scrollClassName = layoutManager.tv ? 'scrollY smoothScrollY hiddenScrollY' : 'scrollY';
var style = ''; let style = '';
// Admittedly a hack but right now the scrollbar is being factored into the width which is causing truncation // Admittedly a hack but right now the scrollbar is being factored into the width which is causing truncation
if (options.items.length > 20) { if (options.items.length > 20) {
var minWidth = dom.getWindowSize().innerWidth >= 300 ? 240 : 200; const minWidth = dom.getWindowSize().innerWidth >= 300 ? 240 : 200;
style += 'min-width:' + minWidth + 'px;'; style += 'min-width:' + minWidth + 'px;';
} }
var i; let renderIcon = false;
var length; let icons = [];
var option; let itemIcon;
var renderIcon = false; for (let item of options.items) {
var icons = [];
var itemIcon;
for (i = 0, length = options.items.length; i < length; i++) {
option = options.items[i]; itemIcon = item.icon || (item.selected ? 'check' : null);
itemIcon = option.icon || (option.selected ? 'check' : null);
if (itemIcon) { if (itemIcon) {
renderIcon = true; renderIcon = true;
@ -162,7 +157,7 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'dom', 'emby-bu
} }
// If any items have an icon, give them all an icon just to make sure they're all lined up evenly // If any items have an icon, give them all an icon just to make sure they're all lined up evenly
var center = options.title && (!renderIcon /*|| itemsWithIcons.length != options.items.length*/); const center = options.title && (!renderIcon /*|| itemsWithIcons.length != options.items.length*/);
if (center || layoutManager.tv) { if (center || layoutManager.tv) {
html += '<div class="actionSheetContent actionSheetContent-centered">'; html += '<div class="actionSheetContent actionSheetContent-centered">';
@ -172,23 +167,19 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'dom', 'emby-bu
if (options.title) { if (options.title) {
html += '<h1 class="actionSheetTitle">'; html += '<h1 class="actionSheetTitle">' + options.title + '</h1>';
html += options.title;
html += '</h1>';
} }
if (options.text) { if (options.text) {
html += '<p class="actionSheetText">'; html += '<p class="actionSheetText">' + options.text + '</p>';
html += options.text;
html += '</p>';
} }
var scrollerClassName = 'actionSheetScroller'; let scrollerClassName = 'actionSheetScroller';
if (layoutManager.tv) { if (layoutManager.tv) {
scrollerClassName += ' actionSheetScroller-tv focuscontainer-x focuscontainer-y'; scrollerClassName += ' actionSheetScroller-tv focuscontainer-x focuscontainer-y';
} }
html += '<div class="' + scrollerClassName + ' ' + scrollClassName + '" style="' + style + '">'; html += '<div class="' + scrollerClassName + ' ' + scrollClassName + '" style="' + style + '">';
var menuItemClass = 'listItem listItem-button actionSheetMenuItem'; let menuItemClass = 'listItem listItem-button actionSheetMenuItem';
if (options.border || options.shaded) { if (options.border || options.shaded) {
menuItemClass += ' listItem-border'; menuItemClass += ' listItem-border';
@ -206,26 +197,23 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'dom', 'emby-bu
menuItemClass += ' actionsheet-xlargeFont'; menuItemClass += ' actionsheet-xlargeFont';
} }
for (i = 0, length = options.items.length; i < length; i++) { for (let [i, item] of options.items.entries()) {
option = options.items[i]; if (item.divider) {
if (option.divider) {
html += '<div class="actionsheetDivider"></div>'; html += '<div class="actionsheetDivider"></div>';
continue; continue;
} }
var autoFocus = option.selected && layoutManager.tv ? ' autoFocus' : ''; const autoFocus = item.selected && layoutManager.tv ? ' autoFocus' : '';
// Check for null in case int 0 was passed in // Check for null in case int 0 was passed in
var optionId = option.id == null || option.id === '' ? option.value : option.id; const optionId = item.id == null || item.id === '' ? item.value : item.id;
html += '<button' + autoFocus + ' is="emby-button" type="button" class="' + menuItemClass + '" data-id="' + optionId + '">'; html += '<button' + autoFocus + ' is="emby-button" type="button" class="' + menuItemClass + '" data-id="' + optionId + '">';
itemIcon = icons[i]; itemIcon = icons[i];
if (itemIcon) { if (itemIcon) {
html += '<span class="actionsheetMenuItemIcon listItemIcon listItemIcon-transparent material-icons ' + itemIcon + '"></span>'; html += '<span class="actionsheetMenuItemIcon listItemIcon listItemIcon-transparent material-icons ' + itemIcon + '"></span>';
} else if (renderIcon && !center) { } else if (renderIcon && !center) {
html += '<span class="actionsheetMenuItemIcon listItemIcon listItemIcon-transparent material-icons check" style="visibility:hidden;"></span>'; html += '<span class="actionsheetMenuItemIcon listItemIcon listItemIcon-transparent material-icons check" style="visibility:hidden;"></span>';
@ -234,21 +222,17 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'dom', 'emby-bu
html += '<div class="listItemBody actionsheetListItemBody">'; html += '<div class="listItemBody actionsheetListItemBody">';
html += '<div class="listItemBodyText actionSheetItemText">'; html += '<div class="listItemBodyText actionSheetItemText">';
html += (option.name || option.textContent || option.innerText); html += (item.name || item.textContent || item.innerText);
html += '</div>'; html += '</div>';
if (option.secondaryText) { if (item.secondaryText) {
html += '<div class="listItemBodyText secondary">'; html += '<div class="listItemBodyText secondary">' + item.secondaryText + '</div>';
html += option.secondaryText;
html += '</div>';
} }
html += '</div>'; html += '</div>';
if (option.asideText) { if (item.asideText) {
html += '<div class="listItemAside actionSheetItemAsideText">'; html += '<div class="listItemAside actionSheetItemAsideText">' + item.asideText + '</div>';
html += option.asideText;
html += '</div>';
} }
html += '</button>'; html += '</button>';
@ -267,18 +251,18 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'dom', 'emby-bu
centerFocus(dlg.querySelector('.actionSheetScroller'), false, true); centerFocus(dlg.querySelector('.actionSheetScroller'), false, true);
} }
var btnCloseActionSheet = dlg.querySelector('.btnCloseActionSheet'); let btnCloseActionSheet = dlg.querySelector('.btnCloseActionSheet');
if (btnCloseActionSheet) { if (btnCloseActionSheet) {
dlg.querySelector('.btnCloseActionSheet').addEventListener('click', function () { btnCloseActionSheet.addEventListener('click', function () {
dialogHelper.close(dlg); dialogHelper.close(dlg);
}); });
} }
// Seeing an issue in some non-chrome browsers where this is requiring a double click // Seeing an issue in some non-chrome browsers where this is requiring a double click
//var eventName = browser.firefox ? 'mousedown' : 'click'; //var eventName = browser.firefox ? 'mousedown' : 'click';
var selectedId; let selectedId;
var timeout; let timeout;
if (options.timeout) { if (options.timeout) {
timeout = setTimeout(function () { timeout = setTimeout(function () {
dialogHelper.close(dlg); dialogHelper.close(dlg);
@ -287,11 +271,11 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'dom', 'emby-bu
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
var isResolved; let isResolved;
dlg.addEventListener('click', function (e) { dlg.addEventListener('click', function (e) {
var actionSheetMenuItem = dom.parentWithClass(e.target, 'actionSheetMenuItem'); const actionSheetMenuItem = dom.parentWithClass(e.target, 'actionSheetMenuItem');
if (actionSheetMenuItem) { if (actionSheetMenuItem) {
selectedId = actionSheetMenuItem.getAttribute('data-id'); selectedId = actionSheetMenuItem.getAttribute('data-id');
@ -343,7 +327,7 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'dom', 'emby-bu
dialogHelper.open(dlg); dialogHelper.open(dlg);
var pos = options.positionTo && dialogOptions.size !== 'fullscreen' ? getPosition(options, dlg) : null; const pos = options.positionTo && dialogOptions.size !== 'fullscreen' ? getPosition(options, dlg) : null;
if (pos) { if (pos) {
dlg.style.position = 'fixed'; dlg.style.position = 'fixed';
@ -354,7 +338,6 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'dom', 'emby-bu
}); });
} }
return { export default {
show: show show: show
}; };
});

31
src/components/deletehelper.js
View file

@ -1,5 +1,7 @@
define(['connectionManager', 'confirm', 'appRouter', 'globalize'], function (connectionManager, confirm, appRouter, globalize) { import connectionManager from 'connectionManager';
'use strict'; import confirm from 'confirm';
import appRouter from 'appRouter';
import globalize from 'globalize';
function alertText(options) { function alertText(options) {
@ -11,38 +13,34 @@ define(['connectionManager', 'confirm', 'appRouter', 'globalize'], function (con
}); });
} }
function deleteItem(options) { export function deleteItem(options) {
var item = options.item; const item = options.item;
var itemId = item.Id; const parentId = item.SeasonId || item.SeriesId || item.ParentId;
var parentId = item.SeasonId || item.SeriesId || item.ParentId;
var serverId = item.ServerId;
var msg = globalize.translate('ConfirmDeleteItem'); let apiClient = connectionManager.getApiClient(item.ServerId);
var title = globalize.translate('HeaderDeleteItem');
var apiClient = connectionManager.getApiClient(item.ServerId);
return confirm({ return confirm({
title: title, title: globalize.translate('HeaderDeleteItem'),
text: msg, text: globalize.translate('ConfirmDeleteItem'),
confirmText: globalize.translate('Delete'), confirmText: globalize.translate('Delete'),
primary: 'delete' primary: 'delete'
}).then(function () { }).then(function () {
return apiClient.deleteItem(itemId).then(function () { return apiClient.deleteItem(item.Id).then(function () {
if (options.navigate) { if (options.navigate) {
if (parentId) { if (parentId) {
appRouter.showItem(parentId, serverId); appRouter.showItem(parentId, item.ServerId);
} else { } else {
appRouter.goHome(); appRouter.goHome();
} }
} }
}, function (err) { }, function (err) {
var result = function () { let result = function () {
return Promise.reject(err); return Promise.reject(err);
}; };
@ -51,7 +49,6 @@ define(['connectionManager', 'confirm', 'appRouter', 'globalize'], function (con
}); });
} }
return { export default {
deleteItem: deleteItem deleteItem: deleteItem
}; };
});

105
src/components/indicators/indicators.js
View file

@ -1,12 +1,13 @@
define(['datetime', 'itemHelper', 'emby-progressbar', 'css!./indicators.css', 'material-icons'], function (datetime, itemHelper) { import datetime from 'datetime';
'use strict'; import itemHelper from 'itemHelper';
import 'emby-progressbar';
import 'css!./indicators.css';
import 'material-icons';
function enableProgressIndicator(item) { export function enableProgressIndicator(item) {
if (item.MediaType === 'Video') { if (item.MediaType === 'Video' && item.Type !== 'TvChannel') {
if (item.Type !== 'TvChannel') {
return true; return true;
} }
}
if (item.Type === 'AudioBook' || item.Type === 'AudioPodcast') { if (item.Type === 'AudioBook' || item.Type === 'AudioPodcast') {
return true; return true;
@ -15,26 +16,22 @@ define(['datetime', 'itemHelper', 'emby-progressbar', 'css!./indicators.css', 'm
return false; return false;
} }
function getProgressHtml(pct, options) { export function getProgressHtml(pct, options) {
var containerClass = 'itemProgressBar'; let containerClass = 'itemProgressBar';
if (options) { if (options && options.containerClass) {
if (options.containerClass) {
containerClass += ' ' + options.containerClass; containerClass += ' ' + options.containerClass;
} }
}
return '<div class="' + containerClass + '"><div class="itemProgressBarForeground" style="width:' + pct + '%;"></div></div>'; return '<div class="' + containerClass + '"><div class="itemProgressBarForeground" style="width:' + pct + '%;"></div></div>';
} }
function getAutoTimeProgressHtml(pct, options, isRecording, start, end) { function getAutoTimeProgressHtml(pct, options, isRecording, start, end) {
var containerClass = 'itemProgressBar'; let containerClass = 'itemProgressBar';
if (options) { if (options && options.containerClass) {
if (options.containerClass) {
containerClass += ' ' + options.containerClass; containerClass += ' ' + options.containerClass;
} }
}
var foregroundClass = 'itemProgressBarForeground'; let foregroundClass = 'itemProgressBarForeground';
if (isRecording) { if (isRecording) {
foregroundClass += ' itemProgressBarForeground-recording'; foregroundClass += ' itemProgressBarForeground-recording';
} }
@ -42,10 +39,11 @@ define(['datetime', 'itemHelper', 'emby-progressbar', 'css!./indicators.css', 'm
return '<div is="emby-progressbar" data-automode="time" data-starttime="' + start + '" data-endtime="' + end + '" class="' + containerClass + '"><div class="' + foregroundClass + '" style="width:' + pct + '%;"></div></div>'; return '<div is="emby-progressbar" data-automode="time" data-starttime="' + start + '" data-endtime="' + end + '" class="' + containerClass + '"><div class="' + foregroundClass + '" style="width:' + pct + '%;"></div></div>';
} }
function getProgressBarHtml(item, options) { export function getProgressBarHtml(item, options) {
var pct; let pct;
if (enableProgressIndicator(item) && item.Type !== 'Recording') { if (enableProgressIndicator(item) && item.Type !== 'Recording') {
var userData = options ? (options.userData || item.UserData) : item.UserData; const userData = options && options.userData ? options.userData : item.UserData;
if (userData) { if (userData) {
pct = userData.PlayedPercentage; pct = userData.PlayedPercentage;
if (pct && pct < 100) { if (pct && pct < 100) {
@ -55,8 +53,8 @@ define(['datetime', 'itemHelper', 'emby-progressbar', 'css!./indicators.css', 'm
} }
if ((item.Type === 'Program' || item.Type === 'Timer' || item.Type === 'Recording') && item.StartDate && item.EndDate) { if ((item.Type === 'Program' || item.Type === 'Timer' || item.Type === 'Recording') && item.StartDate && item.EndDate) {
var startDate = 0; let startDate = 0;
var endDate = 1; let endDate = 1;
try { try {
startDate = datetime.parseISO8601Date(item.StartDate).getTime(); startDate = datetime.parseISO8601Date(item.StartDate).getTime();
@ -65,12 +63,12 @@ define(['datetime', 'itemHelper', 'emby-progressbar', 'css!./indicators.css', 'm
console.error(err); console.error(err);
} }
var now = new Date().getTime(); const now = new Date().getTime();
var total = endDate - startDate; const total = endDate - startDate;
pct = 100 * ((now - startDate) / total); pct = 100 * ((now - startDate) / total);
if (pct > 0 && pct < 100) { if (pct > 0 && pct < 100) {
var isRecording = item.Type === 'Timer' || item.Type === 'Recording' || item.TimerId; const isRecording = item.Type === 'Timer' || item.Type === 'Recording' || item.TimerId;
return getAutoTimeProgressHtml(pct, options, isRecording, startDate, endDate); return getAutoTimeProgressHtml(pct, options, isRecording, startDate, endDate);
} }
} }
@ -78,13 +76,13 @@ define(['datetime', 'itemHelper', 'emby-progressbar', 'css!./indicators.css', 'm
return ''; return '';
} }
function enablePlayedIndicator(item) { export function enablePlayedIndicator(item) {
return itemHelper.canMarkPlayed(item); return itemHelper.canMarkPlayed(item);
} }
function getPlayedIndicator(item) { export function getPlayedIndicatorHtml(item) {
if (enablePlayedIndicator(item)) { if (enablePlayedIndicator(item)) {
var userData = item.UserData || {}; let userData = item.UserData || {};
if (userData.UnplayedItemCount) { if (userData.UnplayedItemCount) {
return '<div class="countIndicator indicator">' + userData.UnplayedItemCount + '</div>'; return '<div class="countIndicator indicator">' + userData.UnplayedItemCount + '</div>';
} }
@ -97,25 +95,18 @@ define(['datetime', 'itemHelper', 'emby-progressbar', 'css!./indicators.css', 'm
return ''; return '';
} }
function getCountIndicatorHtml(count) { export function getChildCountIndicatorHtml(item, options) {
return '<div class="countIndicator indicator">' + count + '</div>'; const minCount = options && options.minCount ? options.minCount : 0;
}
function getChildCountIndicatorHtml(item, options) {
var minCount = 0;
if (options) {
minCount = options.minCount || minCount;
}
if (item.ChildCount && item.ChildCount > minCount) { if (item.ChildCount && item.ChildCount > minCount) {
return getCountIndicatorHtml(item.ChildCount); return '<div class="countIndicator indicator">' + item.ChildCount + '</div>';
} }
return ''; return '';
} }
function getTimerIndicator(item) { export function getTimerIndicator(item) {
var status; let status;
if (item.Type === 'SeriesTimer') { if (item.Type === 'SeriesTimer') {
return '<span class="material-icons timerIndicator indicatorIcon fiber_smart_record"></span>'; return '<span class="material-icons timerIndicator indicatorIcon fiber_smart_record"></span>';
@ -138,7 +129,7 @@ define(['datetime', 'itemHelper', 'emby-progressbar', 'css!./indicators.css', 'm
return '<span class="material-icons timerIndicator indicatorIcon fiber_manual_record"></span>'; return '<span class="material-icons timerIndicator indicatorIcon fiber_manual_record"></span>';
} }
function getSyncIndicator(item) { export function getSyncIndicator(item) {
if (item.SyncPercent === 100) { if (item.SyncPercent === 100) {
return '<div class="syncIndicator indicator fullSyncIndicator"><span class="material-icons indicatorIcon file_download"></span></div>'; return '<div class="syncIndicator indicator fullSyncIndicator"><span class="material-icons indicatorIcon file_download"></span></div>';
} else if (item.SyncPercent != null) { } else if (item.SyncPercent != null) {
@ -148,28 +139,23 @@ define(['datetime', 'itemHelper', 'emby-progressbar', 'css!./indicators.css', 'm
return ''; return '';
} }
function getTypeIndicator(item) { export function getTypeIndicator(item) {
if (item.Type === 'Video') { const iconT = {
return '<div class="indicator videoIndicator"><span class="material-icons indicatorIcon videocam"></span></div>'; 'Video' : 'videocam',
} 'Folder' : 'folder',
if (item.Type === 'Folder') { 'PhotoAlbum' : 'photo_album',
return '<div class="indicator videoIndicator"><span class="material-icons indicatorIcon folder"></span></div>'; 'Photo' : 'photo'
} };
if (item.Type === 'PhotoAlbum') {
return '<div class="indicator videoIndicator"><span class="material-icons indicatorIcon photo_album"></span></div>'; const icon = iconT[item.Type];
} return icon ? '<div class="indicator videoIndicator"><span class="material-icons indicatorIcon '+ icon +'"></span></div>' : '';
if (item.Type === 'Photo') {
return '<div class="indicator videoIndicator"><span class="material-icons indicatorIcon photo"></span></div>';
} }
return ''; export function getMissingIndicator(item) {
}
function getMissingIndicator(item) {
if (item.Type === 'Episode' && item.LocationType === 'Virtual') { if (item.Type === 'Episode' && item.LocationType === 'Virtual') {
if (item.PremiereDate) { if (item.PremiereDate) {
try { try {
var premiereDate = datetime.parseISO8601Date(item.PremiereDate).getTime(); const premiereDate = datetime.parseISO8601Date(item.PremiereDate).getTime();
if (premiereDate > new Date().getTime()) { if (premiereDate > new Date().getTime()) {
return '<div class="unairedIndicator">Unaired</div>'; return '<div class="unairedIndicator">Unaired</div>';
} }
@ -183,10 +169,10 @@ define(['datetime', 'itemHelper', 'emby-progressbar', 'css!./indicators.css', 'm
return ''; return '';
} }
return { export default {
getProgressHtml: getProgressHtml, getProgressHtml: getProgressHtml,
getProgressBarHtml: getProgressBarHtml, getProgressBarHtml: getProgressBarHtml,
getPlayedIndicatorHtml: getPlayedIndicator, getPlayedIndicatorHtml: getPlayedIndicatorHtml,
getChildCountIndicatorHtml: getChildCountIndicatorHtml, getChildCountIndicatorHtml: getChildCountIndicatorHtml,
enableProgressIndicator: enableProgressIndicator, enableProgressIndicator: enableProgressIndicator,
getTimerIndicator: getTimerIndicator, getTimerIndicator: getTimerIndicator,
@ -195,4 +181,3 @@ define(['datetime', 'itemHelper', 'emby-progressbar', 'css!./indicators.css', 'm
getTypeIndicator: getTypeIndicator, getTypeIndicator: getTypeIndicator,
getMissingIndicator: getMissingIndicator getMissingIndicator: getMissingIndicator
}; };
});

26
src/components/playmenu.js
View file

@ -1,23 +1,20 @@
define(['actionsheet', 'datetime', 'playbackManager', 'globalize', 'appSettings'], function (actionsheet, datetime, playbackManager, globalize, appSettings) { import actionsheet from 'actionsheet';
'use strict'; import datetime from 'datetime';
import playbackManager from 'playbackManager';
import globalize from 'globalize';
function show(options) { export function show(options) {
var item = options.item; var item = options.item;
var itemType = item.Type;
var isFolder = item.IsFolder;
var itemId = item.Id;
var channelId = item.ChannelId;
var serverId = item.ServerId;
var resumePositionTicks = item.UserData ? item.UserData.PlaybackPositionTicks : null; var resumePositionTicks = item.UserData ? item.UserData.PlaybackPositionTicks : null;
var playableItemId = itemType === 'Program' ? channelId : itemId; var playableItemId = item.Type === 'Program' ? item.ChannelId : item.Id;
if (!resumePositionTicks || isFolder) { if (!resumePositionTicks || item.IsFolder) {
playbackManager.play({ playbackManager.play({
ids: [playableItemId], ids: [playableItemId],
serverId: serverId serverId: item.ServerId
}); });
return; return;
} }
@ -45,14 +42,14 @@ define(['actionsheet', 'datetime', 'playbackManager', 'globalize', 'appSettings'
case 'play': case 'play':
playbackManager.play({ playbackManager.play({
ids: [playableItemId], ids: [playableItemId],
serverId: serverId serverId: item.ServerId
}); });
break; break;
case 'resume': case 'resume':
playbackManager.play({ playbackManager.play({
ids: [playableItemId], ids: [playableItemId],
startPositionTicks: resumePositionTicks, startPositionTicks: resumePositionTicks,
serverId: serverId serverId: item.ServerId
}); });
break; break;
case 'queue': case 'queue':
@ -69,7 +66,6 @@ define(['actionsheet', 'datetime', 'playbackManager', 'globalize', 'appSettings'
}); });
} }
return { export default {
show: show show: show
}; };
});