';
- var date = datetime.parseISO8601Date(entry.Date, true);
- html += datetime.toLocaleString(date).toLowerCase();
+ html += datefns.formatRelative(Date.parse(entry.Date), Date.parse(new Date()), { locale: dfnshelper.getLocale() });
html += "
";
html += '
';
html += entry.ShortOverview || "";
diff --git a/src/components/appRouter.js b/src/components/appRouter.js
index 74b1a5cd5f..62bfb3cf40 100644
--- a/src/components/appRouter.js
+++ b/src/components/appRouter.js
@@ -370,7 +370,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'layoutManager', 'skinM
}
function enableNativeHistory() {
- return page.enableNativeHistory();
+ return false;
}
function authenticate(ctx, route, callback) {
@@ -511,9 +511,16 @@ define(['loading', 'globalize', 'events', 'viewManager', 'layoutManager', 'skinM
return baseRoute;
}
+ var popstateOccurred = false;
+ window.addEventListener('popstate', function () {
+ popstateOccurred = true;
+ });
+
function getHandler(route) {
return function (ctx, next) {
+ ctx.isBack = popstateOccurred;
handleRoute(ctx, next, route);
+ popstateOccurred = false;
};
}
@@ -562,7 +569,10 @@ define(['loading', 'globalize', 'events', 'viewManager', 'layoutManager', 'skinM
if (!document.querySelector('.dialogContainer') && startPages.indexOf(curr.type) !== -1) {
return false;
}
- return page.canGoBack();
+ if (enableHistory()) {
+ return history.length > 1;
+ }
+ return (page.len || 0) > 0;
}
function showDirect(path) {
@@ -666,7 +676,8 @@ define(['loading', 'globalize', 'events', 'viewManager', 'layoutManager', 'skinM
function pushState(state, title, url) {
state.navigate = false;
- page.pushState(state, title, url);
+ history.pushState(state, title, url);
+
}
function setBaseRoute() {
@@ -716,7 +727,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'layoutManager', 'skinM
appRouter.getRoutes = getRoutes;
appRouter.pushState = pushState;
appRouter.enableNativeHistory = enableNativeHistory;
- appRouter.handleAnchorClick = page.handleAnchorClick;
+ appRouter.handleAnchorClick = page.clickHandler;
appRouter.TransparencyLevel = {
None: 0,
Backdrop: 1,
diff --git a/src/components/appfooter/appfooter.css b/src/components/appfooter/appfooter.css
index 93cb3a75a5..6dc00b00c2 100644
--- a/src/components/appfooter/appfooter.css
+++ b/src/components/appfooter/appfooter.css
@@ -2,7 +2,7 @@
position: fixed;
left: 0;
right: 0;
- z-index: 1;
+ z-index: 10;
bottom: 0;
transition: transform 180ms linear;
contain: layout style;
diff --git a/src/components/apphost.js b/src/components/apphost.js
index f3e89ed29e..868416b369 100644
--- a/src/components/apphost.js
+++ b/src/components/apphost.js
@@ -1,4 +1,4 @@
-define(["appSettings", "browser", "events", "htmlMediaHelper"], function (appSettings, browser, events, htmlMediaHelper) {
+define(["appSettings", "browser", "events", "htmlMediaHelper", "webSettings"], function (appSettings, browser, events, htmlMediaHelper, webSettings) {
"use strict";
function getBaseProfileOptions(item) {
@@ -276,15 +276,17 @@ define(["appSettings", "browser", "events", "htmlMediaHelper"], function (appSet
features.push("otherapppromotions");
features.push("displaymode");
features.push("targetblank");
- // allows users to connect to more than one server
- //features.push("multiserver");
features.push("screensaver");
- if (!browser.orsay && !browser.tizen && !browser.msie && (browser.firefox || browser.ps4 || browser.edge || supportsCue())) {
+ webSettings.enableMultiServer().then(enabled => {
+ if (enabled) features.push("multiserver")
+ })
+
+ if (!browser.orsay && !browser.msie && (browser.firefox || browser.ps4 || browser.edge || supportsCue())) {
features.push("subtitleappearancesettings");
}
- if (!browser.orsay && !browser.tizen) {
+ if (!browser.orsay) {
features.push("subtitleburnsettings");
}
diff --git a/src/components/autoFocuser.js b/src/components/autoFocuser.js
index 6d99009e67..43c341bfdf 100644
--- a/src/components/autoFocuser.js
+++ b/src/components/autoFocuser.js
@@ -1,22 +1,29 @@
-define(["focusManager", "layoutManager"], function (focusManager, layoutManager) {
- "use strict";
+/* eslint-disable indent */
+
+/**
+ * Module for performing auto-focus.
+ * @module components/autoFocuser
+ */
+
+import focusManager from "focusManager";
+import layoutManager from "layoutManager";
/**
* Previously selected element.
*/
- var activeElement;
+ let activeElement;
/**
- * Returns true if AutoFocuser is enabled.
+ * Returns _true_ if AutoFocuser is enabled.
*/
- function isEnabled() {
+ export function isEnabled() {
return layoutManager.tv;
}
/**
- * Start AutoFocuser
+ * Start AutoFocuser.
*/
- function enable() {
+ export function enable() {
if (!isEnabled()) {
return;
}
@@ -28,24 +35,19 @@ define(["focusManager", "layoutManager"], function (focusManager, layoutManager)
console.debug("AutoFocuser enabled");
}
- /**
- * Create an array from some source.
- */
- var arrayFrom = Array.prototype.from || function (src) {
- return Array.prototype.slice.call(src);
- }
-
/**
* Set focus on a suitable element, taking into account the previously selected.
+ * @param {HTMLElement} [container] - Element to limit scope.
+ * @returns {HTMLElement} Focused element.
*/
- function autoFocus(container) {
+ export function autoFocus(container) {
if (!isEnabled()) {
- return;
+ return null;
}
container = container || document.body;
- var candidates = [];
+ let candidates = [];
if (activeElement) {
// These elements are recreated
@@ -62,10 +64,10 @@ define(["focusManager", "layoutManager"], function (focusManager, layoutManager)
candidates.push(activeElement);
}
- candidates = candidates.concat(arrayFrom(container.querySelectorAll(".btnResume")));
- candidates = candidates.concat(arrayFrom(container.querySelectorAll(".btnPlay")));
+ candidates = candidates.concat(Array.from(container.querySelectorAll(".btnResume")));
+ candidates = candidates.concat(Array.from(container.querySelectorAll(".btnPlay")));
- var focusedElement;
+ let focusedElement;
candidates.every(function (element) {
if (focusManager.isCurrentlyFocusable(element)) {
@@ -79,7 +81,7 @@ define(["focusManager", "layoutManager"], function (focusManager, layoutManager)
if (!focusedElement) {
// FIXME: Multiple itemsContainers
- var itemsContainer = container.querySelector(".itemsContainer");
+ const itemsContainer = container.querySelector(".itemsContainer");
if (itemsContainer) {
focusedElement = focusManager.autoFocus(itemsContainer);
@@ -93,9 +95,10 @@ define(["focusManager", "layoutManager"], function (focusManager, layoutManager)
return focusedElement;
}
- return {
- isEnabled: isEnabled,
- enable: enable,
- autoFocus: autoFocus
- };
-});
+/* eslint-enable indent */
+
+export default {
+ isEnabled: isEnabled,
+ enable: enable,
+ autoFocus: autoFocus
+};
diff --git a/src/components/backdrop/backdrop.js b/src/components/backdrop/backdrop.js
index 7320978f71..ec5b411853 100644
--- a/src/components/backdrop/backdrop.js
+++ b/src/components/backdrop/backdrop.js
@@ -182,6 +182,7 @@ define(['browser', 'connectionManager', 'playbackManager', 'dom', "userSettings"
return apiClient.getScaledImageUrl(item.BackdropItemId || item.Id, Object.assign(imageOptions, {
type: "Backdrop",
tag: imgTag,
+ maxWidth: dom.getScreenWidth(),
index: index
}));
});
@@ -192,6 +193,7 @@ define(['browser', 'connectionManager', 'playbackManager', 'dom', "userSettings"
return apiClient.getScaledImageUrl(item.ParentBackdropItemId, Object.assign(imageOptions, {
type: "Backdrop",
tag: imgTag,
+ maxWidth: dom.getScreenWidth(),
index: index
}));
});
diff --git a/src/components/cardbuilder/card.css b/src/components/cardbuilder/card.css
index ea9f42927f..3cd038cd09 100644
--- a/src/components/cardbuilder/card.css
+++ b/src/components/cardbuilder/card.css
@@ -429,6 +429,12 @@ button::-moz-focus-inner {
font-size: 1.66956521739130434em !important;
}
+.cardOverlayButtonIcon.material-icons {
+ /* material-icons override display, so we need to
+ make a better matching selector to set it to flex */
+ display: flex;
+}
+
.cardOverlayButton-centered {
bottom: initial;
right: initial;
diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js
index bec641f407..a4cf6edadc 100644
--- a/src/components/cardbuilder/cardBuilder.js
+++ b/src/components/cardbuilder/cardBuilder.js
@@ -1,11 +1,36 @@
-define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusManager', 'indicators', 'globalize', 'layoutManager', 'apphost', 'dom', 'browser', 'playbackManager', 'itemShortcuts', 'scripts/imagehelper', 'css!./card', 'paper-icon-button-light', 'programStyles'],
- function (datetime, imageLoader, connectionManager, itemHelper, focusManager, indicators, globalize, layoutManager, appHost, dom, browser, playbackManager, itemShortcuts, imageHelper) {
- 'use strict';
+/* eslint-disable indent */
- var devicePixelRatio = window.devicePixelRatio || 1;
- var enableFocusTransform = !browser.slow && !browser.edge;
+/**
+ * Module for building cards from item data.
+ * @module components/cardBuilder/cardBuilder
+ */
- function getCardsHtml(items, options) {
+import datetime from 'datetime';
+import imageLoader from 'imageLoader';
+import connectionManager from 'connectionManager';
+import itemHelper from 'itemHelper';
+import focusManager from 'focusManager';
+import indicators from 'indicators';
+import globalize from 'globalize';
+import layoutManager from 'layoutManager';
+import dom from 'dom';
+import browser from 'browser';
+import playbackManager from 'playbackManager';
+import itemShortcuts from 'itemShortcuts';
+import imageHelper from 'scripts/imagehelper';
+import 'css!./card';
+import 'paper-icon-button-light';
+import 'programStyles';
+
+ const enableFocusTransform = !browser.slow && !browser.edge;
+
+ /**
+ * Generate the HTML markup for cards for a set of items.
+ * @param items - The items used to generate cards.
+ * @param options - The options of the cards.
+ * @returns {string} The HTML markup for the cards.
+ */
+ export function getCardsHtml(items, options) {
if (arguments.length === 1) {
options = arguments[0];
items = options.items;
@@ -14,6 +39,13 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
return buildCardsHtmlInternal(items, options);
}
+ /**
+ * Computes the number of posters per row.
+ * @param {string} shape - Shape of the cards.
+ * @param {number} screenWidth - Width of the screen.
+ * @param {boolean} isOrientationLandscape - Flag for the orientation of the screen.
+ * @returns {number} Number of cards per row for an itemsContainer.
+ */
function getPostersPerRow(shape, screenWidth, isOrientationLandscape) {
switch (shape) {
case 'portrait':
@@ -218,10 +250,15 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
}
}
+ /**
+ * Checks if the window is resizable.
+ * @param {number} windowWidth - Width of the device's screen.
+ * @returns {boolean} - Result of the check.
+ */
function isResizable(windowWidth) {
- var screen = window.screen;
+ const screen = window.screen;
if (screen) {
- var screenWidth = screen.availWidth;
+ const screenWidth = screen.availWidth;
if ((screenWidth - windowWidth) > 20) {
return true;
@@ -231,22 +268,31 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
return false;
}
+ /**
+ * Gets the width of a card's image according to the shape and amount of cards per row.
+ * @param {string} shape - Shape of the card.
+ * @param {number} screenWidth - Width of the screen.
+ * @param {boolean} isOrientationLandscape - Flag for the orientation of the screen.
+ * @returns {number} Width of the image for a card.
+ */
function getImageWidth(shape, screenWidth, isOrientationLandscape) {
- var imagesPerRow = getPostersPerRow(shape, screenWidth, isOrientationLandscape);
- var shapeWidth = screenWidth / imagesPerRow;
-
- return Math.round(shapeWidth);
+ const imagesPerRow = getPostersPerRow(shape, screenWidth, isOrientationLandscape);
+ return Math.round(screenWidth / imagesPerRow) * 2;
}
+ /**
+ * Normalizes the options for a card.
+ * @param {Object} items - A set of items.
+ * @param {Object} options - Options for handling the items.
+ */
function setCardData(items, options) {
-
options.shape = options.shape || "auto";
- var primaryImageAspectRatio = imageLoader.getPrimaryImageAspectRatio(items);
+ const primaryImageAspectRatio = imageLoader.getPrimaryImageAspectRatio(items);
- if (options.shape === 'auto' || options.shape === 'autohome' || options.shape === 'autooverflow' || options.shape === 'autoVertical') {
+ if (['auto', 'autohome', 'autooverflow', 'autoVertical'].includes(options.shape)) {
- var requestedShape = options.shape;
+ const requestedShape = options.shape;
options.shape = null;
if (primaryImageAspectRatio) {
@@ -284,11 +330,11 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
}
if (!options.width) {
- var screenWidth = dom.getWindowSize().innerWidth;
- var screenHeight = dom.getWindowSize().innerHeight;
+ let screenWidth = dom.getWindowSize().innerWidth;
+ const screenHeight = dom.getWindowSize().innerHeight;
if (isResizable(screenWidth)) {
- var roundScreenTo = 100;
+ const roundScreenTo = 100;
screenWidth = Math.floor(screenWidth / roundScreenTo) * roundScreenTo;
}
@@ -296,9 +342,14 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
}
}
+ /**
+ * Generates the internal HTML markup for cards.
+ * @param {Object} items - Items for which to generate the markup.
+ * @param {Object} options - Options for generating the markup.
+ * @returns {string} The internal HTML markup of the cards.
+ */
function buildCardsHtmlInternal(items, options) {
-
- var isVertical;
+ let isVertical = false;
if (options.shape === 'autoVertical') {
isVertical = true;
@@ -306,24 +357,21 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
setCardData(items, options);
- var html = '';
- var itemsInRow = 0;
+ let html = '';
+ let itemsInRow = 0;
- var currentIndexValue;
- var hasOpenRow;
- var hasOpenSection;
+ let currentIndexValue;
+ let hasOpenRow;
+ let hasOpenSection;
- var sectionTitleTagName = options.sectionTitleTagName || 'div';
- var apiClient;
- var lastServerId;
+ let sectionTitleTagName = options.sectionTitleTagName || 'div';
+ let apiClient;
+ let lastServerId;
- var i;
- var length;
+ for (let i = 0; i < items.length; i++) {
- for (i = 0, length = items.length; i < length; i++) {
-
- var item = items[i];
- var serverId = item.ServerId || options.serverId;
+ let item = items[i];
+ let serverId = item.ServerId || options.serverId;
if (serverId !== lastServerId) {
lastServerId = serverId;
@@ -331,14 +379,14 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
}
if (options.indexBy) {
- var newIndexValue = '';
+ let newIndexValue = '';
if (options.indexBy === 'PremiereDate') {
if (item.PremiereDate) {
try {
newIndexValue = datetime.toLocaleDateString(datetime.parseISO8601Date(item.PremiereDate), { weekday: 'long', month: 'long', day: 'numeric' });
- } catch (err) {
- console.error('error parsing timestamp for premiere date');
+ } catch (error) {
+ console.error('error parsing timestamp for premiere date', error);
}
}
} else if (options.indexBy === 'ProductionYear') {
@@ -413,21 +461,15 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
}
}
- var cardFooterHtml = '';
- for (i = 0, length = (options.lines || 0); i < length; i++) {
-
- if (i === 0) {
- cardFooterHtml += '
';
- } else {
- cardFooterHtml += '
';
- }
- }
-
return html;
}
+ /**
+ * Computes the aspect ratio for a card given its shape.
+ * @param {string} shape - Shape for which to get the aspect ratio.
+ * @returns {null|number} Ratio of the shape.
+ */
function getDesiredAspect(shape) {
-
if (shape) {
shape = shape.toLowerCase();
if (shape.indexOf('portrait') !== -1) {
@@ -446,23 +488,29 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
return null;
}
+ /** Get the URL of the card's image.
+ * @param {Object} item - Item for which to generate a card.
+ * @param {Object} apiClient - API client object.
+ * @param {Object} options - Options of the card.
+ * @param {string} shape - Shape of the desired image.
+ * @returns {Object} Object representing the URL of the card's image.
+ */
function getCardImageUrl(item, apiClient, options, shape) {
+ item = item.ProgramInfo || item;
- var imageItem = item.ProgramInfo || item;
- item = imageItem;
-
- var width = options.width;
- var height = null;
- var primaryImageAspectRatio = item.PrimaryImageAspectRatio;
- var forceName = false;
- var imgUrl = null;
- var coverImage = false;
- var uiAspect = null;
+ const width = options.width;
+ let height = null;
+ const primaryImageAspectRatio = item.PrimaryImageAspectRatio;
+ let forceName = false;
+ let imgUrl = null;
+ let coverImage = false;
+ let uiAspect = null;
if (options.preferThumb && item.ImageTags && item.ImageTags.Thumb) {
imgUrl = apiClient.getScaledImageUrl(item.Id, {
type: "Thumb",
+ maxWidth: width,
tag: item.ImageTags.Thumb
});
@@ -470,6 +518,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
imgUrl = apiClient.getScaledImageUrl(item.Id, {
type: "Banner",
+ maxWidth: width,
tag: item.ImageTags.Banner
});
@@ -477,6 +526,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
imgUrl = apiClient.getScaledImageUrl(item.Id, {
type: "Disc",
+ maxWidth: width,
tag: item.ImageTags.Disc
});
@@ -484,6 +534,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
imgUrl = apiClient.getScaledImageUrl(item.Id, {
type: "Logo",
+ maxWidth: width,
tag: item.ImageTags.Logo
});
@@ -491,6 +542,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
imgUrl = apiClient.getScaledImageUrl(item.ParentLogoItemId, {
type: "Logo",
+ maxWidth: width,
tag: item.ParentLogoImageTag
});
@@ -498,6 +550,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
imgUrl = apiClient.getScaledImageUrl(item.SeriesId, {
type: "Thumb",
+ maxWidth: width,
tag: item.SeriesThumbImageTag
});
@@ -505,6 +558,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
imgUrl = apiClient.getScaledImageUrl(item.ParentThumbItemId, {
type: "Thumb",
+ maxWidth: width,
tag: item.ParentThumbImageTag
});
@@ -512,6 +566,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
imgUrl = apiClient.getScaledImageUrl(item.Id, {
type: "Backdrop",
+ maxWidth: width,
tag: item.BackdropImageTags[0]
});
@@ -521,6 +576,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
imgUrl = apiClient.getScaledImageUrl(item.ParentBackdropItemId, {
type: "Backdrop",
+ maxWidth: width,
tag: item.ParentBackdropImageTags[0]
});
@@ -530,6 +586,8 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
imgUrl = apiClient.getScaledImageUrl(item.Id, {
type: "Primary",
+ maxHeight: height,
+ maxWidth: width,
tag: item.ImageTags.Primary
});
@@ -550,6 +608,8 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
imgUrl = apiClient.getScaledImageUrl(item.PrimaryImageItemId || item.Id || item.ItemId, {
type: "Primary",
+ maxHeight: height,
+ maxWidth: width,
tag: item.PrimaryImageTag
});
@@ -567,20 +627,24 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
imgUrl = apiClient.getScaledImageUrl(item.ParentPrimaryImageItemId, {
type: "Primary",
+ maxWidth: width,
tag: item.ParentPrimaryImageTag
});
} else if (item.SeriesPrimaryImageTag) {
imgUrl = apiClient.getScaledImageUrl(item.SeriesId, {
type: "Primary",
+ maxWidth: width,
tag: item.SeriesPrimaryImageTag
});
} else if (item.AlbumId && item.AlbumPrimaryImageTag) {
- width = primaryImageAspectRatio ? Math.round(height * primaryImageAspectRatio) : null;
+ height = width && primaryImageAspectRatio ? Math.round(width / primaryImageAspectRatio) : null;
imgUrl = apiClient.getScaledImageUrl(item.AlbumId, {
type: "Primary",
+ maxHeight: height,
+ maxWidth: width,
tag: item.AlbumPrimaryImageTag
});
@@ -594,6 +658,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
imgUrl = apiClient.getScaledImageUrl(item.Id, {
type: "Thumb",
+ maxWidth: width,
tag: item.ImageTags.Thumb
});
@@ -601,6 +666,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
imgUrl = apiClient.getScaledImageUrl(item.Id, {
type: "Backdrop",
+ maxWidth: width,
tag: item.BackdropImageTags[0]
});
@@ -608,6 +674,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
imgUrl = apiClient.getScaledImageUrl(item.Id, {
type: "Thumb",
+ maxWidth: width,
tag: item.ImageTags.Thumb
});
@@ -615,6 +682,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
imgUrl = apiClient.getScaledImageUrl(item.SeriesId, {
type: "Thumb",
+ maxWidth: width,
tag: item.SeriesThumbImageTag
});
@@ -622,6 +690,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
imgUrl = apiClient.getScaledImageUrl(item.ParentThumbItemId, {
type: "Thumb",
+ maxWidth: width,
tag: item.ParentThumbImageTag
});
@@ -629,6 +698,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
imgUrl = apiClient.getScaledImageUrl(item.ParentBackdropItemId, {
type: "Backdrop",
+ maxWidth: width,
tag: item.ParentBackdropImageTags[0]
});
@@ -641,21 +711,32 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
};
}
+ /**
+ * Generates a random integer in a given range.
+ * @param {number} min - Minimum of the range.
+ * @param {number} max - Maximum of the range.
+ * @returns {number} Randomly generated number.
+ */
function getRandomInt(min, max) {
return Math.floor(Math.random() * (max - min + 1)) + min;
}
- var numRandomColors = 5;
+ /**
+ * Generates an index used to select the default color of a card based on a string.
+ * @param {string} str - String to use for generating the index.
+ * @returns {number} Index of the color.
+ */
function getDefaultColorIndex(str) {
+ const numRandomColors = 5;
if (str) {
- var charIndex = Math.floor(str.length / 2);
- var character = String(str.substr(charIndex, 1).charCodeAt());
- var sum = 0;
- for (var i = 0; i < character.length; i++) {
+ const charIndex = Math.floor(str.length / 2);
+ const character = String(str.substr(charIndex, 1).charCodeAt());
+ let sum = 0;
+ for (let i = 0; i < character.length; i++) {
sum += parseInt(character.charAt(i));
}
- var index = String(sum).substr(-1);
+ let index = String(sum).substr(-1);
return (index % numRandomColors) + 1;
} else {
@@ -663,18 +744,26 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
}
}
+ /**
+ * Generates the HTML markup for a card's text.
+ * @param {Array} lines - Array containing the text lines.
+ * @param {string} cssClass - Base CSS class to use for the lines.
+ * @param {boolean} forceLines - Flag to force the rendering of all lines.
+ * @param {boolean} isOuterFooter - Flag to mark the text lines as outer footer.
+ * @param {string} cardLayout - DEPRECATED
+ * @param {boolean} addRightMargin - Flag to add a right margin to the text.
+ * @param {number} maxLines - Maximum number of lines to render.
+ * @returns {string} HTML markup for the card's text.
+ */
function getCardTextLines(lines, cssClass, forceLines, isOuterFooter, cardLayout, addRightMargin, maxLines) {
+ let html = '';
- var html = '';
+ let valid = 0;
- var valid = 0;
- var i;
- var length;
+ for (let i = 0; i < lines.length; i++) {
- for (i = 0, length = lines.length; i < length; i++) {
-
- var currentCssClass = cssClass;
- var text = lines[i];
+ let currentCssClass = cssClass;
+ let text = lines[i];
if (valid > 0 && isOuterFooter) {
currentCssClass += ' cardText-secondary';
@@ -700,9 +789,9 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
if (forceLines) {
- length = maxLines || Math.min(lines.length, maxLines || lines.length);
+ let linesLength = maxLines || Math.min(lines.length, maxLines || lines.length);
- while (valid < length) {
+ while (valid < linesLength) {
html += "
";
valid++;
}
@@ -711,17 +800,29 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
return html;
}
+ /**
+ * Determines if the item is live TV.
+ * @param {Object} item - Item to use for the check.
+ * @returns {boolean} Flag showing if the item is live TV.
+ */
function isUsingLiveTvNaming(item) {
return item.Type === 'Program' || item.Type === 'Timer' || item.Type === 'Recording';
}
+ /**
+ * Returns the air time text for the item based on the given times.
+ * @param {object} item - Item used to generate the air time text.
+ * @param {string} showAirDateTime - ISO8601 date for the start of the show.
+ * @param {string} showAirEndTime - ISO8601 date for the end of the show.
+ * @returns {string} The air time text for the item based on the given dates.
+ */
function getAirTimeText(item, showAirDateTime, showAirEndTime) {
+ let airTimeText = '';
- var airTimeText = '';
if (item.StartDate) {
try {
- var date = datetime.parseISO8601Date(item.StartDate);
+ let date = datetime.parseISO8601Date(item.StartDate);
if (showAirDateTime) {
airTimeText += datetime.toLocaleDateString(date, { weekday: 'short', month: 'short', day: 'numeric' }) + ' ';
@@ -741,15 +842,29 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
return airTimeText;
}
+ /**
+ * Generates the HTML markup for the card's footer text.
+ * @param {Object} item - Item used to generate the footer text.
+ * @param {Object} apiClient - API client instance.
+ * @param {Object} options - Options used to generate the footer text.
+ * @param {string} showTitle - Flag to show the title in the footer.
+ * @param {boolean} forceName - Flag to force showing the name of the item.
+ * @param {boolean} overlayText - Flag to show overlay text.
+ * @param {Object} imgUrl - Object representing the card's image URL.
+ * @param {string} footerClass - CSS classes of the footer element.
+ * @param {string} progressHtml - HTML markup of the progress bar element.
+ * @param {string} logoUrl - URL of the logo for the item.
+ * @param {boolean} isOuterFooter - Flag to mark the text as outer footer.
+ * @returns {string} HTML markup of the card's footer text element.
+ */
function getCardFooterText(item, apiClient, options, showTitle, forceName, overlayText, imgUrl, footerClass, progressHtml, logoUrl, isOuterFooter) {
-
- var html = '';
+ let html = '';
if (logoUrl) {
html += '';
}
- var showOtherText = isOuterFooter ? !overlayText : overlayText;
+ const showOtherText = isOuterFooter ? !overlayText : overlayText;
if (isOuterFooter && options.cardLayout && layoutManager.mobile) {
@@ -758,12 +873,12 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
}
}
- var cssClass = options.centerText ? "cardText cardTextCentered" : "cardText";
- var serverId = item.ServerId || options.serverId;
+ const cssClass = options.centerText ? "cardText cardTextCentered" : "cardText";
+ const serverId = item.ServerId || options.serverId;
- var lines = [];
- var parentTitleUnderneath = item.Type === 'MusicAlbum' || item.Type === 'Audio' || item.Type === 'MusicVideo';
- var titleAdded;
+ let lines = [];
+ const parentTitleUnderneath = item.Type === 'MusicAlbum' || item.Type === 'Audio' || item.Type === 'MusicVideo';
+ let titleAdded;
if (showOtherText) {
if ((options.showParentTitle || options.showParentTitleOrTitle) && !parentTitleUnderneath) {
@@ -792,7 +907,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
}
} else {
- var parentTitle = item.SeriesName || item.Series || item.Album || item.AlbumArtist || "";
+ const parentTitle = item.SeriesName || item.Series || item.Album || item.AlbumArtist || "";
if (parentTitle || showTitle) {
lines.push(parentTitle);
@@ -802,14 +917,14 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
}
}
- var showMediaTitle = (showTitle && !titleAdded) || (options.showParentTitleOrTitle && !lines.length);
+ let showMediaTitle = (showTitle && !titleAdded) || (options.showParentTitleOrTitle && !lines.length);
if (!showMediaTitle && !titleAdded && (showTitle || forceName)) {
showMediaTitle = true;
}
if (showMediaTitle) {
- var name = options.showTitle === 'auto' && !item.IsFolder && item.MediaType === 'Photo' ? '' : itemHelper.getDisplayName(item, {
+ const name = options.showTitle === 'auto' && !item.IsFolder && item.MediaType === 'Photo' ? '' : itemHelper.getDisplayName(item, {
includeParentInfo: options.includeParentInfoInTitle
});
@@ -836,22 +951,18 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
}
if (options.showItemCounts) {
-
- var itemCountHtml = getItemCountsHtml(options, item);
-
- lines.push(itemCountHtml);
+ lines.push(getItemCountsHtml(options, item));
}
if (options.textLines) {
- var additionalLines = options.textLines(item);
- for (var i = 0, length = additionalLines.length; i < length; i++) {
+ const additionalLines = options.textLines(item);
+ for (let i = 0; i < additionalLines.length; i++) {
lines.push(additionalLines[i]);
}
}
if (options.showSongCount) {
-
- var songLine = '';
+ let songLine = '';
if (item.SongCount) {
songLine = item.SongCount === 1 ?
@@ -889,7 +1000,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
} else {
if (item.EndDate && item.ProductionYear) {
- var endYear = datetime.parseISO8601Date(item.EndDate).getFullYear();
+ const endYear = datetime.parseISO8601Date(item.EndDate).getFullYear();
lines.push(item.ProductionYear + ((endYear === item.ProductionYear) ? '' : (' - ' + endYear)));
} else {
lines.push(item.ProductionYear || '');
@@ -971,11 +1082,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
if (options.showPersonRoleOrType) {
if (item.Role) {
- lines.push('as ' + item.Role);
- } else if (item.Type) {
- lines.push(globalize.translate('' + item.Type));
- } else {
- lines.push('');
+ lines.push(globalize.translate('PersonRole', item.Role));
}
}
}
@@ -984,7 +1091,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
lines = [];
}
- var addRightTextMargin = isOuterFooter && options.cardLayout && !options.centerText && options.cardFooterAside !== 'none' && layoutManager.mobile;
+ const addRightTextMargin = isOuterFooter && options.cardLayout && !options.centerText && options.cardFooterAside !== 'none' && layoutManager.mobile;
html += getCardTextLines(lines, cssClass, !options.overlayText, isOuterFooter, options.cardLayout, addRightTextMargin, options.lines);
@@ -1005,8 +1112,14 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
return html;
}
+ /**
+ * Generates the HTML markup for the action button.
+ * @param {Object} item - Item used to generate the action button.
+ * @param {string} text - Text of the action button.
+ * @param {string} serverId - ID of the server.
+ * @returns {string} HTML markup of the action button.
+ */
function getTextActionButton(item, text, serverId) {
-
if (!text) {
text = itemHelper.getDisplayName(item);
}
@@ -1015,18 +1128,22 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
return text;
}
- var html = '';
}
- var cardScalableClass = 'cardScalable';
+ let cardScalableClass = 'cardScalable';
cardImageContainerOpen = '
';
- var btnCssClass = 'cardOverlayButton cardOverlayButton-hover itemAction paper-icon-button-light';
+ const btnCssClass = 'cardOverlayButton cardOverlayButton-hover itemAction paper-icon-button-light';
if (playbackManager.canPlay(item)) {
html += '';
}
- html += '
';
+ html += '
';
- var userData = item.UserData || {};
+ const userData = item.UserData || {};
if (itemHelper.canMarkPlayed(item)) {
require(['emby-playstatebutton']);
@@ -1468,7 +1574,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
if (itemHelper.canRate(item)) {
- var likes = userData.Likes == null ? '' : userData.Likes;
+ const likes = userData.Likes == null ? '' : userData.Likes;
require(['emby-ratingbutton']);
html += '';
@@ -1482,9 +1588,15 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
return html;
}
- function getDefaultText(item, options) {
+ /**
+ * Generates the text or icon used for default card backgrounds.
+ * @param {object} item - Item used to generate the card overlay.
+ * @param {object} options - Options used to generate the card overlay.
+ * @returns {string} HTML markup of the card overlay.
+ */
+ export function getDefaultText(item, options) {
if (item.CollectionType) {
- return '' + imageHelper.getLibraryIcon(item.CollectionType) + ''
+ return '';
}
switch (item.Type) {
@@ -1507,12 +1619,16 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
return '' + options.defaultCardImageIcon + '';
}
- var defaultName = isUsingLiveTvNaming(item) ? item.Name : itemHelper.getDisplayName(item);
+ const defaultName = isUsingLiveTvNaming(item) ? item.Name : itemHelper.getDisplayName(item);
return '
' + defaultName + '
';
}
- function buildCards(items, options) {
-
+ /**
+ * Builds a set of cards and inserts them into the page.
+ * @param {Array} items - Array of items used to build the cards.
+ * @param {options} options - Options of the cards to build.
+ */
+ export function buildCards(items, options) {
// Abort if the container has been disposed
if (!document.body.contains(options.itemsContainer)) {
return;
@@ -1527,7 +1643,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
}
}
- var html = buildCardsHtmlInternal(items, options);
+ const html = buildCardsHtmlInternal(items, options);
if (html) {
@@ -1553,8 +1669,13 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
}
}
+ /**
+ * Ensures the indicators for a card exist and creates them if they don't exist.
+ * @param {HTMLDivElement} card - DOM element of the card.
+ * @param {HTMLDivElement} indicatorsElem - DOM element of the indicators.
+ * @returns {HTMLDivElement} - DOM element of the indicators.
+ */
function ensureIndicators(card, indicatorsElem) {
-
if (indicatorsElem) {
return indicatorsElem;
}
@@ -1563,7 +1684,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
if (!indicatorsElem) {
- var cardImageContainer = card.querySelector('.cardImageContainer');
+ const cardImageContainer = card.querySelector('.cardImageContainer');
indicatorsElem = document.createElement('div');
indicatorsElem.classList.add('cardIndicators');
cardImageContainer.appendChild(indicatorsElem);
@@ -1572,14 +1693,18 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
return indicatorsElem;
}
+ /**
+ * Adds user data to the card such as progress indicators and played status.
+ * @param {HTMLDivElement} card - DOM element of the card.
+ * @param {Object} userData - User data to apply to the card.
+ */
function updateUserData(card, userData) {
-
- var type = card.getAttribute('data-type');
- var enableCountIndicator = type === 'Series' || type === 'BoxSet' || type === 'Season';
- var indicatorsElem = null;
- var playedIndicator = null;
- var countIndicator = null;
- var itemProgressBar = null;
+ const type = card.getAttribute('data-type');
+ const enableCountIndicator = type === 'Series' || type === 'BoxSet' || type === 'Season';
+ let indicatorsElem = null;
+ let playedIndicator = null;
+ let countIndicator = null;
+ let itemProgressBar = null;
if (userData.Played) {
@@ -1622,7 +1747,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
}
}
- var progressHtml = indicators.getProgressBarHtml({
+ const progressHtml = indicators.getProgressBarHtml({
Type: type,
UserData: userData,
MediaType: 'Video'
@@ -1636,11 +1761,11 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
itemProgressBar = document.createElement('div');
itemProgressBar.classList.add('itemProgressBar');
- var innerCardFooter = card.querySelector('.innerCardFooter');
+ let innerCardFooter = card.querySelector('.innerCardFooter');
if (!innerCardFooter) {
innerCardFooter = document.createElement('div');
innerCardFooter.classList.add('innerCardFooter');
- var cardImageContainer = card.querySelector('.cardImageContainer');
+ const cardImageContainer = card.querySelector('.cardImageContainer');
cardImageContainer.appendChild(innerCardFooter);
}
innerCardFooter.appendChild(itemProgressBar);
@@ -1656,37 +1781,50 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
}
}
- function onUserDataChanged(userData, scope) {
+ /**
+ * Handles when user data has changed.
+ * @param {Object} userData - User data to apply to the card.
+ * @param {HTMLElement} scope - DOM element to use as a scope when selecting cards.
+ */
+ export function onUserDataChanged(userData, scope) {
+ const cards = (scope || document.body).querySelectorAll('.card-withuserdata[data-id="' + userData.ItemId + '"]');
- var cards = (scope || document.body).querySelectorAll('.card-withuserdata[data-id="' + userData.ItemId + '"]');
-
- for (var i = 0, length = cards.length; i < length; i++) {
+ for (let i = 0, length = cards.length; i < length; i++) {
updateUserData(cards[i], userData);
}
}
- function onTimerCreated(programId, newTimerId, itemsContainer) {
+ /**
+ * Handles when a timer has been created.
+ * @param {string} programId - ID of the program.
+ * @param {string} newTimerId - ID of the new timer.
+ * @param {HTMLElement} itemsContainer - DOM element of the itemsContainer.
+ */
+ export function onTimerCreated(programId, newTimerId, itemsContainer) {
+ const cells = itemsContainer.querySelectorAll('.card[data-id="' + programId + '"]');
- var cells = itemsContainer.querySelectorAll('.card[data-id="' + programId + '"]');
-
- for (var i = 0, length = cells.length; i < length; i++) {
- var cell = cells[i];
- var icon = cell.querySelector('.timerIndicator');
+ for (let i = 0, length = cells.length; i < length; i++) {
+ let cell = cells[i];
+ const icon = cell.querySelector('.timerIndicator');
if (!icon) {
- var indicatorsElem = ensureIndicators(cell);
+ const indicatorsElem = ensureIndicators(cell);
indicatorsElem.insertAdjacentHTML('beforeend', '');
}
cell.setAttribute('data-timerid', newTimerId);
}
}
- function onTimerCancelled(id, itemsContainer) {
+ /**
+ * Handles when a timer has been cancelled.
+ * @param {string} timerId - ID of the cancelled timer.
+ * @param {HTMLElement} itemsContainer - DOM element of the itemsContainer.
+ */
+ export function onTimerCancelled(timerId, itemsContainer) {
+ const cells = itemsContainer.querySelectorAll('.card[data-timerid="' + timerId + '"]');
- var cells = itemsContainer.querySelectorAll('.card[data-timerid="' + id + '"]');
-
- for (var i = 0, length = cells.length; i < length; i++) {
- var cell = cells[i];
- var icon = cell.querySelector('.timerIndicator');
+ for (let i = 0; i < cells.length; i++) {
+ let cell = cells[i];
+ let icon = cell.querySelector('.timerIndicator');
if (icon) {
icon.parentNode.removeChild(icon);
}
@@ -1694,13 +1832,17 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
}
}
- function onSeriesTimerCancelled(id, itemsContainer) {
+ /**
+ * Handles when a series timer has been cancelled.
+ * @param {string} cancelledTimerId - ID of the cancelled timer.
+ * @param {HTMLElement} itemsContainer - DOM element of the itemsContainer.
+ */
+ export function onSeriesTimerCancelled(cancelledTimerId, itemsContainer) {
+ const cells = itemsContainer.querySelectorAll('.card[data-seriestimerid="' + cancelledTimerId + '"]');
- var cells = itemsContainer.querySelectorAll('.card[data-seriestimerid="' + id + '"]');
-
- for (var i = 0, length = cells.length; i < length; i++) {
- var cell = cells[i];
- var icon = cell.querySelector('.timerIndicator');
+ for (let i = 0; i < cells.length; i++) {
+ let cell = cells[i];
+ let icon = cell.querySelector('.timerIndicator');
if (icon) {
icon.parentNode.removeChild(icon);
}
@@ -1708,14 +1850,15 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
}
}
- return {
- getCardsHtml: getCardsHtml,
- getDefaultBackgroundClass: getDefaultBackgroundClass,
- getDefaultText: getDefaultText,
- buildCards: buildCards,
- onUserDataChanged: onUserDataChanged,
- onTimerCreated: onTimerCreated,
- onTimerCancelled: onTimerCancelled,
- onSeriesTimerCancelled: onSeriesTimerCancelled
- };
- });
+/* eslint-enable indent */
+
+export default {
+ getCardsHtml: getCardsHtml,
+ getDefaultBackgroundClass: getDefaultBackgroundClass,
+ getDefaultText: getDefaultText,
+ buildCards: buildCards,
+ onUserDataChanged: onUserDataChanged,
+ onTimerCreated: onTimerCreated,
+ onTimerCancelled: onTimerCancelled,
+ onSeriesTimerCancelled: onSeriesTimerCancelled
+};
diff --git a/src/components/cardbuilder/chaptercardbuilder.js b/src/components/cardbuilder/chaptercardbuilder.js
index 02d583abc0..16326b6c59 100644
--- a/src/components/cardbuilder/chaptercardbuilder.js
+++ b/src/components/cardbuilder/chaptercardbuilder.js
@@ -68,7 +68,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'layoutManager', 'browse
return apiClient.getScaledImageUrl(item.Id, {
- maxWidth: maxWidth,
+ maxWidth: maxWidth * 2,
tag: chapter.ImageTag,
type: "Chapter",
index: index
diff --git a/src/components/castSenderApi.js b/src/components/castSenderApi.js
new file mode 100644
index 0000000000..a1e7bd8755
--- /dev/null
+++ b/src/components/castSenderApi.js
@@ -0,0 +1,34 @@
+define([], function() {
+ 'use strict';
+
+ if (window.appMode === "cordova" || window.appMode === "android") {
+ return {
+ load: function () {
+ window.chrome = window.chrome || {};
+ return Promise.resolve();
+ }
+ };
+ } else {
+ var ccLoaded = false;
+ return {
+ load: function () {
+ if (ccLoaded) {
+ return Promise.resolve();
+ }
+
+ return new Promise(function (resolve, reject) {
+ var fileref = document.createElement("script");
+ fileref.setAttribute("type", "text/javascript");
+
+ fileref.onload = function () {
+ ccLoaded = true;
+ resolve();
+ };
+
+ fileref.setAttribute("src", "https://www.gstatic.com/cv/js/sender/v1/cast_sender.js");
+ document.querySelector("head").appendChild(fileref);
+ });
+ }
+ };
+ }
+});
diff --git a/src/components/channelmapper/channelmapper.js b/src/components/channelmapper/channelmapper.js
index 1b536f440b..2ea7a3a13a 100644
--- a/src/components/channelmapper/channelmapper.js
+++ b/src/components/channelmapper/channelmapper.js
@@ -1,18 +1,7 @@
-define(["dialogHelper", "loading", "connectionManager", "globalize", "actionsheet", "emby-input", "paper-icon-button-light", "emby-button", "listViewStyle", "material-icons", "formDialogStyle"], function (dialogHelper, loading, connectionManager, globalize, actionsheet) {
+define(["dom", "dialogHelper", "loading", "connectionManager", "globalize", "actionsheet", "emby-input", "paper-icon-button-light", "emby-button", "listViewStyle", "material-icons", "formDialogStyle"], function (dom, dialogHelper, loading, connectionManager, globalize, actionsheet) {
"use strict";
return function (options) {
- function parentWithClass(elem, className) {
- while (!elem.classList || !elem.classList.contains(className)) {
- elem = elem.parentNode;
- if (!elem) {
- return null;
- }
- }
-
- return elem;
- }
-
function mapChannel(button, channelId, providerChannelId) {
loading.show();
var providerId = options.providerId;
@@ -26,7 +15,7 @@ define(["dialogHelper", "loading", "connectionManager", "globalize", "actionshee
},
dataType: "json"
}).then(function (mapping) {
- var listItem = parentWithClass(button, "listItem");
+ var listItem = dom.parentWithClass(button, "listItem");
button.setAttribute("data-providerid", mapping.ProviderChannelId);
listItem.querySelector(".secondary").innerHTML = getMappingSecondaryName(mapping, currentMappingOptions.ProviderName);
loading.hide();
@@ -34,7 +23,7 @@ define(["dialogHelper", "loading", "connectionManager", "globalize", "actionshee
}
function onChannelsElementClick(e) {
- var btnMap = parentWithClass(e.target, "btnMap");
+ var btnMap = dom.parentWithClass(e.target, "btnMap");
if (btnMap) {
var channelId = btnMap.getAttribute("data-id");
diff --git a/src/components/collectioneditor/collectioneditor.js b/src/components/collectioneditor/collectioneditor.js
index 79220ac335..49784df498 100644
--- a/src/components/collectioneditor/collectioneditor.js
+++ b/src/components/collectioneditor/collectioneditor.js
@@ -1,25 +1,12 @@
-define(['dialogHelper', 'loading', 'apphost', 'layoutManager', 'connectionManager', 'appRouter', 'globalize', 'emby-checkbox', 'emby-input', 'paper-icon-button-light', 'emby-select', 'material-icons', 'css!./../formdialog', 'emby-button', 'flexStyles'], function (dialogHelper, loading, appHost, layoutManager, connectionManager, appRouter, globalize) {
+define(['dom', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'connectionManager', 'appRouter', 'globalize', 'emby-checkbox', 'emby-input', 'paper-icon-button-light', 'emby-select', 'material-icons', 'css!./../formdialog', 'emby-button', 'flexStyles'], function (dom, dialogHelper, loading, appHost, layoutManager, connectionManager, appRouter, globalize) {
'use strict';
var currentServerId;
- function parentWithClass(elem, className) {
-
- while (!elem.classList || !elem.classList.contains(className)) {
- elem = elem.parentNode;
-
- if (!elem) {
- return null;
- }
- }
-
- return elem;
- }
-
function onSubmit(e) {
loading.show();
- var panel = parentWithClass(this, 'dialog');
+ var panel = dom.parentWithClass(this, 'dialog');
var collectionId = panel.querySelector('#selectCollectionToAddTo').value;
diff --git a/src/components/confirm/confirm.js b/src/components/confirm/confirm.js
index f104350c87..fa9a156679 100644
--- a/src/components/confirm/confirm.js
+++ b/src/components/confirm/confirm.js
@@ -1,40 +1,65 @@
-define(['dialog', 'globalize'], function (dialog, globalize) {
+define(["browser", "dialog", "globalize"], function(browser, dialog, globalize) {
'use strict';
- return function (text, title) {
+ function replaceAll(str, find, replace) {
+ return str.split(find).join(replace);
+ }
- var options;
- if (typeof text === 'string') {
- options = {
- title: title,
- text: text
- };
- } else {
- options = text;
- }
-
- var items = [];
-
- items.push({
- name: options.cancelText || globalize.translate('ButtonCancel'),
- id: 'cancel',
- type: 'cancel'
- });
-
- items.push({
- name: options.confirmText || globalize.translate('ButtonOk'),
- id: 'ok',
- type: options.primary === 'delete' ? 'delete' : 'submit'
- });
-
- options.buttons = items;
-
- return dialog(options).then(function (result) {
- if (result === 'ok') {
- return Promise.resolve();
+ if (browser.tv && window.confirm) {
+ // Use the native confirm dialog
+ return function (options) {
+ if (typeof options === 'string') {
+ options = {
+ title: '',
+ text: options
+ };
}
- return Promise.reject();
- });
- };
+ var text = replaceAll(options.text || '', ' ', '\n');
+ var result = confirm(text);
+
+ if (result) {
+ return Promise.resolve();
+ } else {
+ return Promise.reject();
+ }
+ };
+ } else {
+ // Use our own dialog
+ return function (text, title) {
+ var options;
+ if (typeof text === 'string') {
+ options = {
+ title: title,
+ text: text
+ };
+ } else {
+ options = text;
+ }
+
+ var items = [];
+
+ items.push({
+ name: options.cancelText || globalize.translate('ButtonCancel'),
+ id: 'cancel',
+ type: 'cancel'
+ });
+
+ items.push({
+ name: options.confirmText || globalize.translate('ButtonOk'),
+ id: 'ok',
+ type: options.primary === 'delete' ? 'delete' : 'submit'
+ });
+
+ options.buttons = items;
+
+ return dialog(options).then(function (result) {
+ if (result === 'ok') {
+ return Promise.resolve();
+ }
+
+ return Promise.reject();
+ });
+ };
+ }
});
diff --git a/src/components/confirm/nativeconfirm.js b/src/components/confirm/nativeconfirm.js
deleted file mode 100644
index 7d72bc5eaf..0000000000
--- a/src/components/confirm/nativeconfirm.js
+++ /dev/null
@@ -1,27 +0,0 @@
-define([], function () {
- 'use strict';
-
- function replaceAll(str, find, replace) {
-
- return str.split(find).join(replace);
- }
-
- return function (options) {
-
- if (typeof options === 'string') {
- options = {
- title: '',
- text: options
- };
- }
-
- var text = replaceAll(options.text || '', ' ', '\n');
- var result = confirm(text);
-
- if (result) {
- return Promise.resolve();
- } else {
- return Promise.reject();
- }
- };
-});
diff --git a/src/components/dialogHelper/dialogHelper.js b/src/components/dialogHelper/dialogHelper.js
index 6ee96df318..e3410776a8 100644
--- a/src/components/dialogHelper/dialogHelper.js
+++ b/src/components/dialogHelper/dialogHelper.js
@@ -169,6 +169,15 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
}, {
passive: true
});
+
+ dom.addEventListener((dlg.dialogContainer || backdrop), 'contextmenu', function (e) {
+ if (e.target === dlg.dialogContainer) {
+ // Close the application dialog menu
+ close(dlg);
+ // Prevent the default browser context menu from appearing
+ e.preventDefault();
+ }
+ });
}
function isHistoryEnabled(dlg) {
@@ -242,9 +251,15 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
var onAnimationFinish = function () {
focusManager.pushScope(dlg);
+
if (dlg.getAttribute('data-autofocus') === 'true') {
focusManager.autoFocus(dlg);
}
+
+ if (document.activeElement && !dlg.contains(document.activeElement)) {
+ // Blur foreign element to prevent triggering of an action from the previous scope
+ document.activeElement.blur();
+ }
};
if (enableAnimation()) {
diff --git a/src/components/directorybrowser/directorybrowser.js b/src/components/directorybrowser/directorybrowser.js
index b71f7bbb05..1d5c23eb1f 100644
--- a/src/components/directorybrowser/directorybrowser.js
+++ b/src/components/directorybrowser/directorybrowser.js
@@ -89,7 +89,7 @@ define(['loading', 'dialogHelper', 'dom', 'listViewStyle', 'emby-input', 'paper-
var instruction = options.instruction ? options.instruction + "
" : "";
html += '
';
html += instruction;
- html += Globalize.translate("MessageDirectoryPickerInstruction").replace("{0}", "\\\\server").replace("{1}", "\\\\192.168.1.101");
+ html += Globalize.translate("MessageDirectoryPickerInstruction", "\\\\server", "\\\\192.168.1.101");
if ("bsd" === systemInfo.OperatingSystem.toLowerCase()) {
html += " ";
html += " ";
@@ -163,16 +163,15 @@ define(['loading', 'dialogHelper', 'dom', 'listViewStyle', 'emby-input', 'paper-
}
}).catch(function(response) {
if (response) {
- // TODO All alerts (across the project), should use Globalize.translate()
if (response.status === 404) {
- alertText("The path could not be found. Please ensure the path is valid and try again.");
+ alertText(Globalize.translate("PathNotFound"));
return Promise.reject();
}
if (response.status === 500) {
if (validateWriteable) {
- alertText("Jellyfin Server requires write access to this folder. Please ensure write access and try again.");
+ alertText(Globalize.translate("WriteAccessRequired"));
} else {
- alertText("The path could not be found. Please ensure the path is valid and try again.")
+ alertText(Globalize.translate("PathNotFound"))
}
return Promise.reject()
}
diff --git a/src/components/displaysettings/displaysettings.template.html b/src/components/displaysettings/displaysettings.template.html
index 16bbf0dd8a..4ef8c8b1ca 100644
--- a/src/components/displaysettings/displaysettings.template.html
+++ b/src/components/displaysettings/displaysettings.template.html
@@ -63,7 +63,7 @@
';
diff --git a/src/components/htmlvideoplayer/plugin.js b/src/components/htmlvideoplayer/plugin.js
index 3ac45aabb9..97056f80ff 100644
--- a/src/components/htmlvideoplayer/plugin.js
+++ b/src/components/htmlvideoplayer/plugin.js
@@ -80,7 +80,6 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
if (track) {
var format = (track.Codec || '').toLowerCase();
if (format === 'ssa' || format === 'ass') {
- // libjass is needed here
return false;
}
}
@@ -1047,7 +1046,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
lastCustomTrackMs = 0;
}
- function renderWithSubtitlesOctopus(videoElement, track, item) {
+ function renderSsaAss(videoElement, track, item) {
var attachments = self._currentPlayOptions.mediaSource.MediaAttachments || [];
var options = {
video: videoElement,
@@ -1056,91 +1055,28 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
return i.DeliveryUrl;
}),
workerUrl: appRouter.baseUrl() + "/libraries/subtitles-octopus-worker.js",
+ legacyWorkerUrl: appRouter.baseUrl() + "/libraries/subtitles-octopus-worker-legacy.js",
onError: function() {
- htmlMediaHelper.onErrorInternal(self, 'mediadecodeerror')
- }
+ htmlMediaHelper.onErrorInternal(self, 'mediadecodeerror');
+ },
+
+ // new octopus options; override all, even defaults
+ renderMode: 'blend',
+ dropAllAnimations: false,
+ libassMemoryLimit: 40,
+ libassGlyphLimit: 40,
+ targetFps: 24,
+ prescaleTradeoff: 0.8,
+ softHeightLimit: 1080,
+ hardHeightLimit: 2160,
+ resizeVariation: 0.2,
+ renderAhead: 90
};
require(['JavascriptSubtitlesOctopus'], function(SubtitlesOctopus) {
currentSubtitlesOctopus = new SubtitlesOctopus(options);
});
}
- function renderWithLibjass(videoElement, track, item) {
-
- var rendererSettings = {};
-
- if (browser.ps4) {
- // Text outlines are not rendering very well
- rendererSettings.enableSvg = false;
- } else if (browser.edge || browser.msie) {
- // svg not rendering at all
- rendererSettings.enableSvg = false;
- }
-
- // probably safer to just disable everywhere
- rendererSettings.enableSvg = false;
-
- require(['libjass', 'ResizeObserver'], function (libjass, ResizeObserver) {
-
- libjass.ASS.fromUrl(getTextTrackUrl(track, item)).then(function (ass) {
-
- var clock = new libjass.renderers.ManualClock();
- currentClock = clock;
-
- // Create a DefaultRenderer using the video element and the ASS object
- var renderer = new libjass.renderers.WebRenderer(ass, clock, videoElement.parentNode, rendererSettings);
-
- currentAssRenderer = renderer;
-
- renderer.addEventListener("ready", function () {
- try {
- renderer.resize(videoElement.offsetWidth, videoElement.offsetHeight, 0, 0);
-
- if (!self._resizeObserver) {
- self._resizeObserver = new ResizeObserver(onVideoResize, {});
- self._resizeObserver.observe(videoElement);
- }
- //clock.pause();
- } catch (ex) {
- //alert(ex);
- }
- });
- }, function () {
- htmlMediaHelper.onErrorInternal(self, 'mediadecodeerror');
- });
- });
- }
-
- function renderSsaAss(videoElement, track, item) {
- if (supportsCanvas() && supportsWebWorkers()) {
- console.debug('rendering subtitles with SubtitlesOctopus');
- renderWithSubtitlesOctopus(videoElement, track, item);
- } else {
- console.debug('rendering subtitles with libjass');
- renderWithLibjass(videoElement, track, item);
- }
- }
-
- function onVideoResize() {
- if (browser.iOS) {
- // the new sizes will be delayed for about 500ms with wkwebview
- setTimeout(resetVideoRendererSize, 500);
- } else {
- resetVideoRendererSize();
- }
- }
-
- function resetVideoRendererSize() {
- var renderer = currentAssRenderer;
- if (renderer) {
- var videoElement = self._mediaElement;
- var width = videoElement.offsetWidth;
- var height = videoElement.offsetHeight;
- console.debug('videoElement resized: ' + width + 'x' + height);
- renderer.resize(width, height, 0, 0);
- }
- }
-
function requiresCustomSubtitlesElement() {
// after a system update, ps4 isn't showing anything when creating a track element dynamically
@@ -1230,7 +1166,6 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
if (!itemHelper.isLocalItem(item) || track.IsExternal) {
var format = (track.Codec || '').toLowerCase();
if (format === 'ssa' || format === 'ass') {
- // libjass is needed here
renderSsaAss(videoElement, track, item);
return;
}
diff --git a/src/components/humanedate.js b/src/components/humanedate.js
deleted file mode 100644
index 26ce26d942..0000000000
--- a/src/components/humanedate.js
+++ /dev/null
@@ -1,74 +0,0 @@
-define(["datetime"], function (datetime) {
- "use strict";
-
- function humaneDate(date_str) {
- var format;
- var time_formats = [
- [90, "a minute"],
- [3600, "minutes", 60],
- [5400, "an hour"],
- [86400, "hours", 3600],
- [129600, "a day"],
- [604800, "days", 86400],
- [907200, "a week"],
- [2628e3, "weeks", 604800],
- [3942e3, "a month"],
- [31536e3, "months", 2628e3],
- [47304e3, "a year"],
- [31536e5, "years", 31536e3]
- ];
- var dt = new Date();
- var date = datetime.parseISO8601Date(date_str, true);
- var seconds = (dt - date) / 1000.0;
- var i = 0;
-
- if (seconds < 0) {
- seconds = Math.abs(seconds);
- }
- // eslint-disable-next-line no-cond-assign
- for (; format = time_formats[i++];) {
- if (seconds < format[0]) {
- if (2 == format.length) {
- return format[1] + " ago";
- }
-
- return Math.round(seconds / format[2]) + " " + format[1] + " ago";
- }
- }
-
- if (seconds > 47304e5) {
- return Math.round(seconds / 47304e5) + " centuries ago";
- }
-
- return date_str;
- }
-
- function humaneElapsed(firstDateStr, secondDateStr) {
- // TODO replace this whole script with a library or something
- var dateOne = new Date(firstDateStr);
- var dateTwo = new Date(secondDateStr);
- var delta = (dateTwo.getTime() - dateOne.getTime()) / 1e3;
- var days = Math.floor(delta % 31536e3 / 86400);
- var hours = Math.floor(delta % 31536e3 % 86400 / 3600);
- var minutes = Math.floor(delta % 31536e3 % 86400 % 3600 / 60);
- var seconds = Math.round(delta % 31536e3 % 86400 % 3600 % 60);
- var elapsed = "";
- elapsed += 1 == days ? days + " day " : "";
- elapsed += days > 1 ? days + " days " : "";
- elapsed += 1 == hours ? hours + " hour " : "";
- elapsed += hours > 1 ? hours + " hours " : "";
- elapsed += 1 == minutes ? minutes + " minute " : "";
- elapsed += minutes > 1 ? minutes + " minutes " : "";
- elapsed += elapsed.length > 0 ? "and " : "";
- elapsed += 1 == seconds ? seconds + " second" : "";
- elapsed += 0 == seconds || seconds > 1 ? seconds + " seconds" : "";
- return elapsed;
- }
-
- window.humaneDate = humaneDate;
- window.humaneElapsed = humaneElapsed;
- return {
- humaneDate: humaneDate,
- humaneElapsed: humaneElapsed
- };
-});
diff --git a/src/components/imagedownloader/imagedownloader.js b/src/components/imagedownloader/imagedownloader.js
index ce53b5cf0d..9df083aea2 100644
--- a/src/components/imagedownloader/imagedownloader.js
+++ b/src/components/imagedownloader/imagedownloader.js
@@ -1,4 +1,4 @@
-define(['loading', 'apphost', 'dialogHelper', 'connectionManager', 'imageLoader', 'browser', 'layoutManager', 'scrollHelper', 'globalize', 'require', 'emby-checkbox', 'paper-icon-button-light', 'emby-button', 'formDialogStyle', 'cardStyle'], function (loading, appHost, dialogHelper, connectionManager, imageLoader, browser, layoutManager, scrollHelper, globalize, require) {
+define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'imageLoader', 'browser', 'layoutManager', 'scrollHelper', 'globalize', 'require', 'emby-checkbox', 'paper-icon-button-light', 'emby-button', 'formDialogStyle', 'cardStyle'], function (dom, loading, appHost, dialogHelper, connectionManager, imageLoader, browser, layoutManager, scrollHelper, globalize, require) {
'use strict';
var enableFocusTransform = !browser.slow && !browser.edge;
@@ -109,7 +109,7 @@ define(['loading', 'apphost', 'dialogHelper', 'connectionManager', 'imageLoader'
html += '';
var startAtDisplay = totalRecordCount ? startIndex + 1 : 0;
- html += startAtDisplay + '-' + recordsEnd + ' of ' + totalRecordCount;
+ html += globalize.translate("ListPaging", startAtDisplay, recordsEnd, totalRecordCount);
html += '';
@@ -126,21 +126,7 @@ define(['loading', 'apphost', 'dialogHelper', 'connectionManager', 'imageLoader'
return html;
}
- function parentWithClass(elem, className) {
-
- while (!elem.classList || !elem.classList.contains(className)) {
- elem = elem.parentNode;
-
- if (!elem) {
- return null;
- }
- }
-
- return elem;
- }
-
function downloadRemoteImage(page, apiClient, url, type, provider) {
-
var options = getBaseRemoteOptions();
options.Type = type;
@@ -152,7 +138,7 @@ define(['loading', 'apphost', 'dialogHelper', 'connectionManager', 'imageLoader'
apiClient.downloadRemoteImage(options).then(function () {
hasChanges = true;
- var dlg = parentWithClass(page, 'dialog');
+ var dlg = dom.parentWithClass(page, 'dialog');
dialogHelper.close(dlg);
});
}
@@ -162,7 +148,6 @@ define(['loading', 'apphost', 'dialogHelper', 'connectionManager', 'imageLoader'
}
function getRemoteImageHtml(image, imageType, apiClient) {
-
var tagName = layoutManager.tv ? 'button' : 'div';
var enableFooterButtons = !layoutManager.tv;
@@ -293,7 +278,6 @@ define(['loading', 'apphost', 'dialogHelper', 'connectionManager', 'imageLoader'
}
function initEditor(page, apiClient) {
-
page.querySelector('#selectBrowsableImageType').addEventListener('change', function () {
browsableImageType = this.value;
browsableImageStartIndex = 0;
@@ -319,14 +303,14 @@ define(['loading', 'apphost', 'dialogHelper', 'connectionManager', 'imageLoader'
page.addEventListener('click', function (e) {
- var btnDownloadRemoteImage = parentWithClass(e.target, 'btnDownloadRemoteImage');
+ var btnDownloadRemoteImage = dom.parentWithClass(e.target, 'btnDownloadRemoteImage');
if (btnDownloadRemoteImage) {
- var card = parentWithClass(btnDownloadRemoteImage, 'card');
+ var card = dom.parentWithClass(btnDownloadRemoteImage, 'card');
downloadRemoteImage(page, apiClient, card.getAttribute('data-imageurl'), card.getAttribute('data-imagetype'), card.getAttribute('data-imageprovider'));
return;
}
- var btnImageCard = parentWithClass(e.target, 'btnImageCard');
+ var btnImageCard = dom.parentWithClass(e.target, 'btnImageCard');
if (btnImageCard) {
downloadRemoteImage(page, apiClient, btnImageCard.getAttribute('data-imageurl'), btnImageCard.getAttribute('data-imagetype'), btnImageCard.getAttribute('data-imageprovider'));
}
@@ -334,7 +318,6 @@ define(['loading', 'apphost', 'dialogHelper', 'connectionManager', 'imageLoader'
}
function showEditor(itemId, serverId, itemType) {
-
loading.show();
require(['text!./imagedownloader.template.html'], function (template) {
@@ -380,7 +363,6 @@ define(['loading', 'apphost', 'dialogHelper', 'connectionManager', 'imageLoader'
}
function onDialogClosed() {
-
var dlg = this;
if (layoutManager.tv) {
@@ -397,9 +379,7 @@ define(['loading', 'apphost', 'dialogHelper', 'connectionManager', 'imageLoader'
return {
show: function (itemId, serverId, itemType, imageType) {
-
return new Promise(function (resolve, reject) {
-
currentResolve = resolve;
currentReject = reject;
hasChanges = false;
diff --git a/src/components/serverNotifications/gamepadtokey.js b/src/components/input/gamepadtokey.js
similarity index 64%
rename from src/components/serverNotifications/gamepadtokey.js
rename to src/components/input/gamepadtokey.js
index 7705aed71f..5356bcbb45 100644
--- a/src/components/serverNotifications/gamepadtokey.js
+++ b/src/components/input/gamepadtokey.js
@@ -251,114 +251,150 @@ require(['apphost'], function (appHost) {
}
}
+ var inputLoopTimer;
function runInputLoop() {
// Get the latest gamepad state.
- var gamepads;
- if (navigator.getGamepads) {
- gamepads = navigator.getGamepads();
- } else if (navigator.webkitGetGamepads) {
- gamepads = navigator.webkitGetGamepads();
- }
- gamepads = gamepads || [];
- var i;
- var j;
- var len;
- for (i = 0, len = gamepads.length; i < len; i++) {
+ var gamepads = navigator.getGamepads();
+ for (var i = 0, len = gamepads.length; i < len; i++) {
var gamepad = gamepads[i];
- if (gamepad) {
- // Iterate through the axes
- var axes = gamepad.axes;
- var leftStickX = axes[0];
- var leftStickY = axes[1];
- if (leftStickX > _THUMB_STICK_THRESHOLD) { // Right
- _ButtonPressedState.setleftThumbstickRight(true);
- } else if (leftStickX < -_THUMB_STICK_THRESHOLD) { // Left
- _ButtonPressedState.setleftThumbstickLeft(true);
- } else if (leftStickY < -_THUMB_STICK_THRESHOLD) { // Up
- _ButtonPressedState.setleftThumbstickUp(true);
- } else if (leftStickY > _THUMB_STICK_THRESHOLD) { // Down
- _ButtonPressedState.setleftThumbstickDown(true);
- } else {
- _ButtonPressedState.setleftThumbstickLeft(false);
- _ButtonPressedState.setleftThumbstickRight(false);
- _ButtonPressedState.setleftThumbstickUp(false);
- _ButtonPressedState.setleftThumbstickDown(false);
- }
- // Iterate through the buttons to see if Left thumbstick, DPad, A and B are pressed.
- var buttons = gamepad.buttons;
- for (j = 0, len = buttons.length; j < len; j++) {
- if (ProcessedButtons.indexOf(j) !== -1) {
-
- if (buttons[j].pressed) {
- switch (j) {
- case _GAMEPAD_DPAD_UP_BUTTON_INDEX:
- _ButtonPressedState.setdPadUp(true);
- break;
- case _GAMEPAD_DPAD_DOWN_BUTTON_INDEX:
- _ButtonPressedState.setdPadDown(true);
- break;
- case _GAMEPAD_DPAD_LEFT_BUTTON_INDEX:
- _ButtonPressedState.setdPadLeft(true);
- break;
- case _GAMEPAD_DPAD_RIGHT_BUTTON_INDEX:
- _ButtonPressedState.setdPadRight(true);
- break;
- case _GAMEPAD_A_BUTTON_INDEX:
- _ButtonPressedState.setgamepadA(true);
- break;
- case _GAMEPAD_B_BUTTON_INDEX:
- _ButtonPressedState.setgamepadB(true);
- break;
- default:
- // No-op
- break;
- }
- } else {
- switch (j) {
- case _GAMEPAD_DPAD_UP_BUTTON_INDEX:
- if (_ButtonPressedState.getdPadUp()) {
- _ButtonPressedState.setdPadUp(false);
- }
- break;
- case _GAMEPAD_DPAD_DOWN_BUTTON_INDEX:
- if (_ButtonPressedState.getdPadDown()) {
- _ButtonPressedState.setdPadDown(false);
- }
- break;
- case _GAMEPAD_DPAD_LEFT_BUTTON_INDEX:
- if (_ButtonPressedState.getdPadLeft()) {
- _ButtonPressedState.setdPadLeft(false);
- }
- break;
- case _GAMEPAD_DPAD_RIGHT_BUTTON_INDEX:
- if (_ButtonPressedState.getdPadRight()) {
- _ButtonPressedState.setdPadRight(false);
- }
- break;
- case _GAMEPAD_A_BUTTON_INDEX:
- if (_ButtonPressedState.getgamepadA()) {
- _ButtonPressedState.setgamepadA(false);
- }
- break;
- case _GAMEPAD_B_BUTTON_INDEX:
- if (_ButtonPressedState.getgamepadB()) {
- _ButtonPressedState.setgamepadB(false);
- }
- break;
- default:
- // No-op
- break;
- }
+ if (!gamepad) {
+ continue;
+ }
+ // Iterate through the axes
+ var axes = gamepad.axes;
+ var leftStickX = axes[0];
+ var leftStickY = axes[1];
+ if (leftStickX > _THUMB_STICK_THRESHOLD) { // Right
+ _ButtonPressedState.setleftThumbstickRight(true);
+ } else if (leftStickX < -_THUMB_STICK_THRESHOLD) { // Left
+ _ButtonPressedState.setleftThumbstickLeft(true);
+ } else if (leftStickY < -_THUMB_STICK_THRESHOLD) { // Up
+ _ButtonPressedState.setleftThumbstickUp(true);
+ } else if (leftStickY > _THUMB_STICK_THRESHOLD) { // Down
+ _ButtonPressedState.setleftThumbstickDown(true);
+ } else {
+ _ButtonPressedState.setleftThumbstickLeft(false);
+ _ButtonPressedState.setleftThumbstickRight(false);
+ _ButtonPressedState.setleftThumbstickUp(false);
+ _ButtonPressedState.setleftThumbstickDown(false);
+ }
+ // Iterate through the buttons to see if Left thumbstick, DPad, A and B are pressed.
+ var buttons = gamepad.buttons;
+ for (var j = 0, len = buttons.length; j < len; j++) {
+ if (ProcessedButtons.indexOf(j) !== -1) {
+ if (buttons[j].pressed) {
+ switch (j) {
+ case _GAMEPAD_DPAD_UP_BUTTON_INDEX:
+ _ButtonPressedState.setdPadUp(true);
+ break;
+ case _GAMEPAD_DPAD_DOWN_BUTTON_INDEX:
+ _ButtonPressedState.setdPadDown(true);
+ break;
+ case _GAMEPAD_DPAD_LEFT_BUTTON_INDEX:
+ _ButtonPressedState.setdPadLeft(true);
+ break;
+ case _GAMEPAD_DPAD_RIGHT_BUTTON_INDEX:
+ _ButtonPressedState.setdPadRight(true);
+ break;
+ case _GAMEPAD_A_BUTTON_INDEX:
+ _ButtonPressedState.setgamepadA(true);
+ break;
+ case _GAMEPAD_B_BUTTON_INDEX:
+ _ButtonPressedState.setgamepadB(true);
+ break;
+ default:
+ // No-op
+ break;
+ }
+ } else {
+ switch (j) {
+ case _GAMEPAD_DPAD_UP_BUTTON_INDEX:
+ if (_ButtonPressedState.getdPadUp()) {
+ _ButtonPressedState.setdPadUp(false);
+ }
+ break;
+ case _GAMEPAD_DPAD_DOWN_BUTTON_INDEX:
+ if (_ButtonPressedState.getdPadDown()) {
+ _ButtonPressedState.setdPadDown(false);
+ }
+ break;
+ case _GAMEPAD_DPAD_LEFT_BUTTON_INDEX:
+ if (_ButtonPressedState.getdPadLeft()) {
+ _ButtonPressedState.setdPadLeft(false);
+ }
+ break;
+ case _GAMEPAD_DPAD_RIGHT_BUTTON_INDEX:
+ if (_ButtonPressedState.getdPadRight()) {
+ _ButtonPressedState.setdPadRight(false);
+ }
+ break;
+ case _GAMEPAD_A_BUTTON_INDEX:
+ if (_ButtonPressedState.getgamepadA()) {
+ _ButtonPressedState.setgamepadA(false);
+ }
+ break;
+ case _GAMEPAD_B_BUTTON_INDEX:
+ if (_ButtonPressedState.getgamepadB()) {
+ _ButtonPressedState.setgamepadB(false);
+ }
+ break;
+ default:
+ // No-op
+ break;
}
}
}
}
}
// Schedule the next one
- requestAnimationFrame(runInputLoop);
+ inputLoopTimer = requestAnimationFrame(runInputLoop);
}
- runInputLoop();
+ function startInputLoop() {
+ if (!inputLoopTimer) {
+ runInputLoop();
+ }
+ }
+
+ function stopInputLoop() {
+ cancelAnimationFrame(inputLoopTimer);
+ inputLoopTimer = undefined;
+ }
+
+ function isGamepadConnected() {
+ var gamepads = navigator.getGamepads();
+ for (var i = 0, len = gamepads.length; i < len; i++) {
+ var gamepad = gamepads[i];
+ if (gamepad && gamepad.connected) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ function onFocusOrGamepadAttach(e) {
+ if (isGamepadConnected() && document.hasFocus()) {
+ console.log("Gamepad connected! Starting input loop");
+ startInputLoop();
+ }
+ }
+
+ function onFocusOrGamepadDetach(e) {
+ if (!isGamepadConnected() || !document.hasFocus()) {
+ console.log("Gamepad disconnected! No other gamepads are connected, stopping input loop");
+ stopInputLoop();
+ } else {
+ console.log("Gamepad disconnected! There are gamepads still connected.");
+ }
+ }
+
+ // Event listeners for any change in gamepads' state.
+ window.addEventListener("gamepaddisconnected", onFocusOrGamepadDetach);
+ window.addEventListener("gamepadconnected", onFocusOrGamepadAttach);
+ window.addEventListener("blur", onFocusOrGamepadDetach);
+ window.addEventListener("focus", onFocusOrGamepadAttach);
+
+ onFocusOrGamepadAttach();
// The gamepadInputEmulation is a string property that exists in JavaScript UWAs and in WebViews in UWAs.
// It won't exist in Win8.1 style apps or browsers.
diff --git a/src/components/input/keyboardnavigation.js b/src/components/input/keyboardnavigation.js
new file mode 100644
index 0000000000..d356854a3e
--- /dev/null
+++ b/src/components/input/keyboardnavigation.js
@@ -0,0 +1,168 @@
+/**
+ * Module for performing keyboard navigation.
+ * @module components/input/keyboardnavigation
+ */
+
+import inputManager from "inputManager";
+import layoutManager from "layoutManager";
+
+/**
+ * Key name mapping.
+ */
+const KeyNames = {
+ 13: "Enter",
+ 19: "Pause",
+ 27: "Escape",
+ 32: "Space",
+ 37: "ArrowLeft",
+ 38: "ArrowUp",
+ 39: "ArrowRight",
+ 40: "ArrowDown",
+ // MediaRewind (Tizen/WebOS)
+ 412: "MediaRewind",
+ // MediaStop (Tizen/WebOS)
+ 413: "MediaStop",
+ // MediaPlay (Tizen/WebOS)
+ 415: "MediaPlay",
+ // MediaFastForward (Tizen/WebOS)
+ 417: "MediaFastForward",
+ // Back (WebOS)
+ 461: "Back",
+ // Back (Tizen)
+ 10009: "Back",
+ // MediaTrackPrevious (Tizen)
+ 10232: "MediaTrackPrevious",
+ // MediaTrackNext (Tizen)
+ 10233: "MediaTrackNext",
+ // MediaPlayPause (Tizen)
+ 10252: "MediaPlayPause"
+};
+
+/**
+ * Keys used for keyboard navigation.
+ */
+const NavigationKeys = ["ArrowLeft", "ArrowRight", "ArrowUp", "ArrowDown"];
+
+let hasFieldKey = false;
+try {
+ hasFieldKey = "key" in new KeyboardEvent("keydown");
+} catch (e) {
+ console.error("error checking 'key' field");
+}
+
+if (!hasFieldKey) {
+ // Add [a..z]
+ for (let i = 65; i <= 90; i++) {
+ KeyNames[i] = String.fromCharCode(i).toLowerCase();
+ }
+}
+
+/**
+ * Returns key name from event.
+ *
+ * @param {KeyboardEvent} event - Keyboard event.
+ * @return {string} Key name.
+ */
+export function getKeyName(event) {
+ return KeyNames[event.keyCode] || event.key;
+}
+
+/**
+ * Returns _true_ if key is used for navigation.
+ *
+ * @param {string} key - Key name.
+ * @return {boolean} _true_ if key is used for navigation.
+ */
+export function isNavigationKey(key) {
+ return NavigationKeys.indexOf(key) != -1;
+}
+
+export function enable() {
+ document.addEventListener("keydown", function (e) {
+ const key = getKeyName(e);
+
+ // Ignore navigation keys for non-TV
+ if (!layoutManager.tv && isNavigationKey(key)) {
+ return;
+ }
+
+ let capture = true;
+
+ switch (key) {
+ case "ArrowLeft":
+ inputManager.handle("left");
+ break;
+ case "ArrowUp":
+ inputManager.handle("up");
+ break;
+ case "ArrowRight":
+ inputManager.handle("right");
+ break;
+ case "ArrowDown":
+ inputManager.handle("down");
+ break;
+
+ case "Back":
+ inputManager.handle("back");
+ break;
+
+ case "Escape":
+ if (layoutManager.tv) {
+ inputManager.handle("back");
+ } else {
+ capture = false;
+ }
+ break;
+
+ case "MediaPlay":
+ inputManager.handle("play");
+ break;
+ case "Pause":
+ inputManager.handle("pause");
+ break;
+ case "MediaPlayPause":
+ inputManager.handle("playpause");
+ break;
+ case "MediaRewind":
+ inputManager.handle("rewind");
+ break;
+ case "MediaFastForward":
+ inputManager.handle("fastforward");
+ break;
+ case "MediaStop":
+ inputManager.handle("stop");
+ break;
+ case "MediaTrackPrevious":
+ inputManager.handle("previoustrack");
+ break;
+ case "MediaTrackNext":
+ inputManager.handle("nexttrack");
+ break;
+
+ default:
+ capture = false;
+ }
+
+ if (capture) {
+ console.debug("disabling default event handling");
+ e.preventDefault();
+ }
+ });
+}
+
+// Gamepad initialisation. No script is required if no gamepads are present at init time, saving a bit of resources.
+// Whenever the gamepad is connected, we hand all the control of the gamepad to gamepadtokey.js by removing the event handler
+function attachGamepadScript(e) {
+ console.log("Gamepad connected! Attaching gamepadtokey.js script");
+ window.removeEventListener("gamepadconnected", attachGamepadScript);
+ require(["components/input/gamepadtokey"]);
+}
+
+// No need to check for gamepads manually at load time, the eventhandler will be fired for that
+window.addEventListener("gamepadconnected", attachGamepadScript);
+
+export default {
+ enable: enable,
+ getKeyName: getKeyName,
+ isNavigationKey: isNavigationKey
+};
diff --git a/src/components/serverNotifications/mouseManager.js b/src/components/input/mouseManager.js
similarity index 100%
rename from src/components/serverNotifications/mouseManager.js
rename to src/components/input/mouseManager.js
diff --git a/src/components/itemcontextmenu.js b/src/components/itemcontextmenu.js
index 62048345ea..bdbcfc782b 100644
--- a/src/components/itemcontextmenu.js
+++ b/src/components/itemcontextmenu.js
@@ -346,11 +346,7 @@ define(["apphost", "globalize", "connectionManager", "itemHelper", "appRouter",
break;
case "copy-stream":
var downloadHref = apiClient.getItemDownloadUrl(itemId);
- navigator.clipboard.writeText(downloadHref).then(function () {
- require(["toast"], function (toast) {
- toast(globalize.translate("CopyStreamURLSuccess"));
- });
- }, function () {
+ var textAreaCopy = function () {
var textArea = document.createElement("textarea");
textArea.value = downloadHref;
document.body.appendChild(textArea);
@@ -364,7 +360,16 @@ define(["apphost", "globalize", "connectionManager", "itemHelper", "appRouter",
prompt(globalize.translate("CopyStreamURL"), downloadHref);
}
document.body.removeChild(textArea);
- });
+ };
+ if (navigator.clipboard === undefined) {
+ textAreaCopy();
+ } else {
+ navigator.clipboard.writeText(downloadHref).then(function () {
+ require(["toast"], function (toast) {
+ toast(globalize.translate("CopyStreamURLSuccess"));
+ });
+ }, textAreaCopy);
+ }
getResolveFunction(resolve, id)();
break;
case "editsubtitles":
diff --git a/src/components/itemidentifier/itemidentifier.js b/src/components/itemidentifier/itemidentifier.js
index 6f28de0b3b..9f89aef947 100644
--- a/src/components/itemidentifier/itemidentifier.js
+++ b/src/components/itemidentifier/itemidentifier.js
@@ -296,8 +296,6 @@ define(["dialogHelper", "loading", "connectionManager", "require", "globalize",
var html = "";
- var providerIds = item.ProviderIds || {};
-
for (var i = 0, length = idList.length; i < length; i++) {
var idInfo = idList[i];
@@ -306,9 +304,12 @@ define(["dialogHelper", "loading", "connectionManager", "require", "globalize",
html += '
';
- var idLabel = globalize.translate("LabelDynamicExternalId").replace("{0}", idInfo.Name);
+ var fullName = idInfo.Name;
+ if (idInfo.Type) {
+ fullName = idInfo.Name + " " + globalize.translate(idInfo.Type);
+ }
- var value = providerIds[idInfo.Key] || "";
+ var idLabel = globalize.translate("LabelDynamicExternalId", fullName);
html += '';
diff --git a/src/components/keyboardnavigation.js b/src/components/keyboardnavigation.js
deleted file mode 100644
index 12246a0d80..0000000000
--- a/src/components/keyboardnavigation.js
+++ /dev/null
@@ -1,154 +0,0 @@
-define(["inputManager", "layoutManager"], function (inputManager, layoutManager) {
- "use strict";
-
- /**
- * Key name mapping.
- */
- // Add more to support old browsers
- var KeyNames = {
- 13: "Enter",
- 19: "Pause",
- 27: "Escape",
- 32: "Space",
- 37: "ArrowLeft",
- 38: "ArrowUp",
- 39: "ArrowRight",
- 40: "ArrowDown",
- // MediaRewind (Tizen/WebOS)
- 412: "MediaRewind",
- // MediaStop (Tizen/WebOS)
- 413: "MediaStop",
- // MediaPlay (Tizen/WebOS)
- 415: "MediaPlay",
- // MediaFastForward (Tizen/WebOS)
- 417: "MediaFastForward",
- // Back (WebOS)
- 461: "Back",
- // Back (Tizen)
- 10009: "Back",
- // MediaTrackPrevious (Tizen)
- 10232: "MediaTrackPrevious",
- // MediaTrackNext (Tizen)
- 10233: "MediaTrackNext",
- // MediaPlayPause (Tizen)
- 10252: "MediaPlayPause"
- };
-
- /**
- * Keys used for keyboard navigation.
- */
- var NavigationKeys = ["ArrowLeft", "ArrowRight", "ArrowUp", "ArrowDown"];
-
- var hasFieldKey = false;
- try {
- hasFieldKey = "key" in new KeyboardEvent("keydown");
- } catch (e) {
- console.error("error checking 'key' field");
- }
-
- if (!hasFieldKey) {
- // Add [a..z]
- for (var i = 65; i <= 90; i++) {
- KeyNames[i] = String.fromCharCode(i).toLowerCase();
- }
- }
-
- /**
- * Returns key name from event.
- *
- * @param {KeyboardEvent} keyboard event
- * @return {string} key name
- */
- function getKeyName(event) {
- return KeyNames[event.keyCode] || event.key;
- }
-
- /**
- * Returns _true_ if key is used for navigation.
- *
- * @param {string} key name
- * @return {boolean} _true_ if key is used for navigation
- */
- function isNavigationKey(key) {
- return NavigationKeys.indexOf(key) != -1;
- }
-
- function enable() {
- document.addEventListener("keydown", function (e) {
- var key = getKeyName(e);
-
- // Ignore navigation keys for non-TV
- if (!layoutManager.tv && isNavigationKey(key)) {
- return;
- }
-
- var capture = true;
-
- switch (key) {
- case "ArrowLeft":
- inputManager.handle("left");
- break;
- case "ArrowUp":
- inputManager.handle("up");
- break;
- case "ArrowRight":
- inputManager.handle("right");
- break;
- case "ArrowDown":
- inputManager.handle("down");
- break;
-
- case "Back":
- inputManager.handle("back");
- break;
-
- case "Escape":
- if (layoutManager.tv) {
- inputManager.handle("back");
- } else {
- capture = false;
- }
- break;
-
- case "MediaPlay":
- inputManager.handle("play");
- break;
- case "Pause":
- inputManager.handle("pause");
- break;
- case "MediaPlayPause":
- inputManager.handle("playpause");
- break;
- case "MediaRewind":
- inputManager.handle("rewind");
- break;
- case "MediaFastForward":
- inputManager.handle("fastforward");
- break;
- case "MediaStop":
- inputManager.handle("stop");
- break;
- case "MediaTrackPrevious":
- inputManager.handle("previoustrack");
- break;
- case "MediaTrackNext":
- inputManager.handle("nexttrack");
- break;
-
- default:
- capture = false;
- }
-
- if (capture) {
- console.debug("disabling default event handling");
- e.preventDefault();
- }
- });
- }
-
- return {
- enable: enable,
- getKeyName: getKeyName,
- isNavigationKey: isNavigationKey
- };
-});
diff --git a/src/components/libraryoptionseditor/libraryoptionseditor.js b/src/components/libraryoptionseditor/libraryoptionseditor.js
index 193533bfc2..a398d7043a 100644
--- a/src/components/libraryoptionseditor/libraryoptionseditor.js
+++ b/src/components/libraryoptionseditor/libraryoptionseditor.js
@@ -107,7 +107,7 @@ define(["globalize", "dom", "emby-checkbox", "emby-select", "emby-input"], funct
if (!plugins.length) return html;
html += '