';
var userData = item.UserData || {};
@@ -1484,7 +1506,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
function getDefaultText(item, options) {
if (item.CollectionType) {
- return '' + imageHelper.getLibraryIcon(item.CollectionType) + ''
+ return ''
}
switch (item.Type) {
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/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/dom.js b/src/components/dom.js index 072ff5c77c..cc37e2fc5b 100644 --- a/src/components/dom.js +++ b/src/components/dom.js @@ -112,6 +112,22 @@ define([], function () { return windowSize; } + var standardWidths = [480, 720, 1280, 1440, 1920, 2560, 3840, 5120, 7680]; + function getScreenWidth() { + var width = window.innerWidth; + var height = window.innerHeight; + + if (height > width) { + width = height * (16.0 / 9.0); + } + + var closest = standardWidths.sort(function (a, b) { + return Math.abs(width - a) - Math.abs(width - b); + })[0]; + + return closest; + } + var _animationEvent; function whichAnimationEvent() { @@ -175,6 +191,7 @@ define([], function () { addEventListener: addEventListenerWithOptions, removeEventListener: removeEventListenerWithOptions, getWindowSize: getWindowSize, + getScreenWidth: getScreenWidth, whichTransitionEvent: whichTransitionEvent, whichAnimationEvent: whichAnimationEvent, whichAnimationCancelEvent: whichAnimationCancelEvent diff --git a/src/components/emby-tabs/emby-tabs.css b/src/components/emby-tabs/emby-tabs.css index 733a05fb0b..355f904cb8 100644 --- a/src/components/emby-tabs/emby-tabs.css +++ b/src/components/emby-tabs/emby-tabs.css @@ -13,11 +13,11 @@ vertical-align: middle; flex-shrink: 0; margin: 0; - padding: 1.5em; + padding: 1.5em 1.5em; position: relative; height: auto; min-width: initial; - line-height: initial; + line-height: 1.25; border-radius: 0; overflow: hidden; font-weight: 600; diff --git a/src/components/homesections/homesections.js b/src/components/homesections/homesections.js index 430c06bc57..b024528549 100644 --- a/src/components/homesections/homesections.js +++ b/src/components/homesections/homesections.js @@ -183,7 +183,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la for (var i = 0, length = items.length; i < length; i++) { var item = items[i]; var icon = imageHelper.getLibraryIcon(item.CollectionType); - html += '' + icon + '' + item.Name + ''; + html += '' + item.Name + ''; } html += '
';
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/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 += '', '\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/dom.js b/src/components/dom.js index 072ff5c77c..cc37e2fc5b 100644 --- a/src/components/dom.js +++ b/src/components/dom.js @@ -112,6 +112,22 @@ define([], function () { return windowSize; } + var standardWidths = [480, 720, 1280, 1440, 1920, 2560, 3840, 5120, 7680]; + function getScreenWidth() { + var width = window.innerWidth; + var height = window.innerHeight; + + if (height > width) { + width = height * (16.0 / 9.0); + } + + var closest = standardWidths.sort(function (a, b) { + return Math.abs(width - a) - Math.abs(width - b); + })[0]; + + return closest; + } + var _animationEvent; function whichAnimationEvent() { @@ -175,6 +191,7 @@ define([], function () { addEventListener: addEventListenerWithOptions, removeEventListener: removeEventListenerWithOptions, getWindowSize: getWindowSize, + getScreenWidth: getScreenWidth, whichTransitionEvent: whichTransitionEvent, whichAnimationEvent: whichAnimationEvent, whichAnimationCancelEvent: whichAnimationCancelEvent diff --git a/src/components/emby-tabs/emby-tabs.css b/src/components/emby-tabs/emby-tabs.css index 733a05fb0b..355f904cb8 100644 --- a/src/components/emby-tabs/emby-tabs.css +++ b/src/components/emby-tabs/emby-tabs.css @@ -13,11 +13,11 @@ vertical-align: middle; flex-shrink: 0; margin: 0; - padding: 1.5em; + padding: 1.5em 1.5em; position: relative; height: auto; min-width: initial; - line-height: initial; + line-height: 1.25; border-radius: 0; overflow: hidden; font-weight: 600; diff --git a/src/components/homesections/homesections.js b/src/components/homesections/homesections.js index 430c06bc57..b024528549 100644 --- a/src/components/homesections/homesections.js +++ b/src/components/homesections/homesections.js @@ -183,7 +183,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la for (var i = 0, length = items.length; i < length; i++) { var item = items[i]; var icon = imageHelper.getLibraryIcon(item.CollectionType); - html += '' + icon + '' + item.Name + ''; + html += '' + item.Name + ''; } html += '
';
- html += '
";
if (task.State === "Running") {
- html += '';
+ html += '';
} else if (task.State === "Idle") {
html += '';
}
@@ -90,16 +90,22 @@ define(["jQuery", "loading", "events", "globalize", "serverNotifications", "huma
return html;
}
+ function setTaskButtonIcon(button, icon) {
+ var inner = button.querySelector("i");
+ inner.classList.remove("stop", "play_arrow");
+ inner.classList.add(icon);
+ }
+
function updateTaskButton(elem, state) {
if (state === "Running") {
elem.classList.remove("btnStartTask");
elem.classList.add("btnStopTask");
- elem.querySelector("i").innerHTML = "stop";
+ setTaskButtonIcon(elem, "stop");
elem.title = globalize.translate("ButtonStop");
} else if (state === "Idle") {
elem.classList.add("btnStartTask");
elem.classList.remove("btnStopTask");
- elem.querySelector("i").innerHTML = "";
+ setTaskButtonIcon(elem, "play_arrow");
elem.title = globalize.translate("ButtonStart");
}
$(elem).parents(".listItem")[0].setAttribute("data-status", state);
diff --git a/src/controllers/itemdetailpage.js b/src/controllers/itemdetailpage.js
index e18311048c..82569835ca 100644
--- a/src/controllers/itemdetailpage.js
+++ b/src/controllers/itemdetailpage.js
@@ -459,7 +459,6 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "userSetti
var usePrimaryImage = item.MediaType === "Video" && item.Type !== "Movie" && item.Type !== "Trailer" ||
item.MediaType && item.MediaType !== "Video" ||
item.Type === "MusicAlbum" ||
- item.Type === "MusicArtist" ||
item.Type === "Person";
if (!layoutManager.mobile && !userSettings.enableBackdrops()) {
@@ -469,6 +468,7 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "userSetti
if ("Program" === item.Type && item.ImageTags && item.ImageTags.Thumb) {
imgUrl = apiClient.getScaledImageUrl(item.Id, {
type: "Thumb",
+ maxWidth: dom.getScreenWidth(),
index: 0,
tag: item.ImageTags.Thumb
});
@@ -478,6 +478,7 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "userSetti
} else if (usePrimaryImage && item.ImageTags && item.ImageTags.Primary) {
imgUrl = apiClient.getScaledImageUrl(item.Id, {
type: "Primary",
+ maxWidth: dom.getScreenWidth(),
index: 0,
tag: item.ImageTags.Primary
});
@@ -487,6 +488,7 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "userSetti
} else if (item.BackdropImageTags && item.BackdropImageTags.length) {
imgUrl = apiClient.getScaledImageUrl(item.Id, {
type: "Backdrop",
+ maxWidth: dom.getScreenWidth(),
index: 0,
tag: item.BackdropImageTags[0]
});
@@ -496,6 +498,7 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "userSetti
} else if (item.ParentBackdropItemId && item.ParentBackdropImageTags && item.ParentBackdropImageTags.length) {
imgUrl = apiClient.getScaledImageUrl(item.ParentBackdropItemId, {
type: "Backdrop",
+ maxWidth: dom.getScreenWidth(),
index: 0,
tag: item.ParentBackdropImageTags[0]
});
@@ -505,6 +508,7 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "userSetti
} else if (item.ImageTags && item.ImageTags.Thumb) {
imgUrl = apiClient.getScaledImageUrl(item.Id, {
type: "Thumb",
+ maxWidth: dom.getScreenWidth(),
index: 0,
tag: item.ImageTags.Thumb
});
@@ -762,44 +766,54 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "userSetti
var shape = "portrait";
var detectRatio = false;
+ /* In the following section, getScreenWidth() is multiplied by 0.5 as the posters
+ are 25vw and we need double the resolution to counter Skia's scaling. */
+ // TODO: Find a reliable way to get the poster width
if (imageTags.Primary) {
url = apiClient.getScaledImageUrl(item.Id, {
type: "Primary",
+ maxWidth: Math.round(dom.getScreenWidth() * 0.5),
tag: item.ImageTags.Primary
});
detectRatio = true;
} else if (item.BackdropImageTags && item.BackdropImageTags.length) {
url = apiClient.getScaledImageUrl(item.Id, {
type: "Backdrop",
+ maxWidth: Math.round(dom.getScreenWidth() * 0.5),
tag: item.BackdropImageTags[0]
});
shape = "thumb";
} else if (imageTags.Thumb) {
url = apiClient.getScaledImageUrl(item.Id, {
type: "Thumb",
+ maxWidth: Math.round(dom.getScreenWidth() * 0.5),
tag: item.ImageTags.Thumb
});
shape = "thumb";
} else if (imageTags.Disc) {
url = apiClient.getScaledImageUrl(item.Id, {
type: "Disc",
+ maxWidth: Math.round(dom.getScreenWidth() * 0.5),
tag: item.ImageTags.Disc
});
shape = "square";
} else if (item.AlbumId && item.AlbumPrimaryImageTag) {
url = apiClient.getScaledImageUrl(item.AlbumId, {
type: "Primary",
+ maxWidth: Math.round(dom.getScreenWidth() * 0.5),
tag: item.AlbumPrimaryImageTag
});
shape = "square";
} else if (item.SeriesId && item.SeriesPrimaryImageTag) {
url = apiClient.getScaledImageUrl(item.SeriesId, {
type: "Primary",
+ maxWidth: Math.round(dom.getScreenWidth() * 0.5),
tag: item.SeriesPrimaryImageTag
});
} else if (item.ParentPrimaryImageItemId && item.ParentPrimaryImageTag) {
url = apiClient.getScaledImageUrl(item.ParentPrimaryImageItemId, {
type: "Primary",
+ maxWidth: Math.round(dom.getScreenWidth() * 0.5),
tag: item.ParentPrimaryImageTag
});
}
@@ -1806,7 +1820,6 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "userSetti
require(["chaptercardbuilder"], function (chaptercardbuilder) {
chaptercardbuilder.buildChapterCards(item, chapters, {
itemsContainer: scenesContent,
- width: 400,
backdropShape: "overflowBackdrop",
squareShape: "overflowSquare"
});
@@ -1859,7 +1872,6 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "userSetti
itemsContainer: castContent,
coverImage: true,
serverId: item.ServerId,
- width: 160,
shape: "overflowPortrait"
});
});
diff --git a/src/controllers/list.js b/src/controllers/list.js
index 6e25242a01..bcc38f27cf 100644
--- a/src/controllers/list.js
+++ b/src/controllers/list.js
@@ -157,6 +157,12 @@ define(["globalize", "listView", "layoutManager", "userSettings", "focusManager"
return query;
}
+ function setSortButtonIcon(btnSortIcon, icon) {
+ btnSortIcon.classList.remove("arrow_downward");
+ btnSortIcon.classList.remove("arrow_upward");
+ btnSortIcon.classList.add(icon);
+ }
+
function updateSortText(instance) {
var btnSortText = instance.btnSortText;
@@ -175,7 +181,7 @@ define(["globalize", "listView", "layoutManager", "userSettings", "focusManager"
var btnSortIcon = instance.btnSortIcon;
if (btnSortIcon) {
- btnSortIcon.innerHTML = "Descending" === values.sortOrder ? "" : "";
+ setSortButtonIcon(btnSortIcon, "Descending" === values.sortOrder ? "arrow_downward" : "arrow_upward");
}
}
}
diff --git a/src/controllers/livetv/livetvrecordings.js b/src/controllers/livetv/livetvrecordings.js
index ed3ae24087..f8e49f2590 100644
--- a/src/controllers/livetv/livetvrecordings.js
+++ b/src/controllers/livetv/livetvrecordings.js
@@ -2,6 +2,10 @@ define(["layoutManager", "loading", "cardBuilder", "apphost", "imageLoader", "sc
"use strict";
function renderRecordings(elem, recordings, cardOptions, scrollX) {
+ if (!elem) {
+ return;
+ }
+
if (recordings.length) {
elem.classList.remove("hide");
} else {
diff --git a/src/controllers/medialibrarypage.js b/src/controllers/medialibrarypage.js
index 03c84f2ca3..d838c2145e 100644
--- a/src/controllers/medialibrarypage.js
+++ b/src/controllers/medialibrarypage.js
@@ -256,6 +256,7 @@ define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "gl
if (virtualFolder.PrimaryImageItemId) {
imgUrl = ApiClient.getScaledImageUrl(virtualFolder.PrimaryImageItemId, {
+ maxWidth: Math.round(dom.getScreenWidth() * 0.40),
type: "Primary"
});
}
diff --git a/src/controllers/playback/videoosd.js b/src/controllers/playback/videoosd.js
index c02c9b4171..c61fd14a7a 100644
--- a/src/controllers/playback/videoosd.js
+++ b/src/controllers/playback/videoosd.js
@@ -334,18 +334,24 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med
if (item) {
var imgUrl = seriesImageUrl(item, {
+ maxWidth: osdPoster.clientWidth * 2,
type: "Primary"
}) || seriesImageUrl(item, {
+ maxWidth: osdPoster.clientWidth * 2,
type: "Thumb"
}) || imageUrl(item, {
+ maxWidth: osdPoster.clientWidth * 2,
type: "Primary"
});
if (!imgUrl && secondaryItem && (imgUrl = seriesImageUrl(secondaryItem, {
+ maxWidth: osdPoster.clientWidth * 2,
type: "Primary"
}) || seriesImageUrl(secondaryItem, {
+ maxWidth: osdPoster.clientWidth * 2,
type: "Thumb"
}) || imageUrl(secondaryItem, {
+ maxWidth: osdPoster.clientWidth * 2,
type: "Primary"
})), imgUrl) {
return void (osdPoster.innerHTML = '
');
@@ -376,7 +382,7 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med
function startOsdHideTimer() {
stopOsdHideTimer();
- osdHideTimeout = setTimeout(hideOsd, 5e3);
+ osdHideTimeout = setTimeout(hideOsd, 3e3);
}
function stopOsdHideTimer() {
@@ -665,7 +671,8 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med
}
function onTimeUpdate(e) {
- if (isEnabled) {
+ // Test for 'currentItem' is required for Firefox since its player spams 'timeupdate' events even being at breakpoint
+ if (isEnabled && currentItem) {
var now = new Date().getTime();
if (!(now - lastUpdateTime < 700)) {
diff --git a/src/controllers/user/display.js b/src/controllers/user/display.js
index e3a56e1552..f348f28750 100644
--- a/src/controllers/user/display.js
+++ b/src/controllers/user/display.js
@@ -1,4 +1,4 @@
-define(["displaySettings", "userSettings", "autoFocuser"], function (DisplaySettings, currentUserSettings, autoFocuser) {
+define(["displaySettings", "userSettingsBuilder", "userSettings", "autoFocuser"], function (DisplaySettings, userSettingsBuilder, currentUserSettings, autoFocuser) {
"use strict";
return function (view, params) {
@@ -11,7 +11,7 @@ define(["displaySettings", "userSettings", "autoFocuser"], function (DisplaySett
var settingsInstance;
var hasChanges;
var userId = params.userId || ApiClient.getCurrentUserId();
- var userSettings = userId === ApiClient.getCurrentUserId() ? currentUserSettings : new userSettings();
+ var userSettings = userId === ApiClient.getCurrentUserId() ? currentUserSettings : new userSettingsBuilder();
view.addEventListener("viewshow", function () {
window.addEventListener("beforeunload", onBeforeUnload);
diff --git a/src/controllers/user/home.js b/src/controllers/user/home.js
index 20a42a7dfb..7f12efc7fb 100644
--- a/src/controllers/user/home.js
+++ b/src/controllers/user/home.js
@@ -1,4 +1,4 @@
-define(["homescreenSettings", "dom", "globalize", "loading", "userSettings", "autoFocuser", "listViewStyle"], function (HomescreenSettings, dom, globalize, loading, currentUserSettings, autoFocuser) {
+define(["homescreenSettings", "userSettingsBuilder", "dom", "globalize", "loading", "userSettings", "autoFocuser", "listViewStyle"], function (HomescreenSettings, userSettingsBuilder, dom, globalize, loading, currentUserSettings, autoFocuser) {
"use strict";
return function (view, params) {
@@ -11,7 +11,7 @@ define(["homescreenSettings", "dom", "globalize", "loading", "userSettings", "au
var homescreenSettingsInstance;
var hasChanges;
var userId = params.userId || ApiClient.getCurrentUserId();
- var userSettings = userId === ApiClient.getCurrentUserId() ? currentUserSettings : new userSettings();
+ var userSettings = userId === ApiClient.getCurrentUserId() ? currentUserSettings : new userSettingsBuilder();
view.addEventListener("viewshow", function () {
window.addEventListener("beforeunload", onBeforeUnload);
diff --git a/src/controllers/user/playback.js b/src/controllers/user/playback.js
index d0a127efe4..3def9d1931 100644
--- a/src/controllers/user/playback.js
+++ b/src/controllers/user/playback.js
@@ -1,4 +1,4 @@
-define(["playbackSettings", "dom", "globalize", "loading", "userSettings", "autoFocuser", "listViewStyle"], function (PlaybackSettings, dom, globalize, loading, currentUserSettings, autoFocuser) {
+define(["playbackSettings", "userSettingsBuilder", "dom", "globalize", "loading", "userSettings", "autoFocuser", "listViewStyle"], function (PlaybackSettings, userSettingsBuilder, dom, globalize, loading, currentUserSettings, autoFocuser) {
"use strict";
return function (view, params) {
@@ -11,7 +11,7 @@ define(["playbackSettings", "dom", "globalize", "loading", "userSettings", "auto
var settingsInstance;
var hasChanges;
var userId = params.userId || ApiClient.getCurrentUserId();
- var userSettings = userId === ApiClient.getCurrentUserId() ? currentUserSettings : new userSettings();
+ var userSettings = userId === ApiClient.getCurrentUserId() ? currentUserSettings : new userSettingsBuilder();
view.addEventListener("viewshow", function () {
window.addEventListener("beforeunload", onBeforeUnload);
diff --git a/src/controllers/user/subtitles.js b/src/controllers/user/subtitles.js
index 8e2dcc8780..1f1102194e 100644
--- a/src/controllers/user/subtitles.js
+++ b/src/controllers/user/subtitles.js
@@ -1,4 +1,4 @@
-define(["subtitleSettings", "userSettings", "autoFocuser"], function (SubtitleSettings, currentUserSettings, autoFocuser) {
+define(["subtitleSettings", "userSettingsBuilder", "userSettings", "autoFocuser"], function (SubtitleSettings, userSettingsBuilder, currentUserSettings, autoFocuser) {
"use strict";
return function (view, params) {
@@ -11,7 +11,7 @@ define(["subtitleSettings", "userSettings", "autoFocuser"], function (SubtitleSe
var subtitleSettingsInstance;
var hasChanges;
var userId = params.userId || ApiClient.getCurrentUserId();
- var userSettings = userId === ApiClient.getCurrentUserId() ? currentUserSettings : new userSettings();
+ var userSettings = userId === ApiClient.getCurrentUserId() ? currentUserSettings : new userSettingsBuilder();
view.addEventListener("viewshow", function () {
window.addEventListener("beforeunload", onBeforeUnload);
diff --git a/src/dlnasettings.html b/src/dlnasettings.html
index 872d546a53..8068acf5ab 100644
--- a/src/dlnasettings.html
+++ b/src/dlnasettings.html
@@ -8,7 +8,7 @@
diff --git a/src/elements/emby-checkbox/emby-checkbox.js b/src/elements/emby-checkbox/emby-checkbox.js
index 2e49a2d185..b5e587d5a6 100644
--- a/src/elements/emby-checkbox/emby-checkbox.js
+++ b/src/elements/emby-checkbox/emby-checkbox.js
@@ -5,7 +5,8 @@ define(['browser', 'dom', 'css!./emby-checkbox', 'registerElement'], function (b
function onKeyDown(e) {
// Don't submit form on enter
- if (e.keyCode === 13) {
+ // Real (non-emulator) Tizen does nothing on Space
+ if (e.keyCode === 13 || e.keyCode === 32) {
e.preventDefault();
this.checked = !this.checked;
diff --git a/src/elements/emby-collapse/emby-collapse.js b/src/elements/emby-collapse/emby-collapse.js
index 600af55516..fdd77adf0b 100644
--- a/src/elements/emby-collapse/emby-collapse.js
+++ b/src/elements/emby-collapse/emby-collapse.js
@@ -80,7 +80,7 @@ define(['browser', 'css!./emby-collapse', 'registerElement', 'emby-button'], fun
var title = this.getAttribute('title');
- var html = '';
+ var html = '';
this.insertAdjacentHTML('afterbegin', html);
diff --git a/src/elements/emby-radio/emby-radio.js b/src/elements/emby-radio/emby-radio.js
index 9b91591050..000c656822 100644
--- a/src/elements/emby-radio/emby-radio.js
+++ b/src/elements/emby-radio/emby-radio.js
@@ -6,10 +6,17 @@ define(['css!./emby-radio', 'registerElement'], function () {
function onKeyDown(e) {
// Don't submit form on enter
- if (e.keyCode === 13) {
+ // Real (non-emulator) Tizen does nothing on Space
+ if (e.keyCode === 13 || e.keyCode === 32) {
e.preventDefault();
- this.checked = true;
+ if (!this.checked) {
+ this.checked = true;
+
+ this.dispatchEvent(new CustomEvent('change', {
+ bubbles: true
+ }));
+ }
return false;
}
diff --git a/src/elements/emby-select/emby-select.css b/src/elements/emby-select/emby-select.css
index b508e5d0e3..9f07ca3f65 100644
--- a/src/elements/emby-select/emby-select.css
+++ b/src/elements/emby-select/emby-select.css
@@ -80,6 +80,10 @@
flex-shrink: 0;
}
+.trackSelections > .selectContainer {
+ margin: 0.4em 0;
+}
+
.emby-select-withcolor {
-webkit-appearance: none;
appearance: none;
diff --git a/src/index.html b/src/index.html
index 8e9c8db3b7..624be19360 100644
--- a/src/index.html
+++ b/src/index.html
@@ -105,5 +105,8 @@
+
+
+
' + globalize.translate("LabelTypeMetadataDownloaders", availableTypeOptions.Type) + "
"; + html += '' + globalize.translate("LabelTypeMetadataDownloaders", globalize.translate(availableTypeOptions.Type)) + "
"; html += '';
for (var i = 0; i < plugins.length; i++) {
var plugin = plugins[i];
@@ -273,14 +273,19 @@ define(["globalize", "dom", "emby-checkbox", "emby-select", "emby-input"], funct
function adjustSortableListElement(elem) {
var btnSortable = elem.querySelector(".btnSortable");
+ var inner = btnSortable.querySelector("i");
if (elem.previousSibling) {
+ btnSortable.title = globalize.translate("ButtonUp");
btnSortable.classList.add("btnSortableMoveUp");
btnSortable.classList.remove("btnSortableMoveDown");
- btnSortable.querySelector("i").innerHTML = "keyboard_arrow_up";
+ inner.classList.remove("keyboard_arrow_down");
+ inner.classList.add("keyboard_arrow_up");
} else {
+ btnSortable.title = globalize.translate("ButtonDown");
btnSortable.classList.remove("btnSortableMoveUp");
btnSortable.classList.add("btnSortableMoveDown");
- btnSortable.querySelector("i").innerHTML = "keyboard_arrow_down";
+ inner.classList.remove("keyboard_arrow_up");
+ inner.classList.add("keyboard_arrow_down");
}
}
@@ -391,6 +396,12 @@ define(["globalize", "dom", "emby-checkbox", "emby-select", "emby-input"], funct
parent.querySelector(".chkEnableEmbeddedTitlesContainer").classList.remove("hide");
}
+ if (contentType === "tvshows") {
+ parent.querySelector(".chkEnableEmbeddedEpisodeInfosContainer").classList.remove("hide");
+ } else {
+ parent.querySelector(".chkEnableEmbeddedEpisodeInfosContainer").classList.add("hide");
+ }
+
return populateMetadataSettings(parent, contentType);
}
@@ -488,6 +499,7 @@ define(["globalize", "dom", "emby-checkbox", "emby-select", "emby-input"], funct
SeasonZeroDisplayName: parent.querySelector("#txtSeasonZeroName").value,
AutomaticRefreshIntervalDays: parseInt(parent.querySelector("#selectAutoRefreshInterval").value),
EnableEmbeddedTitles: parent.querySelector("#chkEnableEmbeddedTitles").checked,
+ EnableEmbeddedEpisodeInfos: parent.querySelector("#chkEnableEmbeddedEpisodeInfos").checked,
SkipSubtitlesIfEmbeddedSubtitlesPresent: parent.querySelector("#chkSkipIfGraphicalSubsPresent").checked,
SkipSubtitlesIfAudioTrackMatches: parent.querySelector("#chkSkipIfAudioTrackPresent").checked,
SaveSubtitlesWithMedia: parent.querySelector("#chkSaveSubtitlesLocally").checked,
@@ -540,6 +552,7 @@ define(["globalize", "dom", "emby-checkbox", "emby-select", "emby-input"], funct
parent.querySelector("#chkImportMissingEpisodes").checked = options.ImportMissingEpisodes;
parent.querySelector(".chkAutomaticallyGroupSeries").checked = options.EnableAutomaticSeriesGrouping;
parent.querySelector("#chkEnableEmbeddedTitles").checked = options.EnableEmbeddedTitles;
+ parent.querySelector("#chkEnableEmbeddedEpisodeInfos").checked = options.EnableEmbeddedEpisodeInfos;
parent.querySelector("#chkSkipIfGraphicalSubsPresent").checked = options.SkipSubtitlesIfEmbeddedSubtitlesPresent;
parent.querySelector("#chkSaveSubtitlesLocally").checked = options.SaveSubtitlesWithMedia;
parent.querySelector("#chkSkipIfAudioTrackPresent").checked = options.SkipSubtitlesIfAudioTrackMatches;
diff --git a/src/components/libraryoptionseditor/libraryoptionseditor.template.html b/src/components/libraryoptionseditor/libraryoptionseditor.template.html
index 377488f44f..caa177108d 100644
--- a/src/components/libraryoptionseditor/libraryoptionseditor.template.html
+++ b/src/components/libraryoptionseditor/libraryoptionseditor.template.html
@@ -28,6 +28,13 @@
+
${PreferEmbeddedTitlesOverFileNamesHelp}
');
@@ -376,7 +382,7 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med
function startOsdHideTimer() {
stopOsdHideTimer();
- osdHideTimeout = setTimeout(hideOsd, 5e3);
+ osdHideTimeout = setTimeout(hideOsd, 3e3);
}
function stopOsdHideTimer() {
@@ -665,7 +671,8 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med
}
function onTimeUpdate(e) {
- if (isEnabled) {
+ // Test for 'currentItem' is required for Firefox since its player spams 'timeupdate' events even being at breakpoint
+ if (isEnabled && currentItem) {
var now = new Date().getTime();
if (!(now - lastUpdateTime < 700)) {
diff --git a/src/controllers/user/display.js b/src/controllers/user/display.js
index e3a56e1552..f348f28750 100644
--- a/src/controllers/user/display.js
+++ b/src/controllers/user/display.js
@@ -1,4 +1,4 @@
-define(["displaySettings", "userSettings", "autoFocuser"], function (DisplaySettings, currentUserSettings, autoFocuser) {
+define(["displaySettings", "userSettingsBuilder", "userSettings", "autoFocuser"], function (DisplaySettings, userSettingsBuilder, currentUserSettings, autoFocuser) {
"use strict";
return function (view, params) {
@@ -11,7 +11,7 @@ define(["displaySettings", "userSettings", "autoFocuser"], function (DisplaySett
var settingsInstance;
var hasChanges;
var userId = params.userId || ApiClient.getCurrentUserId();
- var userSettings = userId === ApiClient.getCurrentUserId() ? currentUserSettings : new userSettings();
+ var userSettings = userId === ApiClient.getCurrentUserId() ? currentUserSettings : new userSettingsBuilder();
view.addEventListener("viewshow", function () {
window.addEventListener("beforeunload", onBeforeUnload);
diff --git a/src/controllers/user/home.js b/src/controllers/user/home.js
index 20a42a7dfb..7f12efc7fb 100644
--- a/src/controllers/user/home.js
+++ b/src/controllers/user/home.js
@@ -1,4 +1,4 @@
-define(["homescreenSettings", "dom", "globalize", "loading", "userSettings", "autoFocuser", "listViewStyle"], function (HomescreenSettings, dom, globalize, loading, currentUserSettings, autoFocuser) {
+define(["homescreenSettings", "userSettingsBuilder", "dom", "globalize", "loading", "userSettings", "autoFocuser", "listViewStyle"], function (HomescreenSettings, userSettingsBuilder, dom, globalize, loading, currentUserSettings, autoFocuser) {
"use strict";
return function (view, params) {
@@ -11,7 +11,7 @@ define(["homescreenSettings", "dom", "globalize", "loading", "userSettings", "au
var homescreenSettingsInstance;
var hasChanges;
var userId = params.userId || ApiClient.getCurrentUserId();
- var userSettings = userId === ApiClient.getCurrentUserId() ? currentUserSettings : new userSettings();
+ var userSettings = userId === ApiClient.getCurrentUserId() ? currentUserSettings : new userSettingsBuilder();
view.addEventListener("viewshow", function () {
window.addEventListener("beforeunload", onBeforeUnload);
diff --git a/src/controllers/user/playback.js b/src/controllers/user/playback.js
index d0a127efe4..3def9d1931 100644
--- a/src/controllers/user/playback.js
+++ b/src/controllers/user/playback.js
@@ -1,4 +1,4 @@
-define(["playbackSettings", "dom", "globalize", "loading", "userSettings", "autoFocuser", "listViewStyle"], function (PlaybackSettings, dom, globalize, loading, currentUserSettings, autoFocuser) {
+define(["playbackSettings", "userSettingsBuilder", "dom", "globalize", "loading", "userSettings", "autoFocuser", "listViewStyle"], function (PlaybackSettings, userSettingsBuilder, dom, globalize, loading, currentUserSettings, autoFocuser) {
"use strict";
return function (view, params) {
@@ -11,7 +11,7 @@ define(["playbackSettings", "dom", "globalize", "loading", "userSettings", "auto
var settingsInstance;
var hasChanges;
var userId = params.userId || ApiClient.getCurrentUserId();
- var userSettings = userId === ApiClient.getCurrentUserId() ? currentUserSettings : new userSettings();
+ var userSettings = userId === ApiClient.getCurrentUserId() ? currentUserSettings : new userSettingsBuilder();
view.addEventListener("viewshow", function () {
window.addEventListener("beforeunload", onBeforeUnload);
diff --git a/src/controllers/user/subtitles.js b/src/controllers/user/subtitles.js
index 8e2dcc8780..1f1102194e 100644
--- a/src/controllers/user/subtitles.js
+++ b/src/controllers/user/subtitles.js
@@ -1,4 +1,4 @@
-define(["subtitleSettings", "userSettings", "autoFocuser"], function (SubtitleSettings, currentUserSettings, autoFocuser) {
+define(["subtitleSettings", "userSettingsBuilder", "userSettings", "autoFocuser"], function (SubtitleSettings, userSettingsBuilder, currentUserSettings, autoFocuser) {
"use strict";
return function (view, params) {
@@ -11,7 +11,7 @@ define(["subtitleSettings", "userSettings", "autoFocuser"], function (SubtitleSe
var subtitleSettingsInstance;
var hasChanges;
var userId = params.userId || ApiClient.getCurrentUserId();
- var userSettings = userId === ApiClient.getCurrentUserId() ? currentUserSettings : new userSettings();
+ var userSettings = userId === ApiClient.getCurrentUserId() ? currentUserSettings : new userSettingsBuilder();
view.addEventListener("viewshow", function () {
window.addEventListener("beforeunload", onBeforeUnload);
diff --git a/src/dlnasettings.html b/src/dlnasettings.html
index 872d546a53..8068acf5ab 100644
--- a/src/dlnasettings.html
+++ b/src/dlnasettings.html
@@ -8,7 +8,7 @@
diff --git a/src/elements/emby-checkbox/emby-checkbox.js b/src/elements/emby-checkbox/emby-checkbox.js
index 2e49a2d185..b5e587d5a6 100644
--- a/src/elements/emby-checkbox/emby-checkbox.js
+++ b/src/elements/emby-checkbox/emby-checkbox.js
@@ -5,7 +5,8 @@ define(['browser', 'dom', 'css!./emby-checkbox', 'registerElement'], function (b
function onKeyDown(e) {
// Don't submit form on enter
- if (e.keyCode === 13) {
+ // Real (non-emulator) Tizen does nothing on Space
+ if (e.keyCode === 13 || e.keyCode === 32) {
e.preventDefault();
this.checked = !this.checked;
diff --git a/src/elements/emby-collapse/emby-collapse.js b/src/elements/emby-collapse/emby-collapse.js
index 600af55516..fdd77adf0b 100644
--- a/src/elements/emby-collapse/emby-collapse.js
+++ b/src/elements/emby-collapse/emby-collapse.js
@@ -80,7 +80,7 @@ define(['browser', 'css!./emby-collapse', 'registerElement', 'emby-button'], fun
var title = this.getAttribute('title');
- var html = '';
+ var html = '';
this.insertAdjacentHTML('afterbegin', html);
diff --git a/src/elements/emby-radio/emby-radio.js b/src/elements/emby-radio/emby-radio.js
index 9b91591050..000c656822 100644
--- a/src/elements/emby-radio/emby-radio.js
+++ b/src/elements/emby-radio/emby-radio.js
@@ -6,10 +6,17 @@ define(['css!./emby-radio', 'registerElement'], function () {
function onKeyDown(e) {
// Don't submit form on enter
- if (e.keyCode === 13) {
+ // Real (non-emulator) Tizen does nothing on Space
+ if (e.keyCode === 13 || e.keyCode === 32) {
e.preventDefault();
- this.checked = true;
+ if (!this.checked) {
+ this.checked = true;
+
+ this.dispatchEvent(new CustomEvent('change', {
+ bubbles: true
+ }));
+ }
return false;
}
diff --git a/src/elements/emby-select/emby-select.css b/src/elements/emby-select/emby-select.css
index b508e5d0e3..9f07ca3f65 100644
--- a/src/elements/emby-select/emby-select.css
+++ b/src/elements/emby-select/emby-select.css
@@ -80,6 +80,10 @@
flex-shrink: 0;
}
+.trackSelections > .selectContainer {
+ margin: 0.4em 0;
+}
+
.emby-select-withcolor {
-webkit-appearance: none;
appearance: none;
diff --git a/src/index.html b/src/index.html
index 8e9c8db3b7..624be19360 100644
--- a/src/index.html
+++ b/src/index.html
@@ -105,5 +105,8 @@
+
+
+