milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into hide-alphapicker

Browse source
This commit is contained in:
Cameron 2020-09-11 22:38:47 +01:00 • committed by GitHub
commit 6868cf5340
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
211 changed files with 2525 additions and 4788 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.dependabot/config.yml
View file

@ -2,4 +2,4 @@ version: 1
update_configs: update_configs:
- package_manager: "javascript" - package_manager: "javascript"
directory: "/" directory: "/"
update_schedule: "live" update_schedule: "weekly"

4
.eslintrc.js
View file

@ -44,10 +44,9 @@ module.exports = {
'no-restricted-globals': ['error'].concat(restrictedGlobals), 'no-restricted-globals': ['error'].concat(restrictedGlobals),
'no-trailing-spaces': ['error'], 'no-trailing-spaces': ['error'],
'@babel/no-unused-expressions': ['error', { 'allowShortCircuit': true, 'allowTernary': true, 'allowTaggedTemplates': true }], '@babel/no-unused-expressions': ['error', { 'allowShortCircuit': true, 'allowTernary': true, 'allowTaggedTemplates': true }],
//'no-unused-vars': ['error', { 'vars': 'all', 'args': 'none', 'ignoreRestSiblings': true }],
'one-var': ['error', 'never'], 'one-var': ['error', 'never'],
'padded-blocks': ['error', 'never'], 'padded-blocks': ['error', 'never'],
//'prefer-const': ['error', {'destructuring': 'all'}], 'prefer-const': ['error', {'destructuring': 'all'}],
'quotes': ['error', 'single', { 'avoidEscape': true, 'allowTemplateLiterals': false }], 'quotes': ['error', 'single', { 'avoidEscape': true, 'allowTemplateLiterals': false }],
'@babel/semi': ['error'], '@babel/semi': ['error'],
'space-before-blocks': ['error'], 'space-before-blocks': ['error'],
@ -84,7 +83,6 @@ module.exports = {
'ApiClient': 'writable', 'ApiClient': 'writable',
'AppInfo': 'writable', 'AppInfo': 'writable',
'chrome': 'writable', 'chrome': 'writable',
'ConnectionManager': 'writable',
'DlnaProfilePage': 'writable', 'DlnaProfilePage': 'writable',
'Dashboard': 'writable', 'Dashboard': 'writable',
'DashboardPage': 'writable', 'DashboardPage': 'writable',

1
CONTRIBUTORS.md
View file

@ -38,6 +38,7 @@
- [GuilhermeHideki](https://github.com/GuilhermeHideki) - [GuilhermeHideki](https://github.com/GuilhermeHideki)
- [Andrei Oanca](https://github.com/OancaAndrei) - [Andrei Oanca](https://github.com/OancaAndrei)
- [Cromefire_](https://github.com/cromefire) - [Cromefire_](https://github.com/cromefire)
- [Orry Verducci](https://github.com/orryverducci)
# Emby Contributors # Emby Contributors

33
package.json
View file

@ -5,14 +5,14 @@
"repository": "https://github.com/jellyfin/jellyfin-web", "repository": "https://github.com/jellyfin/jellyfin-web",
"license": "GPL-2.0-or-later", "license": "GPL-2.0-or-later",
"devDependencies": { "devDependencies": {
"@babel/core": "^7.11.4", "@babel/core": "^7.11.6",
"@babel/eslint-parser": "^7.11.4", "@babel/eslint-parser": "^7.11.5",
"@babel/eslint-plugin": "^7.11.3", "@babel/eslint-plugin": "^7.11.5",
"@babel/plugin-proposal-class-properties": "^7.10.1", "@babel/plugin-proposal-class-properties": "^7.10.1",
"@babel/plugin-proposal-private-methods": "^7.10.1", "@babel/plugin-proposal-private-methods": "^7.10.1",
"@babel/plugin-transform-modules-amd": "^7.10.5", "@babel/plugin-transform-modules-amd": "^7.10.5",
"@babel/polyfill": "^7.8.7", "@babel/polyfill": "^7.11.5",
"@babel/preset-env": "^7.11.0", "@babel/preset-env": "^7.11.5",
"autoprefixer": "^9.8.6", "autoprefixer": "^9.8.6",
"babel-loader": "^8.0.6", "babel-loader": "^8.0.6",
"browser-sync": "^2.26.12", "browser-sync": "^2.26.12",
@ -21,12 +21,12 @@
"css-loader": "^4.2.2", "css-loader": "^4.2.2",
"cssnano": "^4.1.10", "cssnano": "^4.1.10",
"del": "^5.1.0", "del": "^5.1.0",
"eslint": "^7.7.0", "eslint": "^7.8.1",
"eslint-plugin-compat": "^3.5.1", "eslint-plugin-compat": "^3.5.1",
"eslint-plugin-eslint-comments": "^3.2.0", "eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-import": "^2.21.2", "eslint-plugin-import": "^2.21.2",
"eslint-plugin-promise": "^4.2.1", "eslint-plugin-promise": "^4.2.1",
"file-loader": "^6.0.0", "file-loader": "^6.1.0",
"gulp": "^4.0.2", "gulp": "^4.0.2",
"gulp-babel": "^8.0.0", "gulp-babel": "^8.0.0",
"gulp-cli": "^2.3.0", "gulp-cli": "^2.3.0",
@ -40,48 +40,50 @@
"gulp-sass": "^4.0.2", "gulp-sass": "^4.0.2",
"gulp-sourcemaps": "^2.6.5", "gulp-sourcemaps": "^2.6.5",
"gulp-terser": "^1.4.0", "gulp-terser": "^1.4.0",
"html-webpack-plugin": "^4.4.0", "html-webpack-plugin": "^4.4.1",
"lazypipe": "^1.0.2", "lazypipe": "^1.0.2",
"node-sass": "^4.13.1", "node-sass": "^4.13.1",
"postcss-loader": "^3.0.0", "postcss-loader": "^3.0.0",
"postcss-preset-env": "^6.7.0", "postcss-preset-env": "^6.7.0",
"style-loader": "^1.1.3", "style-loader": "^1.1.3",
"stylelint": "^13.6.1", "stylelint": "^13.7.0",
"stylelint-config-rational-order": "^0.1.2", "stylelint-config-rational-order": "^0.1.2",
"stylelint-no-browser-hacks": "^1.2.1", "stylelint-no-browser-hacks": "^1.2.1",
"stylelint-order": "^4.1.0", "stylelint-order": "^4.1.0",
"webpack": "^4.44.1", "webpack": "^4.44.1",
"webpack-merge": "^4.2.2", "webpack-merge": "^4.2.2",
"webpack-stream": "^6.0.0" "webpack-stream": "^6.1.0",
"worker-plugin": "^5.0.0"
}, },
"dependencies": { "dependencies": {
"alameda": "^1.4.0", "alameda": "^1.4.0",
"blurhash": "^1.1.3", "blurhash": "^1.1.3",
"classlist.js": "https://github.com/eligrey/classList.js/archive/1.2.20180112.tar.gz", "classlist.js": "https://github.com/eligrey/classList.js/archive/1.2.20180112.tar.gz",
"core-js": "^3.6.5", "core-js": "^3.6.5",
"date-fns": "^2.16.0", "date-fns": "^2.16.1",
"epubjs": "^0.3.85", "epubjs": "^0.3.85",
"fast-text-encoding": "^1.0.3", "fast-text-encoding": "^1.0.3",
"flv.js": "^1.5.0", "flv.js": "^1.5.0",
"headroom.js": "^0.11.0", "headroom.js": "^0.11.0",
"hls.js": "^0.14.10", "hls.js": "^0.14.11",
"howler": "^2.2.0", "howler": "^2.2.0",
"intersection-observer": "^0.11.0", "intersection-observer": "^0.11.0",
"jellyfin-apiclient": "^1.4.1", "jellyfin-apiclient": "^1.4.1",
"jellyfin-noto": "https://github.com/jellyfin/jellyfin-noto", "jellyfin-noto": "https://github.com/jellyfin/jellyfin-noto",
"jquery": "^3.5.1", "jquery": "^3.5.1",
"jstree": "^3.3.10", "jstree": "^3.3.10",
"libarchive.js": "^1.3.0",
"libass-wasm": "https://github.com/jellyfin/JavascriptSubtitlesOctopus#4.0.0-jf-smarttv", "libass-wasm": "https://github.com/jellyfin/JavascriptSubtitlesOctopus#4.0.0-jf-smarttv",
"material-design-icons-iconfont": "^5.0.1", "material-design-icons-iconfont": "^6.1.0",
"native-promise-only": "^0.8.0-a", "native-promise-only": "^0.8.0-a",
"page": "^1.11.6", "page": "^1.11.6",
"query-string": "^6.13.1", "query-string": "^6.13.1",
"resize-observer-polyfill": "^1.5.1", "resize-observer-polyfill": "^1.5.1",
"screenfull": "^5.0.2", "screenfull": "^5.0.2",
"sortablejs": "^1.10.2", "sortablejs": "^1.10.2",
"swiper": "^6.1.1", "swiper": "^6.2.0",
"webcomponents.js": "^0.7.24", "webcomponents.js": "^0.7.24",
"whatwg-fetch": "^3.4.0" "whatwg-fetch": "^3.4.1"
}, },
"babel": { "babel": {
"presets": [ "presets": [
@ -178,6 +180,7 @@
"src/plugins/experimentalWarnings/plugin.js", "src/plugins/experimentalWarnings/plugin.js",
"src/plugins/sessionPlayer/plugin.js", "src/plugins/sessionPlayer/plugin.js",
"src/plugins/htmlAudioPlayer/plugin.js", "src/plugins/htmlAudioPlayer/plugin.js",
"src/plugins/comicsPlayer/plugin.js",
"src/plugins/chromecastPlayer/plugin.js", "src/plugins/chromecastPlayer/plugin.js",
"src/components/slideshow/slideshow.js", "src/components/slideshow/slideshow.js",
"src/components/sortmenu/sortmenu.js", "src/components/sortmenu/sortmenu.js",

2
scripts/unused.py
View file

@ -16,7 +16,7 @@ langlst.append('en-us.json')
dep = [] dep = []
def grep(key): def grep(key):
command = 'grep -r -E "(\(\\\"|\(\'|\{)%s(\\\"|\'|\})" --include=\*.{js,html} --exclude-dir=../src/strings ../src' % key command = 'grep -r -E "(\\\"|\'|\{)%s(\\\"|\'|\})" --include=\*.{js,html} --exclude-dir=../src/strings ../src' % key
p = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) p = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
output = p.stdout.readlines() output = p.stdout.readlines()
if output: if output:

6
src/assets/css/fonts.css
View file

@ -1,7 +1,5 @@
html { html {
font-family: "Noto Sans", sans-serif; font-family: "Noto Sans", sans-serif;
font-size: 93%;
-webkit-text-size-adjust: 100%;
text-size-adjust: 100%; text-size-adjust: 100%;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
text-rendering: optimizeLegibility; text-rendering: optimizeLegibility;
@ -29,7 +27,9 @@ h3 {
} }
.layout-tv { .layout-tv {
font-size: 130%; /* Per WebOS and Tizen guidelines, fonts must be 20px minimum.
This takes the 16px baseline and multiplies it by 1.25 to get 20px. */
font-size: 125%;
} }
.layout-mobile { .layout-mobile {

60
src/assets/css/librarybrowser.css
View file

@ -28,6 +28,10 @@
padding-top: 0 !important; padding-top: 0 !important;
} }
.layout-tv .itemDetailPage {
padding-top: 4.2em !important;
}
.standalonePage { .standalonePage {
padding-top: 4.5em !important; padding-top: 4.5em !important;
} }
@ -163,6 +167,12 @@
transition: background ease-in-out 0.5s; transition: background ease-in-out 0.5s;
} }
.layout-tv .skinHeader {
/* In TV layout, it makes more sense to keep the top bar at the top of the page
Having it follow the view only makes us lose vertical space, while not being focusable */
position: relative;
}
.hiddenViewMenuBar .skinHeader { .hiddenViewMenuBar .skinHeader {
display: none; display: none;
} }
@ -447,8 +457,7 @@
height: 26.5vh; height: 26.5vh;
} }
.layout-desktop .itemBackdrop::after, .layout-desktop .itemBackdrop::after {
.layout-tv .itemBackdrop::after {
content: ""; content: "";
width: 100%; width: 100%;
height: 100%; height: 100%;
@ -456,8 +465,8 @@
display: block; display: block;
} }
.layout-desktop .noBackdrop .itemBackdrop, .layout-tv .itemBackdrop,
.layout-tv .noBackdrop .itemBackdrop { .layout-desktop .noBackdrop .itemBackdrop {
display: none; display: none;
} }
@ -624,6 +633,10 @@
z-index: 2; z-index: 2;
} }
.layout-tv .detailPagePrimaryContainer {
display: block;
}
.layout-mobile .detailPagePrimaryContainer { .layout-mobile .detailPagePrimaryContainer {
display: block; display: block;
position: relative; position: relative;
@ -637,12 +650,16 @@
padding-left: 32.45vw; padding-left: 32.45vw;
} }
.layout-desktop .detailRibbon, .layout-desktop .detailRibbon {
.layout-tv .detailRibbon {
margin-top: -7.2em; margin-top: -7.2em;
height: 7.2em; height: 7.2em;
} }
.layout-tv .detailRibbon {
margin-top: 0;
height: inherit;
}
.layout-desktop .noBackdrop .detailRibbon, .layout-desktop .noBackdrop .detailRibbon,
.layout-tv .noBackdrop .detailRibbon { .layout-tv .noBackdrop .detailRibbon {
margin-top: 0; margin-top: 0;
@ -748,8 +765,7 @@ div.itemDetailGalleryLink.defaultCardBackground {
position: relative; position: relative;
} }
.layout-desktop .itemBackdrop, .layout-desktop .itemBackdrop {
.layout-tv .itemBackdrop {
height: 40vh; height: 40vh;
} }
@ -775,13 +791,8 @@ div.itemDetailGalleryLink.defaultCardBackground {
} }
.emby-button.detailFloatingButton { .emby-button.detailFloatingButton {
position: absolute; font-size: 1.4em;
background-color: rgba(0, 0, 0, 0.5); margin-right: 0.5em !important;
z-index: 3;
top: 100%;
left: 90%;
margin: -2.2em 0 0 -2.2em;
padding: 0.4em;
color: rgba(255, 255, 255, 0.76); color: rgba(255, 255, 255, 0.76);
} }
@ -844,7 +855,7 @@ div.itemDetailGalleryLink.defaultCardBackground {
-webkit-align-items: center; -webkit-align-items: center;
align-items: center; align-items: center;
margin: 0 !important; margin: 0 !important;
padding: 0.5em 0.7em !important; padding: 0.7em 0.7em !important;
} }
@media all and (min-width: 29em) { @media all and (min-width: 29em) {
@ -913,10 +924,6 @@ div.itemDetailGalleryLink.defaultCardBackground {
} }
@media all and (min-width: 100em) { @media all and (min-width: 100em) {
.detailFloatingButton {
display: none !important;
}
.personBackdrop { .personBackdrop {
display: none !important; display: none !important;
} }
@ -925,6 +932,11 @@ div.itemDetailGalleryLink.defaultCardBackground {
font-size: 108%; font-size: 108%;
margin: 1.25em 0; margin: 1.25em 0;
} }
.layout-tv .mainDetailButtons {
font-size: 108%;
margin: 1em 0 1.25em;
}
} }
@media all and (max-width: 50em) { @media all and (max-width: 50em) {
@ -1140,13 +1152,13 @@ div:not(.sectionTitleContainer-cards) > .sectionTitle-cards {
} }
.layout-tv .padded-top-focusscale { .layout-tv .padded-top-focusscale {
padding-top: 1em; padding-top: 1.5em;
margin-top: -1em; margin-top: -1.5em;
} }
.layout-tv .padded-bottom-focusscale { .layout-tv .padded-bottom-focusscale {
padding-bottom: 1em; padding-bottom: 1.5em;
margin-bottom: -1em; margin-bottom: -1.5em;
} }
@media all and (min-height: 31.25em) { @media all and (min-height: 31.25em) {

6
src/bundle.js
View file

@ -175,3 +175,9 @@ _define('connectionManagerFactory', function () {
_define('appStorage', function () { _define('appStorage', function () {
return apiclient.AppStorage; return apiclient.AppStorage;
}); });
// libarchive.js
var libarchive = require('libarchive.js');
_define('libarchive', function () {
return libarchive;
});

5
src/components/activitylog.js
View file

@ -4,7 +4,6 @@ import dom from 'dom';
import * as datefns from 'date-fns'; import * as datefns from 'date-fns';
import dfnshelper from 'dfnshelper'; import dfnshelper from 'dfnshelper';
import serverNotifications from 'serverNotifications'; import serverNotifications from 'serverNotifications';
import connectionManager from 'connectionManager';
import 'emby-button'; import 'emby-button';
import 'listViewStyle'; import 'listViewStyle';
@ -141,7 +140,7 @@ class ActivityLog {
const element = options.element; const element = options.element;
element.classList.add('activityLogListWidget'); element.classList.add('activityLogListWidget');
element.addEventListener('click', onListClick.bind(this)); element.addEventListener('click', onListClick.bind(this));
const apiClient = connectionManager.getApiClient(options.serverId); const apiClient = window.connectionManager.getApiClient(options.serverId);
reloadData(this, element, apiClient); reloadData(this, element, apiClient);
const onUpdate = onActivityLogUpdate.bind(this); const onUpdate = onActivityLogUpdate.bind(this);
this.updateFn = onUpdate; this.updateFn = onUpdate;
@ -153,7 +152,7 @@ class ActivityLog {
if (options) { if (options) {
options.element.classList.remove('activityLogListWidget'); options.element.classList.remove('activityLogListWidget');
connectionManager.getApiClient(options.serverId).sendMessage('ActivityLogEntryStop', '0,1500'); window.connectionManager.getApiClient(options.serverId).sendMessage('ActivityLogEntryStop', '0,1500');
} }
const onUpdate = this.updateFn; const onUpdate = this.updateFn;

19
src/components/appRouter.js
View file

@ -2,7 +2,6 @@ import appHost from 'apphost';
import appSettings from 'appSettings'; import appSettings from 'appSettings';
import backdrop from 'backdrop'; import backdrop from 'backdrop';
import browser from 'browser'; import browser from 'browser';
import connectionManager from 'connectionManager';
import events from 'events'; import events from 'events';
import globalize from 'globalize'; import globalize from 'globalize';
import itemHelper from 'itemHelper'; import itemHelper from 'itemHelper';
@ -95,7 +94,7 @@ class AppRouter {
beginConnectionWizard() { beginConnectionWizard() {
backdrop.clearBackdrop(); backdrop.clearBackdrop();
loading.show(); loading.show();
connectionManager.connect({ window.connectionManager.connect({
enableAutoLogin: appSettings.enableAutoLogin() enableAutoLogin: appSettings.enableAutoLogin()
}).then((result) => { }).then((result) => {
this.handleConnectionResult(result); this.handleConnectionResult(result);
@ -154,7 +153,7 @@ class AppRouter {
events.on(appHost, 'beforeexit', this.onBeforeExit); events.on(appHost, 'beforeexit', this.onBeforeExit);
events.on(appHost, 'resume', this.onAppResume); events.on(appHost, 'resume', this.onAppResume);
connectionManager.connect({ window.connectionManager.connect({
enableAutoLogin: appSettings.enableAutoLogin() enableAutoLogin: appSettings.enableAutoLogin()
}).then((result) => { }).then((result) => {
this.firstConnectionResult = result; this.firstConnectionResult = result;
@ -210,7 +209,7 @@ class AppRouter {
showItem(item, serverId, options) { showItem(item, serverId, options) {
// TODO: Refactor this so it only gets items, not strings. // TODO: Refactor this so it only gets items, not strings.
if (typeof (item) === 'string') { if (typeof (item) === 'string') {
const apiClient = serverId ? connectionManager.getApiClient(serverId) : connectionManager.currentApiClient(); const apiClient = serverId ? window.connectionManager.getApiClient(serverId) : window.connectionManager.currentApiClient();
apiClient.getItem(apiClient.getCurrentUserId(), item).then((itemObject) => { apiClient.getItem(apiClient.getCurrentUserId(), item).then((itemObject) => {
this.showItem(itemObject, options); this.showItem(itemObject, options);
}); });
@ -309,7 +308,9 @@ class AppRouter {
url = route.contentPath || route.path; url = route.contentPath || route.path;
} }
if (url.indexOf('://') === -1) { if (url.includes('configurationpage')) {
url = ApiClient.getUrl('/web' + url);
} else if (url.indexOf('://') === -1) {
// Put a slash at the beginning but make sure to avoid a double slash // Put a slash at the beginning but make sure to avoid a double slash
if (url.indexOf('/') !== 0) { if (url.indexOf('/') !== 0) {
url = '/' + url; url = '/' + url;
@ -492,15 +493,15 @@ class AppRouter {
} }
initApiClients() { initApiClients() {
connectionManager.getApiClients().forEach((apiClient) => { window.connectionManager.getApiClients().forEach((apiClient) => {
this.initApiClient(apiClient, this); this.initApiClient(apiClient, this);
}); });
events.on(connectionManager, 'apiclientcreated', this.onApiClientCreated); events.on(window.connectionManager, 'apiclientcreated', this.onApiClientCreated);
} }
onAppResume() { onAppResume() {
const apiClient = connectionManager.currentApiClient(); const apiClient = window.connectionManager.currentApiClient();
if (apiClient) { if (apiClient) {
apiClient.ensureWebSocket(); apiClient.ensureWebSocket();
@ -518,7 +519,7 @@ class AppRouter {
} }
} }
const apiClient = connectionManager.currentApiClient(); const apiClient = window.connectionManager.currentApiClient();
const pathname = ctx.pathname.toLowerCase(); const pathname = ctx.pathname.toLowerCase();
console.debug('appRouter - processing path request ' + pathname); console.debug('appRouter - processing path request ' + pathname);

3
src/components/backdrop/backdrop.js
View file

@ -1,5 +1,4 @@
import browser from 'browser'; import browser from 'browser';
import connectionManager from 'connectionManager';
import playbackManager from 'playbackManager'; import playbackManager from 'playbackManager';
import dom from 'dom'; import dom from 'dom';
import * as userSettings from 'userSettings'; import * as userSettings from 'userSettings';
@ -177,7 +176,7 @@ import 'css!./backdrop';
function getItemImageUrls(item, imageOptions) { function getItemImageUrls(item, imageOptions) {
imageOptions = imageOptions || {}; imageOptions = imageOptions || {};
const apiClient = connectionManager.getApiClient(item.ServerId); const apiClient = window.connectionManager.getApiClient(item.ServerId);
if (item.BackdropImageTags && item.BackdropImageTags.length > 0) { if (item.BackdropImageTags && item.BackdropImageTags.length > 0) {
return item.BackdropImageTags.map((imgTag, index) => { return item.BackdropImageTags.map((imgTag, index) => {
return apiClient.getScaledImageUrl(item.BackdropItemId || item.Id, Object.assign(imageOptions, { return apiClient.getScaledImageUrl(item.BackdropItemId || item.Id, Object.assign(imageOptions, {

4
src/components/cardbuilder/card.css
View file

@ -209,6 +209,10 @@ button::-moz-focus-inner {
contain: strict; contain: strict;
} }
.defaultCardBackground {
display: flex;
}
.cardContent:not(.defaultCardBackground) { .cardContent:not(.defaultCardBackground) {
background-color: transparent; background-color: transparent;
} }

3
src/components/cardbuilder/cardBuilder.js
View file

@ -7,7 +7,6 @@
import datetime from 'datetime'; import datetime from 'datetime';
import imageLoader from 'imageLoader'; import imageLoader from 'imageLoader';
import connectionManager from 'connectionManager';
import itemHelper from 'itemHelper'; import itemHelper from 'itemHelper';
import focusManager from 'focusManager'; import focusManager from 'focusManager';
import indicators from 'indicators'; import indicators from 'indicators';
@ -371,7 +370,7 @@ import 'programStyles';
if (serverId !== lastServerId) { if (serverId !== lastServerId) {
lastServerId = serverId; lastServerId = serverId;
apiClient = connectionManager.getApiClient(lastServerId); apiClient = window.connectionManager.getApiClient(lastServerId);
} }
if (options.indexBy) { if (options.indexBy) {

3
src/components/cardbuilder/chaptercardbuilder.js
View file

@ -7,7 +7,6 @@
import datetime from 'datetime'; import datetime from 'datetime';
import imageLoader from 'imageLoader'; import imageLoader from 'imageLoader';
import connectionManager from 'connectionManager';
import layoutManager from 'layoutManager'; import layoutManager from 'layoutManager';
import browser from 'browser'; import browser from 'browser';
@ -48,7 +47,7 @@ import browser from 'browser';
let html = ''; let html = '';
let itemsInRow = 0; let itemsInRow = 0;
const apiClient = connectionManager.getApiClient(item.ServerId); const apiClient = window.connectionManager.getApiClient(item.ServerId);
for (let i = 0, length = chapters.length; i < length; i++) { for (let i = 0, length = chapters.length; i < length; i++) {
if (options.rows && itemsInRow === 0) { if (options.rows && itemsInRow === 0) {

6
src/components/channelMapper/channelMapper.js
View file

@ -1,7 +1,6 @@
import dom from 'dom'; import dom from 'dom';
import dialogHelper from 'dialogHelper'; import dialogHelper from 'dialogHelper';
import loading from 'loading'; import loading from 'loading';
import connectionManager from 'connectionManager';
import globalize from 'globalize'; import globalize from 'globalize';
import actionsheet from 'actionsheet'; import actionsheet from 'actionsheet';
import 'emby-input'; import 'emby-input';
@ -16,7 +15,7 @@ export default class channelMapper {
function mapChannel(button, channelId, providerChannelId) { function mapChannel(button, channelId, providerChannelId) {
loading.show(); loading.show();
const providerId = options.providerId; const providerId = options.providerId;
connectionManager.getApiClient(options.serverId).ajax({ window.connectionManager.getApiClient(options.serverId).ajax({
type: 'POST', type: 'POST',
url: ApiClient.getUrl('LiveTv/ChannelMappings'), url: ApiClient.getUrl('LiveTv/ChannelMappings'),
data: JSON.stringify({ data: JSON.stringify({
@ -24,6 +23,7 @@ export default class channelMapper {
tunerChannelId: channelId, tunerChannelId: channelId,
providerChannelId: providerChannelId providerChannelId: providerChannelId
}), }),
contentType: 'application/json',
dataType: 'json' dataType: 'json'
}).then(mapping => { }).then(mapping => {
const listItem = dom.parentWithClass(button, 'listItem'); const listItem = dom.parentWithClass(button, 'listItem');
@ -58,7 +58,7 @@ export default class channelMapper {
} }
function getChannelMappingOptions(serverId, providerId) { function getChannelMappingOptions(serverId, providerId) {
const apiClient = connectionManager.getApiClient(serverId); const apiClient = window.connectionManager.getApiClient(serverId);
return apiClient.getJSON(apiClient.getUrl('LiveTv/ChannelMappingOptions', { return apiClient.getJSON(apiClient.getUrl('LiveTv/ChannelMappingOptions', {
providerId: providerId providerId: providerId
})); }));

5
src/components/collectionEditor/collectionEditor.js
View file

@ -2,7 +2,6 @@ import dom from 'dom';
import dialogHelper from 'dialogHelper'; import dialogHelper from 'dialogHelper';
import loading from 'loading'; import loading from 'loading';
import layoutManager from 'layoutManager'; import layoutManager from 'layoutManager';
import connectionManager from 'connectionManager';
import appRouter from 'appRouter'; import appRouter from 'appRouter';
import globalize from 'globalize'; import globalize from 'globalize';
import 'emby-checkbox'; import 'emby-checkbox';
@ -25,7 +24,7 @@ import 'flexStyles';
const collectionId = panel.querySelector('#selectCollectionToAddTo').value; const collectionId = panel.querySelector('#selectCollectionToAddTo').value;
const apiClient = connectionManager.getApiClient(currentServerId); const apiClient = window.connectionManager.getApiClient(currentServerId);
if (collectionId) { if (collectionId) {
addToCollection(apiClient, panel, collectionId); addToCollection(apiClient, panel, collectionId);
@ -106,7 +105,7 @@ import 'flexStyles';
EnableTotalRecordCount: false EnableTotalRecordCount: false
}; };
const apiClient = connectionManager.getApiClient(currentServerId); const apiClient = window.connectionManager.getApiClient(currentServerId);
apiClient.getItems(apiClient.getCurrentUserId(), options).then(result => { apiClient.getItems(apiClient.getCurrentUserId(), options).then(result => {
let html = ''; let html = '';

2
src/components/dialogHelper/dialogHelper.js
View file

@ -375,7 +375,7 @@ import 'scrollStyles';
dlg.setAttribute('data-lockscroll', 'true'); dlg.setAttribute('data-lockscroll', 'true');
} }
if (options.enableHistory !== false) { if (options.enableHistory === true) {
dlg.setAttribute('data-history', 'true'); dlg.setAttribute('data-history', 'true');
} }

3
src/components/directorybrowser/directorybrowser.js
View file

@ -169,7 +169,8 @@ import 'emby-button';
data: JSON.stringify({ data: JSON.stringify({
ValidateWriteable: validateWriteable, ValidateWriteable: validateWriteable,
Path: path Path: path
}) }),
contentType: 'application/json'
}).catch(response => { }).catch(response => {
if (response) { if (response) {
if (response.status === 404) { if (response.status === 404) {

5
src/components/displaySettings/displaySettings.js
View file

@ -6,7 +6,6 @@ import focusManager from 'focusManager';
import datetime from 'datetime'; import datetime from 'datetime';
import globalize from 'globalize'; import globalize from 'globalize';
import loading from 'loading'; import loading from 'loading';
import connectionManager from 'connectionManager';
import skinManager from 'skinManager'; import skinManager from 'skinManager';
import events from 'events'; import events from 'events';
import 'emby-select'; import 'emby-select';
@ -182,7 +181,7 @@ import 'emby-button';
function onSubmit(e) { function onSubmit(e) {
const self = this; const self = this;
const apiClient = connectionManager.getApiClient(self.options.serverId); const apiClient = window.connectionManager.getApiClient(self.options.serverId);
const userId = self.options.userId; const userId = self.options.userId;
const userSettings = self.options.userSettings; const userSettings = self.options.userSettings;
@ -221,7 +220,7 @@ import 'emby-button';
loading.show(); loading.show();
const userId = self.options.userId; const userId = self.options.userId;
const apiClient = connectionManager.getApiClient(self.options.serverId); const apiClient = window.connectionManager.getApiClient(self.options.serverId);
const userSettings = self.options.userSettings; const userSettings = self.options.userSettings;
return apiClient.getUser(userId).then(user => { return apiClient.getUser(userId).then(user => {

14
src/components/favoriteitems.js
View file

@ -28,21 +28,21 @@ import 'emby-itemscontainer';
function getSections() { function getSections() {
return [{ return [{
name: 'HeaderFavoriteMovies', name: 'Movies',
types: 'Movie', types: 'Movie',
id: 'favoriteMovies', id: 'favoriteMovies',
shape: getPosterShape(), shape: getPosterShape(),
showTitle: false, showTitle: false,
overlayPlayButton: true overlayPlayButton: true
}, { }, {
name: 'HeaderFavoriteShows', name: 'Shows',
types: 'Series', types: 'Series',
id: 'favoriteShows', id: 'favoriteShows',
shape: getPosterShape(), shape: getPosterShape(),
showTitle: false, showTitle: false,
overlayPlayButton: true overlayPlayButton: true
}, { }, {
name: 'HeaderFavoriteEpisodes', name: 'Episodes',
types: 'Episode', types: 'Episode',
id: 'favoriteEpisode', id: 'favoriteEpisode',
shape: getThumbShape(), shape: getThumbShape(),
@ -53,7 +53,7 @@ import 'emby-itemscontainer';
overlayText: false, overlayText: false,
centerText: true centerText: true
}, { }, {
name: 'HeaderFavoriteVideos', name: 'Videos',
types: 'Video,MusicVideo', types: 'Video,MusicVideo',
id: 'favoriteVideos', id: 'favoriteVideos',
shape: getThumbShape(), shape: getThumbShape(),
@ -63,7 +63,7 @@ import 'emby-itemscontainer';
overlayText: false, overlayText: false,
centerText: true centerText: true
}, { }, {
name: 'HeaderFavoriteArtists', name: 'Artists',
types: 'MusicArtist', types: 'MusicArtist',
id: 'favoriteArtists', id: 'favoriteArtists',
shape: getSquareShape(), shape: getSquareShape(),
@ -75,7 +75,7 @@ import 'emby-itemscontainer';
overlayPlayButton: true, overlayPlayButton: true,
coverImage: true coverImage: true
}, { }, {
name: 'HeaderFavoriteAlbums', name: 'Albums',
types: 'MusicAlbum', types: 'MusicAlbum',
id: 'favoriteAlbums', id: 'favoriteAlbums',
shape: getSquareShape(), shape: getSquareShape(),
@ -87,7 +87,7 @@ import 'emby-itemscontainer';
overlayPlayButton: true, overlayPlayButton: true,
coverImage: true coverImage: true
}, { }, {
name: 'HeaderFavoriteSongs', name: 'Songs',
types: 'Audio', types: 'Audio',
id: 'favoriteSongs', id: 'favoriteSongs',
shape: getSquareShape(), shape: getSquareShape(),

3
src/components/filterdialog/filterdialog.js
View file

@ -1,7 +1,6 @@
import dom from 'dom'; import dom from 'dom';
import dialogHelper from 'dialogHelper'; import dialogHelper from 'dialogHelper';
import globalize from 'globalize'; import globalize from 'globalize';
import connectionManager from 'connectionManager';
import events from 'events'; import events from 'events';
import 'emby-checkbox'; import 'emby-checkbox';
import 'emby-collapse'; import 'emby-collapse';
@ -420,7 +419,7 @@ import 'css!./style.css';
this.bindEvents(dlg); this.bindEvents(dlg);
if (enableDynamicFilters(this.options.mode)) { if (enableDynamicFilters(this.options.mode)) {
dlg.classList.add('dynamicFilterDialog'); dlg.classList.add('dynamicFilterDialog');
const apiClient = connectionManager.getApiClient(this.options.serverId); const apiClient = window.connectionManager.getApiClient(this.options.serverId);
loadDynamicFilters(dlg, apiClient, apiClient.getCurrentUserId(), this.options.query); loadDynamicFilters(dlg, apiClient, apiClient.getCurrentUserId(), this.options.query);
} }
}); });

16
src/components/filterdialog/filterdialog.template.html
View file

@ -6,12 +6,12 @@
<label> <label>
<input type="checkbox" is="emby-checkbox" class="chkStandardFilter videoStandard" <input type="checkbox" is="emby-checkbox" class="chkStandardFilter videoStandard"
data-filter="IsPlayed" /> data-filter="IsPlayed" />
<span>${OptionPlayed}</span> <span>${Played}</span>
</label> </label>
<label> <label>
<input type="checkbox" is="emby-checkbox" class="chkStandardFilter videoStandard" <input type="checkbox" is="emby-checkbox" class="chkStandardFilter videoStandard"
data-filter="IsUnPlayed" /> data-filter="IsUnPlayed" />
<span>${OptionUnplayed}</span> <span>${Unplayed}</span>
</label> </label>
<label> <label>
<input type="checkbox" is="emby-checkbox" class="chkStandardFilter videoStandard" <input type="checkbox" is="emby-checkbox" class="chkStandardFilter videoStandard"
@ -21,7 +21,7 @@
<label> <label>
<input type="checkbox" is="emby-checkbox" class="chkStandardFilter chkFavorite" <input type="checkbox" is="emby-checkbox" class="chkStandardFilter chkFavorite"
data-filter="IsFavorite" /> data-filter="IsFavorite" />
<span>${OptionFavorite}</span> <span>${Favorites}</span>
</label> </label>
<label> <label>
<input type="checkbox" is="emby-checkbox" class="chkStandardFilter chkLikes" data-filter="Likes" /> <input type="checkbox" is="emby-checkbox" class="chkStandardFilter chkLikes" data-filter="Likes" />
@ -53,11 +53,11 @@
<div class="checkboxList"> <div class="checkboxList">
<label> <label>
<input type="checkbox" is="emby-checkbox" class="chkStatus" data-filter="Continuing" /> <input type="checkbox" is="emby-checkbox" class="chkStatus" data-filter="Continuing" />
<span>${OptionContinuing}</span> <span>${Continuing}</span>
</label> </label>
<label> <label>
<input type="checkbox" is="emby-checkbox" class="chkStatus" data-filter="Ended" /> <input type="checkbox" is="emby-checkbox" class="chkStatus" data-filter="Ended" />
<span>${OptionEnded}</span> <span>${Ended}</span>
</label> </label>
</div> </div>
</div> </div>
@ -68,15 +68,15 @@
<div class="checkboxList"> <div class="checkboxList">
<label> <label>
<input type="checkbox" is="emby-checkbox" class="chkFeatureFilter" id="chkSubtitle" /> <input type="checkbox" is="emby-checkbox" class="chkFeatureFilter" id="chkSubtitle" />
<span>${OptionHasSubtitles}</span> <span>${Subtitles}</span>
</label> </label>
<label> <label>
<input type="checkbox" is="emby-checkbox" class="chkFeatureFilter" id="chkTrailer" /> <input type="checkbox" is="emby-checkbox" class="chkFeatureFilter" id="chkTrailer" />
<span>${OptionHasTrailer}</span> <span>${ButtonTrailer}</span>
</label> </label>
<label> <label>
<input type="checkbox" is="emby-checkbox" class="chkFeatureFilter" id="chkSpecialFeature" /> <input type="checkbox" is="emby-checkbox" class="chkFeatureFilter" id="chkSpecialFeature" />
<span>${OptionHasSpecialFeatures}</span> <span>${SpecialFeatures}</span>
</label> </label>
<label> <label>
<input type="checkbox" is="emby-checkbox" class="chkFeatureFilter" id="chkThemeSong" /> <input type="checkbox" is="emby-checkbox" class="chkFeatureFilter" id="chkThemeSong" />

3
src/components/filtermenu/filtermenu.js
View file

@ -3,7 +3,6 @@ import focusManager from 'focusManager';
import dialogHelper from 'dialogHelper'; import dialogHelper from 'dialogHelper';
import inputManager from 'inputManager'; import inputManager from 'inputManager';
import layoutManager from 'layoutManager'; import layoutManager from 'layoutManager';
import connectionManager from 'connectionManager';
import globalize from 'globalize'; import globalize from 'globalize';
import * as userSettings from 'userSettings'; import * as userSettings from 'userSettings';
import 'emby-checkbox'; import 'emby-checkbox';
@ -194,7 +193,7 @@ function initEditor(context, settings) {
} }
} }
function loadDynamicFilters(context, options) { function loadDynamicFilters(context, options) {
var apiClient = connectionManager.getApiClient(options.serverId); var apiClient = window.connectionManager.getApiClient(options.serverId);
var filterMenuOptions = Object.assign(options.filterMenuOptions, { var filterMenuOptions = Object.assign(options.filterMenuOptions, {

3
src/components/groupedcards.js
View file

@ -2,12 +2,11 @@
import dom from 'dom'; import dom from 'dom';
import appRouter from 'appRouter'; import appRouter from 'appRouter';
import connectionManager from 'connectionManager';
function onGroupedCardClick(e, card) { function onGroupedCardClick(e, card) {
var itemId = card.getAttribute('data-id'); var itemId = card.getAttribute('data-id');
var serverId = card.getAttribute('data-serverid'); var serverId = card.getAttribute('data-serverid');
var apiClient = connectionManager.getApiClient(serverId); var apiClient = window.connectionManager.getApiClient(serverId);
var userId = apiClient.getCurrentUserId(); var userId = apiClient.getCurrentUserId();
var playedIndicator = card.querySelector('.playedIndicator'); var playedIndicator = card.querySelector('.playedIndicator');
var playedIndicatorHtml = playedIndicator ? playedIndicator.innerHTML : null; var playedIndicatorHtml = playedIndicator ? playedIndicator.innerHTML : null;

5
src/components/guide/guide.js
View file

@ -1,7 +1,6 @@
import inputManager from 'inputManager'; import inputManager from 'inputManager';
import browser from 'browser'; import browser from 'browser';
import globalize from 'globalize'; import globalize from 'globalize';
import connectionManager from 'connectionManager';
import scrollHelper from 'scrollHelper'; import scrollHelper from 'scrollHelper';
import serverNotifications from 'serverNotifications'; import serverNotifications from 'serverNotifications';
import loading from 'loading'; import loading from 'loading';
@ -213,7 +212,7 @@ function Guide(options) {
} }
function reloadGuide(context, newStartDate, scrollToTimeMs, focusToTimeMs, startTimeOfDayMs, focusProgramOnRender) { function reloadGuide(context, newStartDate, scrollToTimeMs, focusToTimeMs, startTimeOfDayMs, focusProgramOnRender) {
const apiClient = connectionManager.getApiClient(options.serverId); const apiClient = window.connectionManager.getApiClient(options.serverId);
const channelQuery = { const channelQuery = {
@ -873,7 +872,7 @@ function Guide(options) {
function reloadPage(page) { function reloadPage(page) {
showLoading(); showLoading();
const apiClient = connectionManager.getApiClient(options.serverId); const apiClient = window.connectionManager.getApiClient(options.serverId);
apiClient.getLiveTvGuideInfo().then(function (guideInfo) { apiClient.getLiveTvGuideInfo().then(function (guideInfo) {
setDateRange(page, guideInfo); setDateRange(page, guideInfo);

5
src/components/homeScreenSettings/homeScreenSettings.js
View file

@ -2,7 +2,6 @@ import layoutManager from 'layoutManager';
import focusManager from 'focusManager'; import focusManager from 'focusManager';
import globalize from 'globalize'; import globalize from 'globalize';
import loading from 'loading'; import loading from 'loading';
import connectionManager from 'connectionManager';
import homeSections from 'homeSections'; import homeSections from 'homeSections';
import dom from 'dom'; import dom from 'dom';
import events from 'events'; import events from 'events';
@ -380,7 +379,7 @@ import 'emby-checkbox';
function onSubmit(e) { function onSubmit(e) {
const self = this; const self = this;
const apiClient = connectionManager.getApiClient(self.options.serverId); const apiClient = window.connectionManager.getApiClient(self.options.serverId);
const userId = self.options.userId; const userId = self.options.userId;
const userSettings = self.options.userSettings; const userSettings = self.options.userSettings;
@ -452,7 +451,7 @@ import 'emby-checkbox';
loading.show(); loading.show();
const userId = self.options.userId; const userId = self.options.userId;
const apiClient = connectionManager.getApiClient(self.options.serverId); const apiClient = window.connectionManager.getApiClient(self.options.serverId);
const userSettings = self.options.userSettings; const userSettings = self.options.userSettings;
apiClient.getUser(userId).then(user => { apiClient.getUser(userId).then(user => {

13
src/components/homesections/homesections.js
View file

@ -1,4 +1,3 @@
import connectionManager from 'connectionManager';
import cardBuilder from 'cardBuilder'; import cardBuilder from 'cardBuilder';
import dom from 'dom'; import dom from 'dom';
import layoutManager from 'layoutManager'; import layoutManager from 'layoutManager';
@ -212,7 +211,7 @@ import 'css!./homesections';
function getFetchLatestItemsFn(serverId, parentId, collectionType) { function getFetchLatestItemsFn(serverId, parentId, collectionType) {
return function () { return function () {
const apiClient = connectionManager.getApiClient(serverId); const apiClient = window.connectionManager.getApiClient(serverId);
let limit = 16; let limit = 16;
if (enableScrollX()) { if (enableScrollX()) {
@ -368,7 +367,7 @@ import 'css!./homesections';
function getContinueWatchingFetchFn(serverId) { function getContinueWatchingFetchFn(serverId) {
return function () { return function () {
const apiClient = connectionManager.getApiClient(serverId); const apiClient = window.connectionManager.getApiClient(serverId);
const screenWidth = dom.getWindowSize().innerWidth; const screenWidth = dom.getWindowSize().innerWidth;
let limit; let limit;
@ -441,7 +440,7 @@ import 'css!./homesections';
function getContinueListeningFetchFn(serverId) { function getContinueListeningFetchFn(serverId) {
return function () { return function () {
const apiClient = connectionManager.getApiClient(serverId); const apiClient = window.connectionManager.getApiClient(serverId);
const screenWidth = dom.getWindowSize().innerWidth; const screenWidth = dom.getWindowSize().innerWidth;
let limit; let limit;
@ -514,7 +513,7 @@ import 'css!./homesections';
function getOnNowFetchFn(serverId) { function getOnNowFetchFn(serverId) {
return function () { return function () {
const apiClient = connectionManager.getApiClient(serverId); const apiClient = window.connectionManager.getApiClient(serverId);
return apiClient.getLiveTvRecommendedPrograms({ return apiClient.getLiveTvRecommendedPrograms({
userId: apiClient.getCurrentUserId(), userId: apiClient.getCurrentUserId(),
IsAiring: true, IsAiring: true,
@ -657,7 +656,7 @@ import 'css!./homesections';
function getNextUpFetchFn(serverId) { function getNextUpFetchFn(serverId) {
return function () { return function () {
const apiClient = connectionManager.getApiClient(serverId); const apiClient = window.connectionManager.getApiClient(serverId);
return apiClient.getNextUpEpisodes({ return apiClient.getNextUpEpisodes({
Limit: enableScrollX() ? 24 : 15, Limit: enableScrollX() ? 24 : 15,
Fields: 'PrimaryImageAspectRatio,SeriesInfo,DateCreated,BasicSyncInfo,Path', Fields: 'PrimaryImageAspectRatio,SeriesInfo,DateCreated,BasicSyncInfo,Path',
@ -728,7 +727,7 @@ import 'css!./homesections';
function getLatestRecordingsFetchFn(serverId, activeRecordingsOnly) { function getLatestRecordingsFetchFn(serverId, activeRecordingsOnly) {
return function () { return function () {
const apiClient = connectionManager.getApiClient(serverId); const apiClient = window.connectionManager.getApiClient(serverId);
return apiClient.getLiveTvRecordings({ return apiClient.getLiveTvRecordings({
userId: apiClient.getCurrentUserId(), userId: apiClient.getCurrentUserId(),
Limit: enableScrollX() ? 12 : 5, Limit: enableScrollX() ? 12 : 5,

3
src/components/imageDownloader/imageDownloader.js
View file

@ -2,7 +2,6 @@ import dom from 'dom';
import loading from 'loading'; import loading from 'loading';
import appHost from 'apphost'; import appHost from 'apphost';
import dialogHelper from 'dialogHelper'; import dialogHelper from 'dialogHelper';
import connectionManager from 'connectionManager';
import imageLoader from 'imageLoader'; import imageLoader from 'imageLoader';
import browser from 'browser'; import browser from 'browser';
import layoutManager from 'layoutManager'; import layoutManager from 'layoutManager';
@ -317,7 +316,7 @@ import 'cardStyle';
loading.show(); loading.show();
import('text!./imageDownloader.template.html').then(({default: template}) => { import('text!./imageDownloader.template.html').then(({default: template}) => {
const apiClient = connectionManager.getApiClient(serverId); const apiClient = window.connectionManager.getApiClient(serverId);
currentItemId = itemId; currentItemId = itemId;
currentItemType = itemType; currentItemType = itemType;

18
src/components/imageOptionsEditor/imageOptionsEditor.template.html
View file

@ -15,41 +15,41 @@
<label> <label>
<input type="checkbox" is="emby-checkbox" class="imageType" data-imagetype="Primary" /> <input type="checkbox" is="emby-checkbox" class="imageType" data-imagetype="Primary" />
<span>${OptionDownloadPrimaryImage}</span> <span>${Primary}</span>
</label> </label>
<label> <label>
<input type="checkbox" is="emby-checkbox" class="imageType" data-imagetype="Art" /> <input type="checkbox" is="emby-checkbox" class="imageType" data-imagetype="Art" />
<span>${OptionDownloadArtImage}</span> <span>${Art}</span>
</label> </label>
<label> <label>
<input type="checkbox" is="emby-checkbox" class="imageType" data-imagetype="BoxRear" /> <input type="checkbox" is="emby-checkbox" class="imageType" data-imagetype="BoxRear" />
<span>${OptionDownloadBackImage}</span> <span>${Back}</span>
</label> </label>
<label> <label>
<input type="checkbox" is="emby-checkbox" class="imageType" data-imagetype="Banner" /> <input type="checkbox" is="emby-checkbox" class="imageType" data-imagetype="Banner" />
<span>${OptionDownloadBannerImage}</span> <span>${Banner}</span>
</label> </label>
<label> <label>
<input type="checkbox" is="emby-checkbox" class="imageType" data-imagetype="Box" /> <input type="checkbox" is="emby-checkbox" class="imageType" data-imagetype="Box" />
<span>${OptionDownloadBoxImage}</span> <span>${Box}</span>
</label> </label>
<label> <label>
<input type="checkbox" is="emby-checkbox" class="imageType" data-imagetype="Disc" /> <input type="checkbox" is="emby-checkbox" class="imageType" data-imagetype="Disc" />
<span>${OptionDownloadDiscImage}</span> <span>${Disc}</span>
</label> </label>
<label> <label>
<input type="checkbox" is="emby-checkbox" class="imageType" data-imagetype="Logo" /> <input type="checkbox" is="emby-checkbox" class="imageType" data-imagetype="Logo" />
<span>${OptionDownloadLogoImage}</span> <span>${Logo}</span>
</label> </label>
<label> <label>
<input type="checkbox" is="emby-checkbox" class="imageType" data-imagetype="Menu" /> <input type="checkbox" is="emby-checkbox" class="imageType" data-imagetype="Menu" />
<span>${OptionDownloadMenuImage}</span> <span>${Menu}</span>
</label> </label>
<label> <label>
<input type="checkbox" is="emby-checkbox" class="imageType" data-imagetype="Thumb" /> <input type="checkbox" is="emby-checkbox" class="imageType" data-imagetype="Thumb" />
<span>${OptionDownloadThumbImage}</span> <span>${Thumb}</span>
</label> </label>
</div> </div>
</div> </div>

3
src/components/imageUploader/imageUploader.js
View file

@ -6,7 +6,6 @@
*/ */
import dialogHelper from 'dialogHelper'; import dialogHelper from 'dialogHelper';
import connectionManager from 'connectionManager';
import dom from 'dom'; import dom from 'dom';
import loading from 'loading'; import loading from 'loading';
import scrollHelper from 'scrollHelper'; import scrollHelper from 'scrollHelper';
@ -108,7 +107,7 @@ import 'css!./style';
return false; return false;
} }
connectionManager.getApiClient(currentServerId).uploadItemImage(currentItemId, imageType, file).then(() => { window.connectionManager.getApiClient(currentServerId).uploadItemImage(currentItemId, imageType, file).then(() => {
dlg.querySelector('#uploadImage').value = ''; dlg.querySelector('#uploadImage').value = '';
loading.hide(); loading.hide();

13
src/components/imageeditor/imageeditor.js
View file

@ -1,5 +1,4 @@
import dialogHelper from 'dialogHelper'; import dialogHelper from 'dialogHelper';
import connectionManager from 'connectionManager';
import loading from 'loading'; import loading from 'loading';
import dom from 'dom'; import dom from 'dom';
import layoutManager from 'layoutManager'; import layoutManager from 'layoutManager';
@ -36,10 +35,10 @@ import 'css!./imageeditor';
let apiClient; let apiClient;
if (item) { if (item) {
apiClient = connectionManager.getApiClient(item.ServerId); apiClient = window.connectionManager.getApiClient(item.ServerId);
reloadItem(page, item, apiClient, focusContext); reloadItem(page, item, apiClient, focusContext);
} else { } else {
apiClient = connectionManager.getApiClient(currentItem.ServerId); apiClient = window.connectionManager.getApiClient(currentItem.ServerId);
apiClient.getItem(apiClient.getCurrentUserId(), currentItem.Id).then(function (item) { apiClient.getItem(apiClient.getCurrentUserId(), currentItem.Id).then(function (item) {
reloadItem(page, item, apiClient, focusContext); reloadItem(page, item, apiClient, focusContext);
}); });
@ -293,7 +292,7 @@ import 'css!./imageeditor';
function showActionSheet(context, imageCard) { function showActionSheet(context, imageCard) {
const itemId = imageCard.getAttribute('data-id'); const itemId = imageCard.getAttribute('data-id');
const serverId = imageCard.getAttribute('data-serverid'); const serverId = imageCard.getAttribute('data-serverid');
const apiClient = connectionManager.getApiClient(serverId); const apiClient = window.connectionManager.getApiClient(serverId);
const type = imageCard.getAttribute('data-imagetype'); const type = imageCard.getAttribute('data-imagetype');
const index = parseInt(imageCard.getAttribute('data-index')); const index = parseInt(imageCard.getAttribute('data-index'));
@ -404,7 +403,7 @@ import 'css!./imageeditor';
const type = this.getAttribute('data-imagetype'); const type = this.getAttribute('data-imagetype');
let index = this.getAttribute('data-index'); let index = this.getAttribute('data-index');
index = index === 'null' ? null : parseInt(index); index = index === 'null' ? null : parseInt(index);
const apiClient = connectionManager.getApiClient(currentItem.ServerId); const apiClient = window.connectionManager.getApiClient(currentItem.ServerId);
deleteImage(context, currentItem.Id, type, index, apiClient, true); deleteImage(context, currentItem.Id, type, index, apiClient, true);
}); });
@ -412,7 +411,7 @@ import 'css!./imageeditor';
const type = this.getAttribute('data-imagetype'); const type = this.getAttribute('data-imagetype');
const index = this.getAttribute('data-index'); const index = this.getAttribute('data-index');
const newIndex = this.getAttribute('data-newindex'); const newIndex = this.getAttribute('data-newindex');
const apiClient = connectionManager.getApiClient(currentItem.ServerId); const apiClient = window.connectionManager.getApiClient(currentItem.ServerId);
moveImage(context, apiClient, currentItem.Id, type, index, newIndex, dom.parentWithClass(this, 'itemsContainer')); moveImage(context, apiClient, currentItem.Id, type, index, newIndex, dom.parentWithClass(this, 'itemsContainer'));
}); });
} }
@ -424,7 +423,7 @@ import 'css!./imageeditor';
loading.show(); loading.show();
import('text!./imageeditor.template.html').then(({default: template}) => { import('text!./imageeditor.template.html').then(({default: template}) => {
const apiClient = connectionManager.getApiClient(serverId); const apiClient = window.connectionManager.getApiClient(serverId);
apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(function (item) { apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(function (item) {
const dialogOptions = { const dialogOptions = {
removeOnClose: true removeOnClose: true

3
src/components/itemContextMenu.js
View file

@ -1,6 +1,5 @@
import appHost from 'apphost'; import appHost from 'apphost';
import globalize from 'globalize'; import globalize from 'globalize';
import connectionManager from 'connectionManager';
import itemHelper from 'itemHelper'; import itemHelper from 'itemHelper';
import appRouter from 'appRouter'; import appRouter from 'appRouter';
import playbackManager from 'playbackManager'; import playbackManager from 'playbackManager';
@ -330,7 +329,7 @@ import actionsheet from 'actionsheet';
function executeCommand(item, id, options) { function executeCommand(item, id, options) {
const itemId = item.Id; const itemId = item.Id;
const serverId = item.ServerId; const serverId = item.ServerId;
const apiClient = connectionManager.getApiClient(serverId); const apiClient = window.connectionManager.getApiClient(serverId);
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
switch (id) { switch (id) {

31
src/components/itemMediaInfo/itemMediaInfo.js
View file

@ -8,7 +8,6 @@
import dialogHelper from 'dialogHelper'; import dialogHelper from 'dialogHelper';
import layoutManager from 'layoutManager'; import layoutManager from 'layoutManager';
import globalize from 'globalize'; import globalize from 'globalize';
import connectionManager from 'connectionManager';
import loading from 'loading'; import loading from 'loading';
import 'emby-select'; import 'emby-select';
import 'listViewStyle'; import 'listViewStyle';
@ -52,8 +51,22 @@ import 'flexStyles';
if (stream.Type === 'Data') { if (stream.Type === 'Data') {
continue; continue;
} }
html += '<div class="mediaInfoStream">'; html += '<div class="mediaInfoStream">';
const displayType = globalize.translate(`MediaInfoStreamType${stream.Type}`); let translateString;
switch (stream.Type) {
case 'Audio':
case 'Data':
case 'Subtitle':
case 'Video':
translateString = stream.Type;
break;
case 'EmbeddedImage':
translateString = 'Image';
break;
}
const displayType = globalize.translate(translateString);
html += `<h2 class="mediaInfoStreamType">${displayType}</h2>`; html += `<h2 class="mediaInfoStreamType">${displayType}</h2>`;
const attributes = []; const attributes = [];
if (stream.DisplayTitle) { if (stream.DisplayTitle) {
@ -107,6 +120,18 @@ import 'flexStyles';
if (stream.BitDepth) { if (stream.BitDepth) {
attributes.push(createAttribute(globalize.translate('MediaInfoBitDepth'), `${stream.BitDepth} bit`)); attributes.push(createAttribute(globalize.translate('MediaInfoBitDepth'), `${stream.BitDepth} bit`));
} }
if (stream.VideoRange) {
attributes.push(createAttribute(globalize.translate('MediaInfoVideoRange'), stream.VideoRange));
}
if (stream.ColorSpace) {
attributes.push(createAttribute(globalize.translate('MediaInfoColorSpace'), stream.ColorSpace));
}
if (stream.ColorTransfer) {
attributes.push(createAttribute(globalize.translate('MediaInfoColorTransfer'), stream.ColorTransfer));
}
if (stream.ColorPrimaries) {
attributes.push(createAttribute(globalize.translate('MediaInfoColorPrimaries'), stream.ColorPrimaries));
}
if (stream.PixelFormat) { if (stream.PixelFormat) {
attributes.push(createAttribute(globalize.translate('MediaInfoPixelFormat'), stream.PixelFormat)); attributes.push(createAttribute(globalize.translate('MediaInfoPixelFormat'), stream.PixelFormat));
} }
@ -137,7 +162,7 @@ import 'flexStyles';
} }
function loadMediaInfo(itemId, serverId, template) { function loadMediaInfo(itemId, serverId, template) {
const apiClient = connectionManager.getApiClient(serverId); const apiClient = window.connectionManager.getApiClient(serverId);
return apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(item => { return apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(item => {
const dialogOptions = { const dialogOptions = {
size: 'small', size: 'small',

3
src/components/itemidentifier/itemidentifier.js
View file

@ -7,7 +7,6 @@
import dialogHelper from 'dialogHelper'; import dialogHelper from 'dialogHelper';
import loading from 'loading'; import loading from 'loading';
import connectionManager from 'connectionManager';
import globalize from 'globalize'; import globalize from 'globalize';
import scrollHelper from 'scrollHelper'; import scrollHelper from 'scrollHelper';
import layoutManager from 'layoutManager'; import layoutManager from 'layoutManager';
@ -31,7 +30,7 @@ import 'cardStyle';
let currentSearchResult; let currentSearchResult;
function getApiClient() { function getApiClient() {
return connectionManager.getApiClient(currentServerId); return window.connectionManager.getApiClient(currentServerId);
} }
function searchForIdentificationResults(page) { function searchForIdentificationResults(page) {

11
src/components/listview/listview.css
View file

@ -185,6 +185,17 @@
.listItemBody { .listItemBody {
padding-right: 0.5em; padding-right: 0.5em;
} }
.listItemMediaInfo {
display: none;
}
}
@media all and (max-width: 40em) {
[data-type='Movie'] .listItemImage,
[data-type='Series'] .listItemImage {
display: none;
}
} }
.listItemImage-large-tv { .listItemImage-large-tv {

19
src/components/listview/listview.js
View file

@ -8,7 +8,6 @@
import itemHelper from 'itemHelper'; import itemHelper from 'itemHelper';
import mediaInfo from 'mediaInfo'; import mediaInfo from 'mediaInfo';
import indicators from 'indicators'; import indicators from 'indicators';
import connectionManager from 'connectionManager';
import layoutManager from 'layoutManager'; import layoutManager from 'layoutManager';
import globalize from 'globalize'; import globalize from 'globalize';
import datetime from 'datetime'; import datetime from 'datetime';
@ -77,7 +76,7 @@ import 'emby-playstatebutton';
} }
function getImageUrl(item, width) { function getImageUrl(item, width) {
const apiClient = connectionManager.getApiClient(item.ServerId); const apiClient = window.connectionManager.getApiClient(item.ServerId);
let itemId; let itemId;
const options = { const options = {
@ -106,7 +105,7 @@ import 'emby-playstatebutton';
} }
function getChannelImageUrl(item, width) { function getChannelImageUrl(item, width) {
const apiClient = connectionManager.getApiClient(item.ServerId); const apiClient = window.connectionManager.getApiClient(item.ServerId);
const options = { const options = {
maxWidth: width, maxWidth: width,
type: 'Primary' type: 'Primary'
@ -370,18 +369,8 @@ import 'emby-playstatebutton';
} }
} }
} else { } else {
let showArtist = options.artist === true; if (options.artist) {
const artistItems = item.ArtistItems; const artistItems = item.ArtistItems;
if (!showArtist && options.artist !== false) {
if (!artistItems || !artistItems.length) {
showArtist = true;
} else if (artistItems.length > 1 || !containerAlbumArtistIds.includes(artistItems[0].Id)) {
showArtist = true;
}
}
if (showArtist) {
if (artistItems && item.Type !== 'MusicAlbum') { if (artistItems && item.Type !== 'MusicAlbum') {
textlines.push(artistItems.map(a => { textlines.push(artistItems.map(a => {
return a.Name; return a.Name;

11
src/components/metadataEditor/metadataEditor.js
View file

@ -4,7 +4,6 @@ import dialogHelper from 'dialogHelper';
import datetime from 'datetime'; import datetime from 'datetime';
import loading from 'loading'; import loading from 'loading';
import focusManager from 'focusManager'; import focusManager from 'focusManager';
import connectionManager from 'connectionManager';
import globalize from 'globalize'; import globalize from 'globalize';
import shell from 'shell'; import shell from 'shell';
import 'emby-checkbox'; import 'emby-checkbox';
@ -290,7 +289,7 @@ import 'flexStyles';
} }
function getApiClient() { function getApiClient() {
return connectionManager.getApiClient(currentItem.ServerId); return window.connectionManager.getApiClient(currentItem.ServerId);
} }
function bindAll(elems, eventName, fn) { function bindAll(elems, eventName, fn) {
@ -370,7 +369,7 @@ import 'flexStyles';
} }
function getItem(itemId, serverId) { function getItem(itemId, serverId) {
const apiClient = connectionManager.getApiClient(serverId); const apiClient = window.connectionManager.getApiClient(serverId);
if (itemId) { if (itemId) {
return apiClient.getItem(apiClient.getCurrentUserId(), itemId); return apiClient.getItem(apiClient.getCurrentUserId(), itemId);
@ -380,7 +379,7 @@ import 'flexStyles';
} }
function getEditorConfig(itemId, serverId) { function getEditorConfig(itemId, serverId) {
const apiClient = connectionManager.getApiClient(serverId); const apiClient = window.connectionManager.getApiClient(serverId);
if (itemId) { if (itemId) {
return apiClient.getJSON(apiClient.getUrl('Items/' + itemId + '/MetadataEditor')); return apiClient.getJSON(apiClient.getUrl('Items/' + itemId + '/MetadataEditor'));
@ -1068,7 +1067,7 @@ import 'flexStyles';
currentContext = dlg; currentContext = dlg;
init(dlg, connectionManager.getApiClient(serverId)); init(dlg, window.connectionManager.getApiClient(serverId));
reload(dlg, itemId, serverId); reload(dlg, itemId, serverId);
}); });
@ -1095,7 +1094,7 @@ import 'flexStyles';
currentContext = elem; currentContext = elem;
init(elem, connectionManager.getApiClient(serverId)); init(elem, window.connectionManager.getApiClient(serverId));
reload(elem, itemId, serverId); reload(elem, itemId, serverId);
focusManager.autoFocus(elem); focusManager.autoFocus(elem);

3
src/components/multiSelect/multiSelect.js
View file

@ -1,7 +1,6 @@
import browser from 'browser'; import browser from 'browser';
import appHost from 'apphost'; import appHost from 'apphost';
import loading from 'loading'; import loading from 'loading';
import connectionManager from 'connectionManager';
import globalize from 'globalize'; import globalize from 'globalize';
import dom from 'dom'; import dom from 'dom';
import 'css!./multiSelect'; import 'css!./multiSelect';
@ -170,7 +169,7 @@ import 'css!./multiSelect';
} }
function showMenuForSelectedItems(e) { function showMenuForSelectedItems(e) {
const apiClient = connectionManager.currentApiClient(); const apiClient = window.connectionManager.currentApiClient();
apiClient.getCurrentUser().then(user => { apiClient.getCurrentUser().then(user => {
const menuItems = []; const menuItems = [];

34
src/components/notifications/notifications.js
View file

@ -31,7 +31,7 @@ function closeAfter(notification, timeoutMs) {
function resetRegistration() { function resetRegistration() {
/* eslint-disable-next-line compat/compat */ /* eslint-disable-next-line compat/compat */
let serviceWorker = navigator.serviceWorker; const serviceWorker = navigator.serviceWorker;
if (serviceWorker) { if (serviceWorker) {
serviceWorker.ready.then(function (registration) { serviceWorker.ready.then(function (registration) {
serviceWorkerRegistration = registration; serviceWorkerRegistration = registration;
@ -47,7 +47,7 @@ function showPersistentNotification(title, options, timeoutMs) {
function showNonPersistentNotification(title, options, timeoutMs) { function showNonPersistentNotification(title, options, timeoutMs) {
try { try {
let notif = new Notification(title, options); /* eslint-disable-line compat/compat */ const notif = new Notification(title, options); /* eslint-disable-line compat/compat */
if (notif.show) { if (notif.show) {
notif.show(); notif.show();
@ -67,7 +67,7 @@ function showNonPersistentNotification(title, options, timeoutMs) {
} }
function showNotification(options, timeoutMs, apiClient) { function showNotification(options, timeoutMs, apiClient) {
let title = options.title; const title = options.title;
options.data = options.data || {}; options.data = options.data || {};
options.data.serverId = apiClient.serverInfo().Id; options.data.serverId = apiClient.serverInfo().Id;
@ -95,7 +95,7 @@ function showNewItemNotification(item, apiClient) {
body = item.SeriesName + ' - ' + body; body = item.SeriesName + ' - ' + body;
} }
let notification = { const notification = {
title: 'New ' + item.Type, title: 'New ' + item.Type,
body: body, body: body,
vibrate: true, vibrate: true,
@ -103,7 +103,7 @@ function showNewItemNotification(item, apiClient) {
data: {} data: {}
}; };
let imageTags = item.ImageTags || {}; const imageTags = item.ImageTags || {};
if (imageTags.Primary) { if (imageTags.Primary) {
notification.icon = apiClient.getScaledImageUrl(item.Id, { notification.icon = apiClient.getScaledImageUrl(item.Id, {
@ -117,7 +117,7 @@ function showNewItemNotification(item, apiClient) {
} }
function onLibraryChanged(data, apiClient) { function onLibraryChanged(data, apiClient) {
let newItems = data.ItemsAdded; const newItems = data.ItemsAdded;
if (!newItems.length) { if (!newItems.length) {
return; return;
@ -140,7 +140,7 @@ function onLibraryChanged(data, apiClient) {
EnableTotalRecordCount: false EnableTotalRecordCount: false
}).then(function (result) { }).then(function (result) {
let items = result.Items; const items = result.Items;
for (const item of items) { for (const item of items) {
showNewItemNotification(item, apiClient); showNewItemNotification(item, apiClient);
@ -159,7 +159,7 @@ function showPackageInstallNotification(apiClient, installation, status) {
return; return;
} }
let notification = { const notification = {
tag: 'install' + installation.Id, tag: 'install' + installation.Id,
data: {} data: {}
}; };
@ -188,12 +188,12 @@ function showPackageInstallNotification(apiClient, installation, status) {
} }
if (status === 'progress') { if (status === 'progress') {
let percentComplete = Math.round(installation.PercentComplete || 0); const percentComplete = Math.round(installation.PercentComplete || 0);
notification.body = percentComplete + '% complete.'; notification.body = percentComplete + '% complete.';
} }
let timeout = status === 'cancelled' ? 5000 : 0; const timeout = status === 'cancelled' ? 5000 : 0;
showNotification(notification, timeout, apiClient); showNotification(notification, timeout, apiClient);
}); });
@ -220,8 +220,8 @@ events.on(serverNotifications, 'PackageInstalling', function (e, apiClient, data
}); });
events.on(serverNotifications, 'ServerShuttingDown', function (e, apiClient, data) { events.on(serverNotifications, 'ServerShuttingDown', function (e, apiClient, data) {
let serverId = apiClient.serverInfo().Id; const serverId = apiClient.serverInfo().Id;
let notification = { const notification = {
tag: 'restart' + serverId, tag: 'restart' + serverId,
title: globalize.translate('ServerNameIsShuttingDown', apiClient.serverInfo().Name) title: globalize.translate('ServerNameIsShuttingDown', apiClient.serverInfo().Name)
}; };
@ -229,8 +229,8 @@ events.on(serverNotifications, 'ServerShuttingDown', function (e, apiClient, dat
}); });
events.on(serverNotifications, 'ServerRestarting', function (e, apiClient, data) { events.on(serverNotifications, 'ServerRestarting', function (e, apiClient, data) {
let serverId = apiClient.serverInfo().Id; const serverId = apiClient.serverInfo().Id;
let notification = { const notification = {
tag: 'restart' + serverId, tag: 'restart' + serverId,
title: globalize.translate('ServerNameIsRestarting', apiClient.serverInfo().Name) title: globalize.translate('ServerNameIsRestarting', apiClient.serverInfo().Name)
}; };
@ -238,8 +238,8 @@ events.on(serverNotifications, 'ServerRestarting', function (e, apiClient, data)
}); });
events.on(serverNotifications, 'RestartRequired', function (e, apiClient) { events.on(serverNotifications, 'RestartRequired', function (e, apiClient) {
let serverId = apiClient.serverInfo().Id; const serverId = apiClient.serverInfo().Id;
let notification = { const notification = {
tag: 'restart' + serverId, tag: 'restart' + serverId,
title: globalize.translate('PleaseRestartServerName', apiClient.serverInfo().Name) title: globalize.translate('PleaseRestartServerName', apiClient.serverInfo().Name)
}; };
@ -248,7 +248,7 @@ events.on(serverNotifications, 'RestartRequired', function (e, apiClient) {
[ [
{ {
action: 'restart', action: 'restart',
title: globalize.translate('ButtonRestart'), title: globalize.translate('Restart'),
icon: getIconUrl() icon: getIconUrl()
} }
]; ];

13
src/components/nowPlayingBar/nowPlayingBar.js
View file

@ -7,7 +7,6 @@ import playbackManager from 'playbackManager';
import nowPlayingHelper from 'nowPlayingHelper'; import nowPlayingHelper from 'nowPlayingHelper';
import appHost from 'apphost'; import appHost from 'apphost';
import dom from 'dom'; import dom from 'dom';
import connectionManager from 'connectionManager';
import itemContextMenu from 'itemContextMenu'; import itemContextMenu from 'itemContextMenu';
import 'paper-icon-button-light'; import 'paper-icon-button-light';
import 'emby-ratingbutton'; import 'emby-ratingbutton';
@ -452,7 +451,7 @@ import 'emby-ratingbutton';
if (item.SeriesPrimaryImageTag) { if (item.SeriesPrimaryImageTag) {
options.tag = item.SeriesPrimaryImageTag; options.tag = item.SeriesPrimaryImageTag;
return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options); return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
} }
} }
@ -460,12 +459,12 @@ import 'emby-ratingbutton';
if (item.SeriesThumbImageTag) { if (item.SeriesThumbImageTag) {
options.tag = item.SeriesThumbImageTag; options.tag = item.SeriesThumbImageTag;
return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options); return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
} }
if (item.ParentThumbImageTag) { if (item.ParentThumbImageTag) {
options.tag = item.ParentThumbImageTag; options.tag = item.ParentThumbImageTag;
return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.ParentThumbItemId, options); return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.ParentThumbItemId, options);
} }
} }
@ -482,12 +481,12 @@ import 'emby-ratingbutton';
if (item.ImageTags && item.ImageTags[options.type]) { if (item.ImageTags && item.ImageTags[options.type]) {
options.tag = item.ImageTags[options.type]; options.tag = item.ImageTags[options.type];
return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.PrimaryImageItemId || item.Id, options); return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.PrimaryImageItemId || item.Id, options);
} }
if (item.AlbumId && item.AlbumPrimaryImageTag) { if (item.AlbumId && item.AlbumPrimaryImageTag) {
options.tag = item.AlbumPrimaryImageTag; options.tag = item.AlbumPrimaryImageTag;
return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.AlbumId, options); return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.AlbumId, options);
} }
return null; return null;
@ -548,7 +547,7 @@ import 'emby-ratingbutton';
if (nowPlayingItem.Id) { if (nowPlayingItem.Id) {
if (isRefreshing) { if (isRefreshing) {
const apiClient = connectionManager.getApiClient(nowPlayingItem.ServerId); const apiClient = window.connectionManager.getApiClient(nowPlayingItem.ServerId);
apiClient.getItem(apiClient.getCurrentUserId(), nowPlayingItem.Id).then(function (item) { apiClient.getItem(apiClient.getCurrentUserId(), nowPlayingItem.Id).then(function (item) {
const userData = item.UserData || {}; const userData = item.UserData || {};
const likes = userData.Likes == null ? '' : userData.Likes; const likes = userData.Likes == null ? '' : userData.Likes;

11
src/components/playback/mediasession.js
View file

@ -1,7 +1,6 @@
import playbackManager from 'playbackManager'; import playbackManager from 'playbackManager';
import nowPlayingHelper from 'nowPlayingHelper'; import nowPlayingHelper from 'nowPlayingHelper';
import events from 'events'; import events from 'events';
import connectionManager from 'connectionManager';
/* eslint-disable indent */ /* eslint-disable indent */
// Reports media playback to the device for lock screen control // Reports media playback to the device for lock screen control
@ -16,16 +15,16 @@ import connectionManager from 'connectionManager';
} else if (options.type === 'Primary' && item.SeriesPrimaryImageTag) { } else if (options.type === 'Primary' && item.SeriesPrimaryImageTag) {
options.tag = item.SeriesPrimaryImageTag; options.tag = item.SeriesPrimaryImageTag;
return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options); return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
} else if (options.type === 'Thumb') { } else if (options.type === 'Thumb') {
if (item.SeriesThumbImageTag) { if (item.SeriesThumbImageTag) {
options.tag = item.SeriesThumbImageTag; options.tag = item.SeriesThumbImageTag;
return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options); return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
} else if (item.ParentThumbImageTag) { } else if (item.ParentThumbImageTag) {
options.tag = item.ParentThumbImageTag; options.tag = item.ParentThumbImageTag;
return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.ParentThumbItemId, options); return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.ParentThumbItemId, options);
} }
} }
@ -38,11 +37,11 @@ import connectionManager from 'connectionManager';
if (item.ImageTags && item.ImageTags[options.type]) { if (item.ImageTags && item.ImageTags[options.type]) {
options.tag = item.ImageTags[options.type]; options.tag = item.ImageTags[options.type];
return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.Id, options); return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.Id, options);
} else if (item.AlbumId && item.AlbumPrimaryImageTag) { } else if (item.AlbumId && item.AlbumPrimaryImageTag) {
options.tag = item.AlbumPrimaryImageTag; options.tag = item.AlbumPrimaryImageTag;
return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.AlbumId, options); return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.AlbumId, options);
} }
return null; return null;

77
src/components/playback/playbackmanager.js
View file

@ -6,7 +6,6 @@ import pluginManager from 'pluginManager';
import PlayQueueManager from 'playQueueManager'; import PlayQueueManager from 'playQueueManager';
import * as userSettings from 'userSettings'; import * as userSettings from 'userSettings';
import globalize from 'globalize'; import globalize from 'globalize';
import connectionManager from 'connectionManager';
import loading from 'loading'; import loading from 'loading';
import appHost from 'apphost'; import appHost from 'apphost';
import screenfull from 'screenfull'; import screenfull from 'screenfull';
@ -69,7 +68,7 @@ function reportPlayback(playbackManagerInstance, state, player, reportPlaylist,
addPlaylistToPlaybackReport(playbackManagerInstance, info, player, serverId); addPlaylistToPlaybackReport(playbackManagerInstance, info, player, serverId);
} }
const apiClient = connectionManager.getApiClient(serverId); const apiClient = window.connectionManager.getApiClient(serverId);
const reportPlaybackPromise = apiClient[method](info); const reportPlaybackPromise = apiClient[method](info);
// Notify that report has been sent // Notify that report has been sent
reportPlaybackPromise.then(() => { reportPlaybackPromise.then(() => {
@ -106,7 +105,7 @@ function normalizeName(t) {
} }
function getItemsForPlayback(serverId, query) { function getItemsForPlayback(serverId, query) {
const apiClient = connectionManager.getApiClient(serverId); const apiClient = window.connectionManager.getApiClient(serverId);
if (query.Ids && query.Ids.split(',').length === 1) { if (query.Ids && query.Ids.split(',').length === 1) {
const itemId = query.Ids.split(','); const itemId = query.Ids.split(',');
@ -640,22 +639,18 @@ function supportsDirectPlay(apiClient, item, mediaSource) {
function validatePlaybackInfoResult(instance, result) { function validatePlaybackInfoResult(instance, result) {
if (result.ErrorCode) { if (result.ErrorCode) {
showPlaybackInfoErrorMessage(instance, result.ErrorCode); showPlaybackInfoErrorMessage(instance, 'PlaybackError' + result.ErrorCode);
return false; return false;
} }
return true; return true;
} }
function showPlaybackInfoErrorMessage(instance, errorCode, playNextTrack) { function showPlaybackInfoErrorMessage(instance, errorCode) {
import('alert').then(({ default: alert }) => { import('alert').then(({ default: alert }) => {
alert({ alert({
text: globalize.translate('PlaybackError' + errorCode), text: globalize.translate(errorCode),
title: globalize.translate('HeaderPlaybackError') title: globalize.translate('HeaderPlaybackError')
}).then(function () {
if (playNextTrack) {
instance.nextTrack();
}
}); });
}); });
} }
@ -874,7 +869,7 @@ class PlaybackManager {
const promises = players.filter(displayPlayerIndividually).map(getPlayerTargets); const promises = players.filter(displayPlayerIndividually).map(getPlayerTargets);
return Promise.all(promises).then(function (responses) { return Promise.all(promises).then(function (responses) {
return connectionManager.currentApiClient().getCurrentUser().then(function (user) { return window.connectionManager.currentApiClient().getCurrentUser().then(function (user) {
const targets = []; const targets = [];
targets.push({ targets.push({
@ -1115,8 +1110,8 @@ class PlaybackManager {
self.increasePlaybackRate = function (player) { self.increasePlaybackRate = function (player) {
player = player || self._currentPlayer; player = player || self._currentPlayer;
if (player) { if (player) {
let current = self.getPlaybackRate(player); const current = self.getPlaybackRate(player);
let supported = self.getSupportedPlaybackRates(player); const supported = self.getSupportedPlaybackRates(player);
let index = -1; let index = -1;
for (let i = 0, length = supported.length; i < length; i++) { for (let i = 0, length = supported.length; i < length; i++) {
@ -1134,8 +1129,8 @@ class PlaybackManager {
self.decreasePlaybackRate = function (player) { self.decreasePlaybackRate = function (player) {
player = player || self._currentPlayer; player = player || self._currentPlayer;
if (player) { if (player) {
let current = self.getPlaybackRate(player); const current = self.getPlaybackRate(player);
let supported = self.getSupportedPlaybackRates(player); const supported = self.getSupportedPlaybackRates(player);
let index = -1; let index = -1;
for (let i = 0, length = supported.length; i < length; i++) { for (let i = 0, length = supported.length; i < length; i++) {
@ -1372,7 +1367,7 @@ class PlaybackManager {
function getSavedMaxStreamingBitrate(apiClient, mediaType) { function getSavedMaxStreamingBitrate(apiClient, mediaType) {
if (!apiClient) { if (!apiClient) {
// This should hopefully never happen // This should hopefully never happen
apiClient = connectionManager.currentApiClient(); apiClient = window.connectionManager.currentApiClient();
} }
const endpointInfo = apiClient.getSavedEndpointInfo() || {}; const endpointInfo = apiClient.getSavedEndpointInfo() || {};
@ -1395,7 +1390,7 @@ class PlaybackManager {
const mediaType = playerData.streamInfo ? playerData.streamInfo.mediaType : null; const mediaType = playerData.streamInfo ? playerData.streamInfo.mediaType : null;
const currentItem = self.currentItem(player); const currentItem = self.currentItem(player);
const apiClient = currentItem ? connectionManager.getApiClient(currentItem.ServerId) : connectionManager.currentApiClient(); const apiClient = currentItem ? window.connectionManager.getApiClient(currentItem.ServerId) : window.connectionManager.currentApiClient();
return getSavedMaxStreamingBitrate(apiClient, mediaType); return getSavedMaxStreamingBitrate(apiClient, mediaType);
}; };
@ -1409,7 +1404,7 @@ class PlaybackManager {
const mediaType = playerData.streamInfo ? playerData.streamInfo.mediaType : null; const mediaType = playerData.streamInfo ? playerData.streamInfo.mediaType : null;
const currentItem = self.currentItem(player); const currentItem = self.currentItem(player);
const apiClient = currentItem ? connectionManager.getApiClient(currentItem.ServerId) : connectionManager.currentApiClient(); const apiClient = currentItem ? window.connectionManager.getApiClient(currentItem.ServerId) : window.connectionManager.currentApiClient();
const endpointInfo = apiClient.getSavedEndpointInfo() || {}; const endpointInfo = apiClient.getSavedEndpointInfo() || {};
return appSettings.enableAutomaticBitrateDetection(endpointInfo.IsInNetwork, mediaType); return appSettings.enableAutomaticBitrateDetection(endpointInfo.IsInNetwork, mediaType);
@ -1421,7 +1416,7 @@ class PlaybackManager {
return player.setMaxStreamingBitrate(options); return player.setMaxStreamingBitrate(options);
} }
const apiClient = connectionManager.getApiClient(self.currentItem(player).ServerId); const apiClient = window.connectionManager.getApiClient(self.currentItem(player).ServerId);
apiClient.getEndpointInfo().then(function (endpointInfo) { apiClient.getEndpointInfo().then(function (endpointInfo) {
const playerData = getPlayerData(player); const playerData = getPlayerData(player);
@ -1683,7 +1678,7 @@ class PlaybackManager {
const subtitleStreamIndex = params.SubtitleStreamIndex == null ? getPlayerData(player).subtitleStreamIndex : params.SubtitleStreamIndex; const subtitleStreamIndex = params.SubtitleStreamIndex == null ? getPlayerData(player).subtitleStreamIndex : params.SubtitleStreamIndex;
let currentMediaSource = self.currentMediaSource(player); let currentMediaSource = self.currentMediaSource(player);
const apiClient = connectionManager.getApiClient(currentItem.ServerId); const apiClient = window.connectionManager.getApiClient(currentItem.ServerId);
if (ticks) { if (ticks) {
ticks = parseInt(ticks); ticks = parseInt(ticks);
@ -1702,7 +1697,7 @@ class PlaybackManager {
streamInfo.lastMediaInfoQuery = lastMediaInfoQuery; streamInfo.lastMediaInfoQuery = lastMediaInfoQuery;
if (!streamInfo.url) { if (!streamInfo.url) {
showPlaybackInfoErrorMessage(self, 'NoCompatibleStream', true); showPlaybackInfoErrorMessage(self, 'PlaybackErrorNoCompatibleStream');
return; return;
} }
@ -1839,7 +1834,7 @@ class PlaybackManager {
}, queryOptions)); }, queryOptions));
} else if (firstItem.Type === 'Episode' && items.length === 1 && getPlayer(firstItem, options).supportsProgress !== false) { } else if (firstItem.Type === 'Episode' && items.length === 1 && getPlayer(firstItem, options).supportsProgress !== false) {
promise = new Promise(function (resolve, reject) { promise = new Promise(function (resolve, reject) {
const apiClient = connectionManager.getApiClient(firstItem.ServerId); const apiClient = window.connectionManager.getApiClient(firstItem.ServerId);
apiClient.getCurrentUser().then(function (user) { apiClient.getCurrentUser().then(function (user) {
if (!user.Configuration.EnableNextEpisodeAutoPlay || !firstItem.SeriesId) { if (!user.Configuration.EnableNextEpisodeAutoPlay || !firstItem.SeriesId) {
@ -2062,7 +2057,7 @@ class PlaybackManager {
// If it's still null then there's nothing to play // If it's still null then there's nothing to play
if (!firstItem) { if (!firstItem) {
showPlaybackInfoErrorMessage(self, 'NoCompatibleStream', false); showPlaybackInfoErrorMessage(self, 'PlaybackErrorNoCompatibleStream');
return Promise.reject(); return Promise.reject();
} }
@ -2070,7 +2065,7 @@ class PlaybackManager {
return playOther(items, options, user); return playOther(items, options, user);
} }
const apiClient = connectionManager.getApiClient(firstItem.ServerId); const apiClient = window.connectionManager.getApiClient(firstItem.ServerId);
return getIntros(firstItem, apiClient, options).then(function (introsResult) { return getIntros(firstItem, apiClient, options).then(function (introsResult) {
const introItems = introsResult.Items; const introItems = introsResult.Items;
@ -2111,7 +2106,7 @@ class PlaybackManager {
function playInternal(item, playOptions, onPlaybackStartedFn) { function playInternal(item, playOptions, onPlaybackStartedFn) {
if (item.IsPlaceHolder) { if (item.IsPlaceHolder) {
loading.hide(); loading.hide();
showPlaybackInfoErrorMessage(self, 'PlaceHolder', true); showPlaybackInfoErrorMessage(self, 'PlaybackErrorPlaceHolder');
return Promise.reject(); return Promise.reject();
} }
@ -2133,14 +2128,14 @@ class PlaybackManager {
const mediaType = item.MediaType; const mediaType = item.MediaType;
const onBitrateDetectionFailure = function () { const onBitrateDetectionFailure = function () {
return playAfterBitrateDetect(getSavedMaxStreamingBitrate(connectionManager.getApiClient(item.ServerId), mediaType), item, playOptions, onPlaybackStartedFn); return playAfterBitrateDetect(getSavedMaxStreamingBitrate(window.connectionManager.getApiClient(item.ServerId), mediaType), item, playOptions, onPlaybackStartedFn);
}; };
if (!isServerItem(item) || itemHelper.isLocalItem(item)) { if (!isServerItem(item) || itemHelper.isLocalItem(item)) {
return onBitrateDetectionFailure(); return onBitrateDetectionFailure();
} }
const apiClient = connectionManager.getApiClient(item.ServerId); const apiClient = window.connectionManager.getApiClient(item.ServerId);
apiClient.getEndpointInfo().then(function (endpointInfo) { apiClient.getEndpointInfo().then(function (endpointInfo) {
if ((mediaType === 'Video' || mediaType === 'Audio') && appSettings.enableAutomaticBitrateDetection(endpointInfo.IsInNetwork, mediaType)) { if ((mediaType === 'Video' || mediaType === 'Audio') && appSettings.enableAutomaticBitrateDetection(endpointInfo.IsInNetwork, mediaType)) {
return apiClient.detectBitrate().then(function (bitrate) { return apiClient.detectBitrate().then(function (bitrate) {
@ -2259,7 +2254,7 @@ class PlaybackManager {
return Promise.all([promise, player.getDeviceProfile(item)]).then(function (responses) { return Promise.all([promise, player.getDeviceProfile(item)]).then(function (responses) {
const deviceProfile = responses[1]; const deviceProfile = responses[1];
const apiClient = connectionManager.getApiClient(item.ServerId); const apiClient = window.connectionManager.getApiClient(item.ServerId);
const mediaSourceId = playOptions.mediaSourceId; const mediaSourceId = playOptions.mediaSourceId;
const audioStreamIndex = playOptions.audioStreamIndex; const audioStreamIndex = playOptions.audioStreamIndex;
@ -2304,11 +2299,11 @@ class PlaybackManager {
const startPosition = options.startPositionTicks || 0; const startPosition = options.startPositionTicks || 0;
const mediaType = options.mediaType || item.MediaType; const mediaType = options.mediaType || item.MediaType;
const player = getPlayer(item, options); const player = getPlayer(item, options);
const apiClient = connectionManager.getApiClient(item.ServerId); const apiClient = window.connectionManager.getApiClient(item.ServerId);
// Call this just to ensure the value is recorded, it is needed with getSavedMaxStreamingBitrate // Call this just to ensure the value is recorded, it is needed with getSavedMaxStreamingBitrate
return apiClient.getEndpointInfo().then(function () { return apiClient.getEndpointInfo().then(function () {
const maxBitrate = getSavedMaxStreamingBitrate(connectionManager.getApiClient(item.ServerId), mediaType); const maxBitrate = getSavedMaxStreamingBitrate(window.connectionManager.getApiClient(item.ServerId), mediaType);
return player.getDeviceProfile(item).then(function (deviceProfile) { return player.getDeviceProfile(item).then(function (deviceProfile) {
return getPlaybackMediaSource(player, apiClient, deviceProfile, maxBitrate, item, startPosition, options.mediaSourceId, options.audioStreamIndex, options.subtitleStreamIndex).then(function (mediaSource) { return getPlaybackMediaSource(player, apiClient, deviceProfile, maxBitrate, item, startPosition, options.mediaSourceId, options.audioStreamIndex, options.subtitleStreamIndex).then(function (mediaSource) {
@ -2324,11 +2319,11 @@ class PlaybackManager {
const mediaType = options.mediaType || item.MediaType; const mediaType = options.mediaType || item.MediaType;
// TODO: Remove the true forceLocalPlayer hack // TODO: Remove the true forceLocalPlayer hack
const player = getPlayer(item, options, true); const player = getPlayer(item, options, true);
const apiClient = connectionManager.getApiClient(item.ServerId); const apiClient = window.connectionManager.getApiClient(item.ServerId);
// Call this just to ensure the value is recorded, it is needed with getSavedMaxStreamingBitrate // Call this just to ensure the value is recorded, it is needed with getSavedMaxStreamingBitrate
return apiClient.getEndpointInfo().then(function () { return apiClient.getEndpointInfo().then(function () {
const maxBitrate = getSavedMaxStreamingBitrate(connectionManager.getApiClient(item.ServerId), mediaType); const maxBitrate = getSavedMaxStreamingBitrate(window.connectionManager.getApiClient(item.ServerId), mediaType);
return player.getDeviceProfile(item).then(function (deviceProfile) { return player.getDeviceProfile(item).then(function (deviceProfile) {
return getPlaybackInfo(player, apiClient, item, deviceProfile, maxBitrate, startPosition, false, null, null, null, null).then(function (playbackInfoResult) { return getPlaybackInfo(player, apiClient, item, deviceProfile, maxBitrate, startPosition, false, null, null, null, null).then(function (playbackInfoResult) {
@ -2480,7 +2475,7 @@ class PlaybackManager {
return mediaSource; return mediaSource;
} }
} else { } else {
showPlaybackInfoErrorMessage(self, 'NoCompatibleStream'); showPlaybackInfoErrorMessage(self, 'PlaybackErrorNoCompatibleStream');
return Promise.reject(); return Promise.reject();
} }
}); });
@ -2712,7 +2707,7 @@ class PlaybackManager {
const queueDirectToPlayer = player && !enableLocalPlaylistManagement(player); const queueDirectToPlayer = player && !enableLocalPlaylistManagement(player);
if (queueDirectToPlayer) { if (queueDirectToPlayer) {
const apiClient = connectionManager.getApiClient(items[0].ServerId); const apiClient = window.connectionManager.getApiClient(items[0].ServerId);
player.getDeviceProfile(items[0]).then(function (profile) { player.getDeviceProfile(items[0]).then(function (profile) {
setStreamUrls(items, profile, self.getMaxStreamingBitrate(player), apiClient, 0).then(function () { setStreamUrls(items, profile, self.getMaxStreamingBitrate(player), apiClient, 0).then(function () {
@ -2969,7 +2964,7 @@ class PlaybackManager {
} }
if (displayErrorCode && typeof (displayErrorCode) === 'string') { if (displayErrorCode && typeof (displayErrorCode) === 'string') {
showPlaybackInfoErrorMessage(self, displayErrorCode, nextItem); showPlaybackInfoErrorMessage(self, 'PlaybackError' + displayErrorCode);
} else if (nextItem) { } else if (nextItem) {
self.nextTrack(); self.nextTrack();
} else { } else {
@ -3162,13 +3157,13 @@ class PlaybackManager {
streamInfo.lastMediaInfoQuery = new Date().getTime(); streamInfo.lastMediaInfoQuery = new Date().getTime();
const apiClient = connectionManager.getApiClient(serverId); const apiClient = window.connectionManager.getApiClient(serverId);
if (!apiClient.isMinServerVersion('3.2.70.7')) { if (!apiClient.isMinServerVersion('3.2.70.7')) {
return; return;
} }
connectionManager.getApiClient(serverId).getLiveStreamMediaInfo(liveStreamId).then(function (info) { window.connectionManager.getApiClient(serverId).getLiveStreamMediaInfo(liveStreamId).then(function (info) {
mediaSource.MediaStreams = info.MediaStreams; mediaSource.MediaStreams = info.MediaStreams;
events.trigger(player, 'mediastreamschange'); events.trigger(player, 'mediastreamschange');
}, function () { }, function () {
@ -3225,7 +3220,7 @@ class PlaybackManager {
return Promise.reject(); return Promise.reject();
} }
const apiClient = connectionManager.getApiClient(nextItem.item.ServerId); const apiClient = window.connectionManager.getApiClient(nextItem.item.ServerId);
return apiClient.getItem(apiClient.getCurrentUserId(), nextItem.item.Id); return apiClient.getItem(apiClient.getCurrentUserId(), nextItem.item.Id);
} }
@ -3366,7 +3361,7 @@ class PlaybackManager {
return player.playTrailers(item); return player.playTrailers(item);
} }
const apiClient = connectionManager.getApiClient(item.ServerId); const apiClient = window.connectionManager.getApiClient(item.ServerId);
const instance = this; const instance = this;
@ -3398,7 +3393,7 @@ class PlaybackManager {
} }
getSubtitleUrl(textStream, serverId) { getSubtitleUrl(textStream, serverId) {
const apiClient = connectionManager.getApiClient(serverId); const apiClient = window.connectionManager.getApiClient(serverId);
return !textStream.IsExternalUrl ? apiClient.getUrl(textStream.DeliveryUrl) : textStream.DeliveryUrl; return !textStream.IsExternalUrl ? apiClient.getUrl(textStream.DeliveryUrl) : textStream.DeliveryUrl;
} }
@ -3478,7 +3473,7 @@ class PlaybackManager {
return player.instantMix(item); return player.instantMix(item);
} }
const apiClient = connectionManager.getApiClient(item.ServerId); const apiClient = window.connectionManager.getApiClient(item.ServerId);
const options = {}; const options = {};
options.UserId = apiClient.getCurrentUserId(); options.UserId = apiClient.getCurrentUserId();

3
src/components/playback/playersettingsmenu.js
View file

@ -1,4 +1,3 @@
import connectionManager from 'connectionManager';
import actionsheet from 'actionsheet'; import actionsheet from 'actionsheet';
import playbackManager from 'playbackManager'; import playbackManager from 'playbackManager';
import globalize from 'globalize'; import globalize from 'globalize';
@ -251,7 +250,7 @@ export function show(options) {
return showWithUser(options, player, null); return showWithUser(options, player, null);
} }
var apiClient = connectionManager.getApiClient(currentItem.ServerId); var apiClient = window.connectionManager.getApiClient(currentItem.ServerId);
return apiClient.getCurrentUser().then(function (user) { return apiClient.getCurrentUser().then(function (user) {
return showWithUser(options, player, user); return showWithUser(options, player, user);
}); });

5
src/components/playbackSettings/playbackSettings.js
View file

@ -5,7 +5,6 @@ import focusManager from 'focusManager';
import qualityoptions from 'qualityoptions'; import qualityoptions from 'qualityoptions';
import globalize from 'globalize'; import globalize from 'globalize';
import loading from 'loading'; import loading from 'loading';
import connectionManager from 'connectionManager';
import events from 'events'; import events from 'events';
import 'emby-select'; import 'emby-select';
import 'emby-checkbox'; import 'emby-checkbox';
@ -258,7 +257,7 @@ import 'emby-checkbox';
function onSubmit(e) { function onSubmit(e) {
const self = this; const self = this;
const apiClient = connectionManager.getApiClient(self.options.serverId); const apiClient = window.connectionManager.getApiClient(self.options.serverId);
const userId = self.options.userId; const userId = self.options.userId;
const userSettings = self.options.userSettings; const userSettings = self.options.userSettings;
@ -305,7 +304,7 @@ import 'emby-checkbox';
loading.show(); loading.show();
const userId = self.options.userId; const userId = self.options.userId;
const apiClient = connectionManager.getApiClient(self.options.serverId); const apiClient = window.connectionManager.getApiClient(self.options.serverId);
const userSettings = self.options.userSettings; const userSettings = self.options.userSettings;
apiClient.getUser(userId).then(user => { apiClient.getUser(userId).then(user => {

33
src/components/playerstats/playerstats.js
View file

@ -1,7 +1,6 @@
import events from 'events'; import events from 'events';
import globalize from 'globalize'; import globalize from 'globalize';
import playbackManager from 'playbackManager'; import playbackManager from 'playbackManager';
import connectionManager from 'connectionManager';
import syncPlayManager from 'syncPlayManager'; import syncPlayManager from 'syncPlayManager';
import playMethodHelper from 'playMethodHelper'; import playMethodHelper from 'playMethodHelper';
import layoutManager from 'layoutManager'; import layoutManager from 'layoutManager';
@ -95,7 +94,7 @@ import 'css!./playerstats';
return Promise.resolve(instance.lastSession); return Promise.resolve(instance.lastSession);
} }
const apiClient = connectionManager.getApiClient(playbackManager.currentItem(player).ServerId); const apiClient = window.connectionManager.getApiClient(playbackManager.currentItem(player).ServerId);
return apiClient.getSessions({ return apiClient.getSessions({
deviceId: apiClient.deviceId() deviceId: apiClient.deviceId()
@ -264,6 +263,34 @@ import 'css!./playerstats';
}); });
} }
if (videoStream.VideoRange) {
sessionStats.push({
label: globalize.translate('LabelVideoRange'),
value: videoStream.VideoRange
});
}
if (videoStream.ColorSpace) {
sessionStats.push({
label: globalize.translate('LabelColorSpace'),
value: videoStream.ColorSpace
});
}
if (videoStream.ColorTransfer) {
sessionStats.push({
label: globalize.translate('LabelColorTransfer'),
value: videoStream.ColorTransfer
});
}
if (videoStream.ColorPrimaries) {
sessionStats.push({
label: globalize.translate('LabelColorPrimaries'),
value: videoStream.ColorPrimaries
});
}
const audioInfos = []; const audioInfos = [];
if (audioCodec) { if (audioCodec) {
@ -386,7 +413,7 @@ import 'css!./playerstats';
name: 'Original Media Info' name: 'Original Media Info'
}); });
var apiClient = connectionManager.getApiClient(playbackManager.currentItem(player).ServerId); var apiClient = window.connectionManager.getApiClient(playbackManager.currentItem(player).ServerId);
if (syncPlayManager.isSyncPlayEnabled() && apiClient.isMinServerVersion('10.6.0')) { if (syncPlayManager.isSyncPlayEnabled() && apiClient.isMinServerVersion('10.6.0')) {
categories.push({ categories.push({
stats: getSyncPlayStats(), stats: getSyncPlayStats(),

5
src/components/playlisteditor/playlisteditor.js
View file

@ -3,7 +3,6 @@ import dialogHelper from 'dialogHelper';
import loading from 'loading'; import loading from 'loading';
import layoutManager from 'layoutManager'; import layoutManager from 'layoutManager';
import playbackManager from 'playbackManager'; import playbackManager from 'playbackManager';
import connectionManager from 'connectionManager';
import * as userSettings from 'userSettings'; import * as userSettings from 'userSettings';
import appRouter from 'appRouter'; import appRouter from 'appRouter';
import globalize from 'globalize'; import globalize from 'globalize';
@ -22,7 +21,7 @@ import 'emby-button';
const panel = dom.parentWithClass(this, 'dialog'); const panel = dom.parentWithClass(this, 'dialog');
const playlistId = panel.querySelector('#selectPlaylistToAddTo').value; const playlistId = panel.querySelector('#selectPlaylistToAddTo').value;
const apiClient = connectionManager.getApiClient(currentServerId); const apiClient = window.connectionManager.getApiClient(currentServerId);
if (playlistId) { if (playlistId) {
userSettings.set('playlisteditor-lastplaylistid', playlistId); userSettings.set('playlisteditor-lastplaylistid', playlistId);
@ -113,7 +112,7 @@ import 'emby-button';
EnableTotalRecordCount: false EnableTotalRecordCount: false
}; };
const apiClient = connectionManager.getApiClient(currentServerId); const apiClient = window.connectionManager.getApiClient(currentServerId);
apiClient.getItems(apiClient.getCurrentUserId(), options).then(result => { apiClient.getItems(apiClient.getCurrentUserId(), options).then(result => {
let html = ''; let html = '';

3
src/components/recordingcreator/recordingbutton.js
View file

@ -1,4 +1,3 @@
import connectionManager from 'connectionManager';
import dom from 'dom'; import dom from 'dom';
import recordingHelper from 'recordingHelper'; import recordingHelper from 'recordingHelper';
import 'paper-icon-button-light'; import 'paper-icon-button-light';
@ -53,7 +52,7 @@ class RecordingButton {
} }
refresh(serverId, itemId) { refresh(serverId, itemId) {
const apiClient = connectionManager.getApiClient(serverId); const apiClient = window.connectionManager.getApiClient(serverId);
const self = this; const self = this;
apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(function (item) { apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(function (item) {
self.refreshItem(item); self.refreshItem(item);

5
src/components/recordingcreator/recordingcreator.js
View file

@ -2,7 +2,6 @@ import dialogHelper from 'dialogHelper';
import globalize from 'globalize'; import globalize from 'globalize';
import layoutManager from 'layoutManager'; import layoutManager from 'layoutManager';
import mediaInfo from 'mediaInfo'; import mediaInfo from 'mediaInfo';
import connectionManager from 'connectionManager';
import require from 'require'; import require from 'require';
import loading from 'loading'; import loading from 'loading';
import scrollHelper from 'scrollHelper'; import scrollHelper from 'scrollHelper';
@ -103,7 +102,7 @@ function renderRecording(context, defaultTimer, program, apiClient, refreshRecor
function reload(context, programId, serverId, refreshRecordingStateOnly) { function reload(context, programId, serverId, refreshRecordingStateOnly) {
loading.show(); loading.show();
const apiClient = connectionManager.getApiClient(serverId); const apiClient = window.connectionManager.getApiClient(serverId);
const promise1 = apiClient.getNewLiveTvTimerDefaults({ programId: programId }); const promise1 = apiClient.getNewLiveTvTimerDefaults({ programId: programId });
const promise2 = apiClient.getLiveTvProgram(programId, apiClient.getCurrentUserId()); const promise2 = apiClient.getLiveTvProgram(programId, apiClient.getCurrentUserId());
@ -119,7 +118,7 @@ function reload(context, programId, serverId, refreshRecordingStateOnly) {
function executeCloseAction(action, programId, serverId) { function executeCloseAction(action, programId, serverId) {
if (action === 'play') { if (action === 'play') {
import('playbackManager').then(({ default: playbackManager }) => { import('playbackManager').then(({ default: playbackManager }) => {
const apiClient = connectionManager.getApiClient(serverId); const apiClient = window.connectionManager.getApiClient(serverId);
apiClient.getLiveTvProgram(programId, apiClient.getCurrentUserId()).then(function (item) { apiClient.getLiveTvProgram(programId, apiClient.getCurrentUserId()).then(function (item) {
playbackManager.play({ playbackManager.play({

7
src/components/recordingcreator/recordingeditor.js
View file

@ -1,7 +1,6 @@
import dialogHelper from 'dialogHelper'; import dialogHelper from 'dialogHelper';
import globalize from 'globalize'; import globalize from 'globalize';
import layoutManager from 'layoutManager'; import layoutManager from 'layoutManager';
import connectionManager from 'connectionManager';
import loading from 'loading'; import loading from 'loading';
import scrollHelper from 'scrollHelper'; import scrollHelper from 'scrollHelper';
import 'scrollStyles'; import 'scrollStyles';
@ -41,7 +40,7 @@ function closeDialog(isDeleted) {
function onSubmit(e) { function onSubmit(e) {
const form = this; const form = this;
const apiClient = connectionManager.getApiClient(currentServerId); const apiClient = window.connectionManager.getApiClient(currentServerId);
apiClient.getLiveTvTimer(currentItemId).then(function (item) { apiClient.getLiveTvTimer(currentItemId).then(function (item) {
item.PrePaddingSeconds = form.querySelector('#txtPrePaddingMinutes').value * 60; item.PrePaddingSeconds = form.querySelector('#txtPrePaddingMinutes').value * 60;
@ -61,7 +60,7 @@ function init(context) {
}); });
context.querySelector('.btnCancelRecording').addEventListener('click', function () { context.querySelector('.btnCancelRecording').addEventListener('click', function () {
const apiClient = connectionManager.getApiClient(currentServerId); const apiClient = window.connectionManager.getApiClient(currentServerId);
deleteTimer(apiClient, currentItemId).then(function () { deleteTimer(apiClient, currentItemId).then(function () {
closeDialog(true); closeDialog(true);
@ -75,7 +74,7 @@ function reload(context, id) {
loading.show(); loading.show();
currentItemId = id; currentItemId = id;
const apiClient = connectionManager.getApiClient(currentServerId); const apiClient = window.connectionManager.getApiClient(currentServerId);
apiClient.getLiveTvTimer(id).then(function (result) { apiClient.getLiveTvTimer(id).then(function (result) {
renderTimer(context, result, apiClient); renderTimer(context, result, apiClient);
loading.hide(); loading.hide();

7
src/components/recordingcreator/recordingfields.js
View file

@ -1,5 +1,4 @@
import globalize from 'globalize'; import globalize from 'globalize';
import connectionManager from 'connectionManager';
import serverNotifications from 'serverNotifications'; import serverNotifications from 'serverNotifications';
import loading from 'loading'; import loading from 'loading';
import dom from 'dom'; import dom from 'dom';
@ -46,7 +45,7 @@ function loadData(parent, program, apiClient) {
function fetchData(instance) { function fetchData(instance) {
const options = instance.options; const options = instance.options;
const apiClient = connectionManager.getApiClient(options.serverId); const apiClient = window.connectionManager.getApiClient(options.serverId);
options.parent.querySelector('.recordingFields').classList.remove('hide'); options.parent.querySelector('.recordingFields').classList.remove('hide');
return apiClient.getLiveTvProgram(options.programId, apiClient.getCurrentUserId()).then(function (program) { return apiClient.getLiveTvProgram(options.programId, apiClient.getCurrentUserId()).then(function (program) {
@ -197,7 +196,7 @@ function onRecordChange(e) {
const self = this; const self = this;
const options = this.options; const options = this.options;
const apiClient = connectionManager.getApiClient(options.serverId); const apiClient = window.connectionManager.getApiClient(options.serverId);
const button = dom.parentWithTag(e.target, 'BUTTON'); const button = dom.parentWithTag(e.target, 'BUTTON');
const isChecked = !button.querySelector('.material-icons').classList.contains('recordingIcon-active'); const isChecked = !button.querySelector('.material-icons').classList.contains('recordingIcon-active');
@ -236,7 +235,7 @@ function onRecordSeriesChange(e) {
const self = this; const self = this;
const options = this.options; const options = this.options;
const apiClient = connectionManager.getApiClient(options.serverId); const apiClient = window.connectionManager.getApiClient(options.serverId);
const button = dom.parentWithTag(e.target, 'BUTTON'); const button = dom.parentWithTag(e.target, 'BUTTON');
const isChecked = !button.querySelector('.material-icons').classList.contains('recordingIcon-active'); const isChecked = !button.querySelector('.material-icons').classList.contains('recordingIcon-active');

9
src/components/recordingcreator/recordinghelper.js
View file

@ -1,6 +1,5 @@
import globalize from 'globalize'; import globalize from 'globalize';
import loading from 'loading'; import loading from 'loading';
import connectionManager from 'connectionManager';
/*eslint prefer-const: "error"*/ /*eslint prefer-const: "error"*/
@ -40,7 +39,7 @@ function cancelTimerWithConfirmation(timerId, serverId) {
}).then(function () { }).then(function () {
loading.show(); loading.show();
const apiClient = connectionManager.getApiClient(serverId); const apiClient = window.connectionManager.getApiClient(serverId);
cancelTimer(apiClient, timerId, true).then(resolve, reject); cancelTimer(apiClient, timerId, true).then(resolve, reject);
}, reject); }, reject);
}); });
@ -60,7 +59,7 @@ function cancelSeriesTimerWithConfirmation(timerId, serverId) {
}).then(function () { }).then(function () {
loading.show(); loading.show();
const apiClient = connectionManager.getApiClient(serverId); const apiClient = window.connectionManager.getApiClient(serverId);
apiClient.cancelLiveTvSeriesTimer(timerId).then(function () { apiClient.cancelLiveTvSeriesTimer(timerId).then(function () {
import('toast').then(({default: toast}) => { import('toast').then(({default: toast}) => {
toast(globalize.translate('SeriesCancelled')); toast(globalize.translate('SeriesCancelled'));
@ -141,7 +140,7 @@ function showMultiCancellationPrompt(serverId, programId, timerId, timerStatus,
buttons: items buttons: items
}).then(function (result) { }).then(function (result) {
const apiClient = connectionManager.getApiClient(serverId); const apiClient = window.connectionManager.getApiClient(serverId);
if (result === 'canceltimer') { if (result === 'canceltimer') {
loading.show(); loading.show();
@ -167,7 +166,7 @@ function showMultiCancellationPrompt(serverId, programId, timerId, timerStatus,
} }
function toggleRecording(serverId, programId, timerId, timerStatus, seriesTimerId) { function toggleRecording(serverId, programId, timerId, timerStatus, seriesTimerId) {
const apiClient = connectionManager.getApiClient(serverId); const apiClient = window.connectionManager.getApiClient(serverId);
const hasTimer = timerId && timerStatus !== 'Cancelled'; const hasTimer = timerId && timerStatus !== 'Cancelled';
if (seriesTimerId && hasTimer) { if (seriesTimerId && hasTimer) {
// cancel // cancel

7
src/components/recordingcreator/seriesrecordingeditor.js
View file

@ -1,7 +1,6 @@
import dialogHelper from 'dialogHelper'; import dialogHelper from 'dialogHelper';
import globalize from 'globalize'; import globalize from 'globalize';
import layoutManager from 'layoutManager'; import layoutManager from 'layoutManager';
import connectionManager from 'connectionManager';
import loading from 'loading'; import loading from 'loading';
import scrollHelper from 'scrollHelper'; import scrollHelper from 'scrollHelper';
import datetime from 'datetime'; import datetime from 'datetime';
@ -64,7 +63,7 @@ function closeDialog(isDeleted) {
function onSubmit(e) { function onSubmit(e) {
const form = this; const form = this;
const apiClient = connectionManager.getApiClient(currentServerId); const apiClient = window.connectionManager.getApiClient(currentServerId);
apiClient.getLiveTvSeriesTimer(currentItemId).then(function (item) { apiClient.getLiveTvSeriesTimer(currentItemId).then(function (item) {
item.PrePaddingSeconds = form.querySelector('#txtPrePaddingMinutes').value * 60; item.PrePaddingSeconds = form.querySelector('#txtPrePaddingMinutes').value * 60;
@ -92,7 +91,7 @@ function init(context) {
}); });
context.querySelector('.btnCancelRecording').addEventListener('click', function () { context.querySelector('.btnCancelRecording').addEventListener('click', function () {
const apiClient = connectionManager.getApiClient(currentServerId); const apiClient = window.connectionManager.getApiClient(currentServerId);
deleteTimer(apiClient, currentItemId).then(function () { deleteTimer(apiClient, currentItemId).then(function () {
closeDialog(true); closeDialog(true);
}); });
@ -102,7 +101,7 @@ function init(context) {
} }
function reload(context, id) { function reload(context, id) {
const apiClient = connectionManager.getApiClient(currentServerId); const apiClient = window.connectionManager.getApiClient(currentServerId);
loading.show(); loading.show();
if (typeof id === 'string') { if (typeof id === 'string') {

3
src/components/refreshdialog/refreshdialog.js
View file

@ -2,7 +2,6 @@ import dom from 'dom';
import dialogHelper from 'dialogHelper'; import dialogHelper from 'dialogHelper';
import loading from 'loading'; import loading from 'loading';
import layoutManager from 'layoutManager'; import layoutManager from 'layoutManager';
import connectionManager from 'connectionManager';
import globalize from 'globalize'; import globalize from 'globalize';
import 'emby-input'; import 'emby-input';
import 'emby-checkbox'; import 'emby-checkbox';
@ -66,7 +65,7 @@ function onSubmit(e) {
const dlg = dom.parentWithClass(e.target, 'dialog'); const dlg = dom.parentWithClass(e.target, 'dialog');
const options = instance.options; const options = instance.options;
const apiClient = connectionManager.getApiClient(options.serverId); const apiClient = window.connectionManager.getApiClient(options.serverId);
const replaceAllMetadata = dlg.querySelector('#selectMetadataRefreshMode').value === 'all'; const replaceAllMetadata = dlg.querySelector('#selectMetadataRefreshMode').value === 'all';

13
src/components/remotecontrol/remotecontrol.js
View file

@ -5,7 +5,6 @@ import imageLoader from 'imageLoader';
import playbackManager from 'playbackManager'; import playbackManager from 'playbackManager';
import nowPlayingHelper from 'nowPlayingHelper'; import nowPlayingHelper from 'nowPlayingHelper';
import events from 'events'; import events from 'events';
import connectionManager from 'connectionManager';
import appHost from 'apphost'; import appHost from 'apphost';
import globalize from 'globalize'; import globalize from 'globalize';
import layoutManager from 'layoutManager'; import layoutManager from 'layoutManager';
@ -96,18 +95,18 @@ function seriesImageUrl(item, options) {
options.type = options.type || 'Primary'; options.type = options.type || 'Primary';
if (options.type === 'Primary' && item.SeriesPrimaryImageTag) { if (options.type === 'Primary' && item.SeriesPrimaryImageTag) {
options.tag = item.SeriesPrimaryImageTag; options.tag = item.SeriesPrimaryImageTag;
return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options); return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
} }
if (options.type === 'Thumb') { if (options.type === 'Thumb') {
if (item.SeriesThumbImageTag) { if (item.SeriesThumbImageTag) {
options.tag = item.SeriesThumbImageTag; options.tag = item.SeriesThumbImageTag;
return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options); return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
} }
if (item.ParentThumbImageTag) { if (item.ParentThumbImageTag) {
options.tag = item.ParentThumbImageTag; options.tag = item.ParentThumbImageTag;
return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.ParentThumbItemId, options); return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.ParentThumbItemId, options);
} }
} }
@ -120,12 +119,12 @@ function imageUrl(item, options) {
if (item.ImageTags && item.ImageTags[options.type]) { if (item.ImageTags && item.ImageTags[options.type]) {
options.tag = item.ImageTags[options.type]; options.tag = item.ImageTags[options.type];
return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.PrimaryImageItemId || item.Id, options); return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.PrimaryImageItemId || item.Id, options);
} }
if (item.AlbumId && item.AlbumPrimaryImageTag) { if (item.AlbumId && item.AlbumPrimaryImageTag) {
options.tag = item.AlbumPrimaryImageTag; options.tag = item.AlbumPrimaryImageTag;
return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.AlbumId, options); return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.AlbumId, options);
} }
return null; return null;
@ -216,7 +215,7 @@ function updateNowPlayingInfo(context, state, serverId) {
openAlbum: false, openAlbum: false,
positionTo: contextButton positionTo: contextButton
}; };
const apiClient = connectionManager.getApiClient(item.ServerId); const apiClient = window.connectionManager.getApiClient(item.ServerId);
apiClient.getItem(apiClient.getCurrentUserId(), item.Id).then(function (fullItem) { apiClient.getItem(apiClient.getCurrentUserId(), item.Id).then(function (fullItem) {
apiClient.getCurrentUser().then(function (user) { apiClient.getCurrentUser().then(function (user) {
contextButton.addEventListener('click', function () { contextButton.addEventListener('click', function () {

3
src/components/search/searchresults.js
View file

@ -1,6 +1,5 @@
import layoutManager from 'layoutManager'; import layoutManager from 'layoutManager';
import globalize from 'globalize'; import globalize from 'globalize';
import connectionManager from 'connectionManager';
import cardBuilder from 'cardBuilder'; import cardBuilder from 'cardBuilder';
import appRouter from 'appRouter'; import appRouter from 'appRouter';
import 'emby-scroller'; import 'emby-scroller';
@ -606,7 +605,7 @@ class SearchResults {
embed(options.element, this, options); embed(options.element, this, options);
} }
search(value) { search(value) {
const apiClient = connectionManager.getApiClient(this.options.serverId); const apiClient = window.connectionManager.getApiClient(this.options.serverId);
search(this, apiClient, this.options.element, value); search(this, apiClient, this.options.element, value);
} }

9
src/components/shortcuts.js
View file

@ -7,7 +7,6 @@
import playbackManager from 'playbackManager'; import playbackManager from 'playbackManager';
import inputManager from 'inputManager'; import inputManager from 'inputManager';
import connectionManager from 'connectionManager';
import appRouter from 'appRouter'; import appRouter from 'appRouter';
import globalize from 'globalize'; import globalize from 'globalize';
import dom from 'dom'; import dom from 'dom';
@ -81,7 +80,7 @@ import recordingHelper from 'recordingHelper';
const id = button.getAttribute('data-id'); const id = button.getAttribute('data-id');
const type = button.getAttribute('data-type'); const type = button.getAttribute('data-type');
const apiClient = connectionManager.getApiClient(serverId); const apiClient = window.connectionManager.getApiClient(serverId);
if (type === 'Timer') { if (type === 'Timer') {
return apiClient.getLiveTvTimer(id); return apiClient.getLiveTvTimer(id);
@ -111,7 +110,7 @@ import recordingHelper from 'recordingHelper';
} }
import('itemContextMenu').then(({default: itemContextMenu}) => { import('itemContextMenu').then(({default: itemContextMenu}) => {
connectionManager.getApiClient(item.ServerId).getCurrentUser().then(user => { window.connectionManager.getApiClient(item.ServerId).getCurrentUser().then(user => {
itemContextMenu.show(Object.assign({ itemContextMenu.show(Object.assign({
item: item, item: item,
play: true, play: true,
@ -280,7 +279,7 @@ import recordingHelper from 'recordingHelper';
} }
function playTrailer(item) { function playTrailer(item) {
const apiClient = connectionManager.getApiClient(item.ServerId); const apiClient = window.connectionManager.getApiClient(item.ServerId);
apiClient.getLocalTrailers(apiClient.getCurrentUserId(), item.Id).then(trailers => { apiClient.getLocalTrailers(apiClient.getCurrentUserId(), item.Id).then(trailers => {
playbackManager.play({ items: trailers }); playbackManager.play({ items: trailers });
@ -288,7 +287,7 @@ import recordingHelper from 'recordingHelper';
} }
function editItem(item, serverId) { function editItem(item, serverId) {
const apiClient = connectionManager.getApiClient(serverId); const apiClient = window.connectionManager.getApiClient(serverId);
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const serverId = apiClient.serverInfo().Id; const serverId = apiClient.serverInfo().Id;

3
src/components/slideshow/slideshow.js
View file

@ -4,7 +4,6 @@
*/ */
import dialogHelper from 'dialogHelper'; import dialogHelper from 'dialogHelper';
import inputManager from 'inputManager'; import inputManager from 'inputManager';
import connectionManager from 'connectionManager';
import layoutManager from 'layoutManager'; import layoutManager from 'layoutManager';
import focusManager from 'focusManager'; import focusManager from 'focusManager';
import browser from 'browser'; import browser from 'browser';
@ -85,7 +84,7 @@ function getBackdropImageUrl(item, options, apiClient) {
* @returns {string} URL of the item's image. * @returns {string} URL of the item's image.
*/ */
function getImgUrl(item, user) { function getImgUrl(item, user) {
const apiClient = connectionManager.getApiClient(item.ServerId); const apiClient = window.connectionManager.getApiClient(item.ServerId);
const imageOptions = {}; const imageOptions = {};
if (item.BackdropImageTags && item.BackdropImageTags.length) { if (item.BackdropImageTags && item.BackdropImageTags.length) {

71
src/components/subtitleeditor/subtitleeditor.js
View file

@ -2,7 +2,6 @@ import dialogHelper from 'dialogHelper';
import layoutManager from 'layoutManager'; import layoutManager from 'layoutManager';
import globalize from 'globalize'; import globalize from 'globalize';
import * as userSettings from 'userSettings'; import * as userSettings from 'userSettings';
import connectionManager from 'connectionManager';
import loading from 'loading'; import loading from 'loading';
import focusManager from 'focusManager'; import focusManager from 'focusManager';
import dom from 'dom'; import dom from 'dom';
@ -19,9 +18,9 @@ let currentItem;
let hasChanges; let hasChanges;
function downloadRemoteSubtitles(context, id) { function downloadRemoteSubtitles(context, id) {
let url = 'Items/' + currentItem.Id + '/RemoteSearch/Subtitles/' + id; const url = 'Items/' + currentItem.Id + '/RemoteSearch/Subtitles/' + id;
let apiClient = connectionManager.getApiClient(currentItem.ServerId); const apiClient = window.connectionManager.getApiClient(currentItem.ServerId);
apiClient.ajax({ apiClient.ajax({
type: 'POST', type: 'POST',
@ -39,7 +38,7 @@ function downloadRemoteSubtitles(context, id) {
} }
function deleteLocalSubtitle(context, index) { function deleteLocalSubtitle(context, index) {
let msg = globalize.translate('MessageAreYouSureDeleteSubtitles'); const msg = globalize.translate('MessageAreYouSureDeleteSubtitles');
import('confirm').then(({default: confirm}) => { import('confirm').then(({default: confirm}) => {
confirm({ confirm({
@ -52,10 +51,10 @@ function deleteLocalSubtitle(context, index) {
}).then(function () { }).then(function () {
loading.show(); loading.show();
let itemId = currentItem.Id; const itemId = currentItem.Id;
let url = 'Videos/' + itemId + '/Subtitles/' + index; const url = 'Videos/' + itemId + '/Subtitles/' + index;
let apiClient = connectionManager.getApiClient(currentItem.ServerId); const apiClient = window.connectionManager.getApiClient(currentItem.ServerId);
apiClient.ajax({ apiClient.ajax({
@ -71,9 +70,9 @@ function deleteLocalSubtitle(context, index) {
} }
function fillSubtitleList(context, item) { function fillSubtitleList(context, item) {
let streams = item.MediaStreams || []; const streams = item.MediaStreams || [];
let subs = streams.filter(function (s) { const subs = streams.filter(function (s) {
return s.Type === 'Subtitle'; return s.Type === 'Subtitle';
}); });
@ -87,7 +86,7 @@ function fillSubtitleList(context, item) {
html += subs.map(function (s) { html += subs.map(function (s) {
let itemHtml = ''; let itemHtml = '';
let tagName = layoutManager.tv ? 'button' : 'div'; const tagName = layoutManager.tv ? 'button' : 'div';
let className = layoutManager.tv && s.Path ? 'listItem listItem-border btnDelete' : 'listItem listItem-border'; let className = layoutManager.tv && s.Path ? 'listItem listItem-border btnDelete' : 'listItem listItem-border';
if (layoutManager.tv) { if (layoutManager.tv) {
@ -127,7 +126,7 @@ function fillSubtitleList(context, item) {
html += '</div>'; html += '</div>';
} }
let elem = context.querySelector('.subtitleList'); const elem = context.querySelector('.subtitleList');
if (subs.length) { if (subs.length) {
elem.classList.remove('hide'); elem.classList.remove('hide');
@ -138,18 +137,18 @@ function fillSubtitleList(context, item) {
} }
function fillLanguages(context, apiClient, languages) { function fillLanguages(context, apiClient, languages) {
let selectLanguage = context.querySelector('#selectLanguage'); const selectLanguage = context.querySelector('#selectLanguage');
selectLanguage.innerHTML = languages.map(function (l) { selectLanguage.innerHTML = languages.map(function (l) {
return '<option value="' + l.ThreeLetterISOLanguageName + '">' + l.DisplayName + '</option>'; return '<option value="' + l.ThreeLetterISOLanguageName + '">' + l.DisplayName + '</option>';
}); });
let lastLanguage = userSettings.get('subtitleeditor-language'); const lastLanguage = userSettings.get('subtitleeditor-language');
if (lastLanguage) { if (lastLanguage) {
selectLanguage.value = lastLanguage; selectLanguage.value = lastLanguage;
} else { } else {
apiClient.getCurrentUser().then(function (user) { apiClient.getCurrentUser().then(function (user) {
let lang = user.Configuration.SubtitleLanguagePreference; const lang = user.Configuration.SubtitleLanguagePreference;
if (lang) { if (lang) {
selectLanguage.value = lang; selectLanguage.value = lang;
@ -172,9 +171,9 @@ function renderSearchResults(context, results) {
context.querySelector('.noSearchResults').classList.add('hide'); context.querySelector('.noSearchResults').classList.add('hide');
for (let i = 0, length = results.length; i < length; i++) { for (let i = 0, length = results.length; i < length; i++) {
let result = results[i]; const result = results[i];
let provider = result.ProviderName; const provider = result.ProviderName;
if (provider !== lastProvider) { if (provider !== lastProvider) {
if (i > 0) { if (i > 0) {
@ -185,7 +184,7 @@ function renderSearchResults(context, results) {
lastProvider = provider; lastProvider = provider;
} }
let tagName = layoutManager.tv ? 'button' : 'div'; const tagName = layoutManager.tv ? 'button' : 'div';
let className = layoutManager.tv ? 'listItem listItem-border btnOptions' : 'listItem listItem-border'; let className = layoutManager.tv ? 'listItem listItem-border btnOptions' : 'listItem listItem-border';
if (layoutManager.tv) { if (layoutManager.tv) {
className += ' listItem-focusscale listItem-button'; className += ' listItem-focusscale listItem-button';
@ -195,7 +194,7 @@ function renderSearchResults(context, results) {
html += '<span class="listItemIcon material-icons closed_caption"></span>'; html += '<span class="listItemIcon material-icons closed_caption"></span>';
let bodyClass = result.Comment || result.IsHashMatch ? 'three-line' : 'two-line'; const bodyClass = result.Comment || result.IsHashMatch ? 'three-line' : 'two-line';
html += '<div class="listItemBody ' + bodyClass + '">'; html += '<div class="listItemBody ' + bodyClass + '">';
@ -232,7 +231,7 @@ function renderSearchResults(context, results) {
html += '</div>'; html += '</div>';
} }
let elem = context.querySelector('.subtitleResults'); const elem = context.querySelector('.subtitleResults');
elem.innerHTML = html; elem.innerHTML = html;
loading.hide(); loading.hide();
@ -243,8 +242,8 @@ function searchForSubtitles(context, language) {
loading.show(); loading.show();
let apiClient = connectionManager.getApiClient(currentItem.ServerId); const apiClient = window.connectionManager.getApiClient(currentItem.ServerId);
let url = apiClient.getUrl('Items/' + currentItem.Id + '/RemoteSearch/Subtitles/' + language); const url = apiClient.getUrl('Items/' + currentItem.Id + '/RemoteSearch/Subtitles/' + language);
apiClient.getJSON(url).then(function (results) { apiClient.getJSON(url).then(function (results) {
renderSearchResults(context, results); renderSearchResults(context, results);
@ -259,7 +258,7 @@ function reload(context, apiClient, itemId) {
fillSubtitleList(context, item); fillSubtitleList(context, item);
let file = item.Path || ''; let file = item.Path || '';
let index = Math.max(file.lastIndexOf('/'), file.lastIndexOf('\\')); const index = Math.max(file.lastIndexOf('/'), file.lastIndexOf('\\'));
if (index > -1) { if (index > -1) {
file = file.substring(index + 1); file = file.substring(index + 1);
} }
@ -283,9 +282,9 @@ function reload(context, apiClient, itemId) {
} }
function onSearchSubmit(e) { function onSearchSubmit(e) {
let form = this; const form = this;
let lang = form.querySelector('#selectLanguage', form).value; const lang = form.querySelector('#selectLanguage', form).value;
searchForSubtitles(dom.parentWithClass(form, 'formDialogContent'), lang); searchForSubtitles(dom.parentWithClass(form, 'formDialogContent'), lang);
@ -294,10 +293,10 @@ function onSearchSubmit(e) {
} }
function onSubtitleListClick(e) { function onSubtitleListClick(e) {
let btnDelete = dom.parentWithClass(e.target, 'btnDelete'); const btnDelete = dom.parentWithClass(e.target, 'btnDelete');
if (btnDelete) { if (btnDelete) {
let index = btnDelete.getAttribute('data-index'); const index = btnDelete.getAttribute('data-index');
let context = dom.parentWithClass(btnDelete, 'subtitleEditorDialog'); const context = dom.parentWithClass(btnDelete, 'subtitleEditorDialog');
deleteLocalSubtitle(context, index); deleteLocalSubtitle(context, index);
} }
} }
@ -306,14 +305,14 @@ function onSubtitleResultsClick(e) {
let subtitleId; let subtitleId;
let context; let context;
let btnOptions = dom.parentWithClass(e.target, 'btnOptions'); const btnOptions = dom.parentWithClass(e.target, 'btnOptions');
if (btnOptions) { if (btnOptions) {
subtitleId = btnOptions.getAttribute('data-subid'); subtitleId = btnOptions.getAttribute('data-subid');
context = dom.parentWithClass(btnOptions, 'subtitleEditorDialog'); context = dom.parentWithClass(btnOptions, 'subtitleEditorDialog');
showDownloadOptions(btnOptions, context, subtitleId); showDownloadOptions(btnOptions, context, subtitleId);
} }
let btnDownload = dom.parentWithClass(e.target, 'btnDownload'); const btnDownload = dom.parentWithClass(e.target, 'btnDownload');
if (btnDownload) { if (btnDownload) {
subtitleId = btnDownload.getAttribute('data-subid'); subtitleId = btnDownload.getAttribute('data-subid');
context = dom.parentWithClass(btnDownload, 'subtitleEditorDialog'); context = dom.parentWithClass(btnDownload, 'subtitleEditorDialog');
@ -322,7 +321,7 @@ function onSubtitleResultsClick(e) {
} }
function showDownloadOptions(button, context, subtitleId) { function showDownloadOptions(button, context, subtitleId) {
let items = []; const items = [];
items.push({ items.push({
name: globalize.translate('Download'), name: globalize.translate('Download'),
@ -348,7 +347,7 @@ function showDownloadOptions(button, context, subtitleId) {
function centerFocus(elem, horiz, on) { function centerFocus(elem, horiz, on) {
import('scrollHelper').then(({default: scrollHelper}) => { import('scrollHelper').then(({default: scrollHelper}) => {
let fn = on ? 'on' : 'off'; const fn = on ? 'on' : 'off';
scrollHelper.centerFocus[fn](elem, horiz); scrollHelper.centerFocus[fn](elem, horiz);
}); });
} }
@ -356,9 +355,9 @@ function centerFocus(elem, horiz, on) {
function showEditorInternal(itemId, serverId, template) { function showEditorInternal(itemId, serverId, template) {
hasChanges = false; hasChanges = false;
let apiClient = connectionManager.getApiClient(serverId); const apiClient = window.connectionManager.getApiClient(serverId);
return apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(function (item) { return apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(function (item) {
let dialogOptions = { const dialogOptions = {
removeOnClose: true, removeOnClose: true,
scrollY: false scrollY: false
}; };
@ -369,7 +368,7 @@ function showEditorInternal(itemId, serverId, template) {
dialogOptions.size = 'small'; dialogOptions.size = 'small';
} }
let dlg = dialogHelper.createDialog(dialogOptions); const dlg = dialogHelper.createDialog(dialogOptions);
dlg.classList.add('formDialog'); dlg.classList.add('formDialog');
dlg.classList.add('subtitleEditorDialog'); dlg.classList.add('subtitleEditorDialog');
@ -380,7 +379,7 @@ function showEditorInternal(itemId, serverId, template) {
dlg.querySelector('.subtitleSearchForm').addEventListener('submit', onSearchSubmit); dlg.querySelector('.subtitleSearchForm').addEventListener('submit', onSearchSubmit);
let btnSubmit = dlg.querySelector('.btnSubmit'); const btnSubmit = dlg.querySelector('.btnSubmit');
if (layoutManager.tv) { if (layoutManager.tv) {
centerFocus(dlg.querySelector('.formDialogContent'), false, true); centerFocus(dlg.querySelector('.formDialogContent'), false, true);
@ -389,7 +388,7 @@ function showEditorInternal(itemId, serverId, template) {
btnSubmit.classList.add('hide'); btnSubmit.classList.add('hide');
} }
let editorContent = dlg.querySelector('.formDialogContent'); const editorContent = dlg.querySelector('.formDialogContent');
dlg.querySelector('.subtitleList').addEventListener('click', onSubtitleListClick); dlg.querySelector('.subtitleList').addEventListener('click', onSubtitleListClick);
dlg.querySelector('.subtitleResults').addEventListener('click', onSubtitleResultsClick); dlg.querySelector('.subtitleResults').addEventListener('click', onSubtitleResultsClick);

5
src/components/subtitlesettings/subtitlesettings.js
View file

@ -4,7 +4,6 @@ import appSettings from 'appSettings';
import focusManager from 'focusManager'; import focusManager from 'focusManager';
import layoutManager from 'layoutManager'; import layoutManager from 'layoutManager';
import loading from 'loading'; import loading from 'loading';
import connectionManager from 'connectionManager';
import subtitleAppearanceHelper from 'subtitleAppearanceHelper'; import subtitleAppearanceHelper from 'subtitleAppearanceHelper';
import settingsHelper from 'settingsHelper'; import settingsHelper from 'settingsHelper';
import dom from 'dom'; import dom from 'dom';
@ -232,7 +231,7 @@ export class SubtitleSettings {
loading.show(); loading.show();
const userId = self.options.userId; const userId = self.options.userId;
const apiClient = connectionManager.getApiClient(self.options.serverId); const apiClient = window.connectionManager.getApiClient(self.options.serverId);
const userSettings = self.options.userSettings; const userSettings = self.options.userSettings;
apiClient.getUser(userId).then(function (user) { apiClient.getUser(userId).then(function (user) {
@ -256,7 +255,7 @@ export class SubtitleSettings {
onSubmit(e) { onSubmit(e) {
const self = this; const self = this;
const apiClient = connectionManager.getApiClient(self.options.serverId); const apiClient = window.connectionManager.getApiClient(self.options.serverId);
const userId = self.options.userId; const userId = self.options.userId;
const userSettings = self.options.userSettings; const userSettings = self.options.userSettings;

5
src/components/syncPlay/groupSelectionMenu.js
View file

@ -1,5 +1,4 @@
import events from 'events'; import events from 'events';
import connectionManager from 'connectionManager';
import playbackManager from 'playbackManager'; import playbackManager from 'playbackManager';
import syncPlayManager from 'syncPlayManager'; import syncPlayManager from 'syncPlayManager';
import loading from 'loading'; import loading from 'loading';
@ -172,8 +171,8 @@ export function show (button) {
}); });
}); });
const apiClient = connectionManager.currentApiClient(); const apiClient = window.connectionManager.currentApiClient();
connectionManager.user(apiClient).then((user) => { window.connectionManager.user(apiClient).then((user) => {
if (syncPlayEnabled) { if (syncPlayEnabled) {
showLeaveGroupSelection(button, user, apiClient); showLeaveGroupSelection(button, user, apiClient);
} else { } else {

9
src/components/syncPlay/syncPlayManager.js
View file

@ -4,7 +4,6 @@
*/ */
import events from 'events'; import events from 'events';
import connectionManager from 'connectionManager';
import playbackManager from 'playbackManager'; import playbackManager from 'playbackManager';
import timeSyncManager from 'timeSyncManager'; import timeSyncManager from 'timeSyncManager';
import toast from 'toast'; import toast from 'toast';
@ -128,7 +127,7 @@ class SyncPlayManager {
// Report ping // Report ping
if (this.syncEnabled) { if (this.syncEnabled) {
const apiClient = connectionManager.currentApiClient(); const apiClient = window.connectionManager.currentApiClient();
const sessionId = getActivePlayerId(); const sessionId = getActivePlayerId();
if (!sessionId) { if (!sessionId) {
@ -660,7 +659,7 @@ class SyncPlayManager {
* Overrides PlaybackManager's unpause method. * Overrides PlaybackManager's unpause method.
*/ */
playRequest (player) { playRequest (player) {
var apiClient = connectionManager.currentApiClient(); var apiClient = window.connectionManager.currentApiClient();
apiClient.requestSyncPlayStart(); apiClient.requestSyncPlayStart();
} }
@ -668,7 +667,7 @@ class SyncPlayManager {
* Overrides PlaybackManager's pause method. * Overrides PlaybackManager's pause method.
*/ */
pauseRequest (player) { pauseRequest (player) {
var apiClient = connectionManager.currentApiClient(); var apiClient = window.connectionManager.currentApiClient();
apiClient.requestSyncPlayPause(); apiClient.requestSyncPlayPause();
// Pause locally as well, to give the user some little control // Pause locally as well, to give the user some little control
playbackManager._localUnpause(player); playbackManager._localUnpause(player);
@ -678,7 +677,7 @@ class SyncPlayManager {
* Overrides PlaybackManager's seek method. * Overrides PlaybackManager's seek method.
*/ */
seekRequest (PositionTicks, player) { seekRequest (PositionTicks, player) {
var apiClient = connectionManager.currentApiClient(); var apiClient = window.connectionManager.currentApiClient();
apiClient.requestSyncPlaySeek({ apiClient.requestSyncPlaySeek({
PositionTicks: PositionTicks PositionTicks: PositionTicks
}); });

3
src/components/syncPlay/timeSyncManager.js
View file

@ -4,7 +4,6 @@
*/ */
import events from 'events'; import events from 'events';
import connectionManager from 'connectionManager';
/** /**
* Time estimation * Time estimation
@ -114,7 +113,7 @@ class TimeSyncManager {
if (!this.poller) { if (!this.poller) {
this.poller = setTimeout(() => { this.poller = setTimeout(() => {
this.poller = null; this.poller = null;
const apiClient = connectionManager.currentApiClient(); const apiClient = window.connectionManager.currentApiClient();
const requestSent = new Date(); const requestSent = new Date();
apiClient.getServerTime().then((response) => { apiClient.getServerTime().then((response) => {
const responseReceived = new Date(); const responseReceived = new Date();

3
src/components/themeMediaPlayer.js
View file

@ -1,6 +1,5 @@
import playbackManager from 'playbackManager'; import playbackManager from 'playbackManager';
import * as userSettings from 'userSettings'; import * as userSettings from 'userSettings';
import connectionManager from 'connectionManager';
let currentOwnerId; let currentOwnerId;
let currentThemeIds = []; let currentThemeIds = [];
@ -62,7 +61,7 @@ function loadThemeMedia(item) {
return; return;
} }
const apiClient = connectionManager.getApiClient(item.ServerId); const apiClient = window.connectionManager.getApiClient(item.ServerId);
apiClient.getThemeMedia(apiClient.getCurrentUserId(), item.Id, true).then(function (themeMediaResult) { apiClient.getThemeMedia(apiClient.getCurrentUserId(), item.Id, true).then(function (themeMediaResult) {
const ownerId = themeMediaResult.ThemeVideosResult.Items.length ? themeMediaResult.ThemeVideosResult.OwnerId : themeMediaResult.ThemeSongsResult.OwnerId; const ownerId = themeMediaResult.ThemeVideosResult.Items.length ? themeMediaResult.ThemeVideosResult.OwnerId : themeMediaResult.ThemeSongsResult.OwnerId;

3
src/components/tunerPicker.js
View file

@ -1,7 +1,6 @@
import dialogHelper from 'dialogHelper'; import dialogHelper from 'dialogHelper';
import dom from 'dom'; import dom from 'dom';
import layoutManager from 'layoutManager'; import layoutManager from 'layoutManager';
import connectionManager from 'connectionManager';
import globalize from 'globalize'; import globalize from 'globalize';
import loading from 'loading'; import loading from 'loading';
import browser from 'browser'; import browser from 'browser';
@ -163,7 +162,7 @@ function tunerPicker() {
scrollHelper.centerFocus.on(dlg.querySelector('.formDialogContent'), false); scrollHelper.centerFocus.on(dlg.querySelector('.formDialogContent'), false);
} }
const apiClient = connectionManager.getApiClient(options.serverId); const apiClient = window.connectionManager.getApiClient(options.serverId);
discoverDevices(dlg, apiClient); discoverDevices(dlg, apiClient);
if (layoutManager.tv) { if (layoutManager.tv) {

11
src/components/upnextdialog/upnextdialog.js
View file

@ -1,6 +1,5 @@
import dom from 'dom'; import dom from 'dom';
import playbackManager from 'playbackManager'; import playbackManager from 'playbackManager';
import connectionManager from 'connectionManager';
import events from 'events'; import events from 'events';
import mediaInfo from 'mediaInfo'; import mediaInfo from 'mediaInfo';
import layoutManager from 'layoutManager'; import layoutManager from 'layoutManager';
@ -27,7 +26,7 @@ import 'flexStyles';
if (item.SeriesPrimaryImageTag) { if (item.SeriesPrimaryImageTag) {
options.tag = item.SeriesPrimaryImageTag; options.tag = item.SeriesPrimaryImageTag;
return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options); return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
} }
} }
@ -35,12 +34,12 @@ import 'flexStyles';
if (item.SeriesThumbImageTag) { if (item.SeriesThumbImageTag) {
options.tag = item.SeriesThumbImageTag; options.tag = item.SeriesThumbImageTag;
return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options); return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
} }
if (item.ParentThumbImageTag) { if (item.ParentThumbImageTag) {
options.tag = item.ParentThumbImageTag; options.tag = item.ParentThumbImageTag;
return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.ParentThumbItemId, options); return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.ParentThumbItemId, options);
} }
} }
@ -53,13 +52,13 @@ import 'flexStyles';
if (item.ImageTags && item.ImageTags[options.type]) { if (item.ImageTags && item.ImageTags[options.type]) {
options.tag = item.ImageTags[options.type]; options.tag = item.ImageTags[options.type];
return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.PrimaryImageItemId || item.Id, options); return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.PrimaryImageItemId || item.Id, options);
} }
if (options.type === 'Primary') { if (options.type === 'Primary') {
if (item.AlbumId && item.AlbumPrimaryImageTag) { if (item.AlbumId && item.AlbumPrimaryImageTag) {
options.tag = item.AlbumPrimaryImageTag; options.tag = item.AlbumPrimaryImageTag;
return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.AlbumId, options); return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.AlbumId, options);
} }
} }

9
src/components/userdatabuttons/userdatabuttons.js
View file

@ -1,4 +1,3 @@
import connectionManager from 'connectionManager';
import globalize from 'globalize'; import globalize from 'globalize';
import dom from 'dom'; import dom from 'dom';
import itemHelper from 'itemHelper'; import itemHelper from 'itemHelper';
@ -188,12 +187,12 @@ function markPlayed(link) {
} }
function likes(id, serverId, isLiked) { function likes(id, serverId, isLiked) {
const apiClient = connectionManager.getApiClient(serverId); const apiClient = window.connectionManager.getApiClient(serverId);
return apiClient.updateUserItemRating(apiClient.getCurrentUserId(), id, isLiked); return apiClient.updateUserItemRating(apiClient.getCurrentUserId(), id, isLiked);
} }
function played(id, serverId, isPlayed) { function played(id, serverId, isPlayed) {
const apiClient = connectionManager.getApiClient(serverId); const apiClient = window.connectionManager.getApiClient(serverId);
const method = isPlayed ? 'markPlayed' : 'markUnplayed'; const method = isPlayed ? 'markPlayed' : 'markUnplayed';
@ -201,13 +200,13 @@ function played(id, serverId, isPlayed) {
} }
function favorite(id, serverId, isFavorite) { function favorite(id, serverId, isFavorite) {
const apiClient = connectionManager.getApiClient(serverId); const apiClient = window.connectionManager.getApiClient(serverId);
return apiClient.updateFavoriteStatus(apiClient.getCurrentUserId(), id, isFavorite); return apiClient.updateFavoriteStatus(apiClient.getCurrentUserId(), id, isFavorite);
} }
function clearLike(id, serverId) { function clearLike(id, serverId) {
const apiClient = connectionManager.getApiClient(serverId); const apiClient = window.connectionManager.getApiClient(serverId);
return apiClient.clearUserItemRating(apiClient.getCurrentUserId(), id); return apiClient.clearUserItemRating(apiClient.getCurrentUserId(), id);
} }

8
src/components/viewContainer.js
View file

@ -13,8 +13,9 @@ import 'css!components/viewManager/viewContainer';
controllerUrl = controllerUrl.substring('__plugin/'.length); controllerUrl = controllerUrl.substring('__plugin/'.length);
} }
controllerUrl = Dashboard.getConfigurationResourceUrl(controllerUrl); controllerUrl = Dashboard.getPluginUrl(controllerUrl);
return import(controllerUrl).then((ControllerFactory) => { const apiUrl = ApiClient.getUrl('/web/' + controllerUrl);
return import(apiUrl).then((ControllerFactory) => {
options.controllerFactory = ControllerFactory; options.controllerFactory = ControllerFactory;
}); });
} }
@ -32,7 +33,7 @@ import 'css!components/viewManager/viewContainer';
pageIndex = 0; pageIndex = 0;
} }
const isPluginpage = options.url.toLowerCase().indexOf('/configurationpage') !== -1; const isPluginpage = options.url.includes('configurationpage');
const newViewInfo = normalizeNewView(options, isPluginpage); const newViewInfo = normalizeNewView(options, isPluginpage);
const newView = newViewInfo.elem; const newView = newViewInfo.elem;
@ -243,4 +244,3 @@ export default {
reset: reset, reset: reset,
setOnBeforeChange: setOnBeforeChange setOnBeforeChange: setOnBeforeChange
}; };

1
src/config.template.json
View file

@ -28,6 +28,7 @@
"plugins/htmlAudioPlayer/plugin", "plugins/htmlAudioPlayer/plugin",
"plugins/htmlVideoPlayer/plugin", "plugins/htmlVideoPlayer/plugin",
"plugins/photoPlayer/plugin", "plugins/photoPlayer/plugin",
"plugins/comicsPlayer/plugin",
"plugins/bookPlayer/plugin", "plugins/bookPlayer/plugin",
"plugins/youtubePlayer/plugin", "plugins/youtubePlayer/plugin",
"plugins/backdropScreensaver/plugin", "plugins/backdropScreensaver/plugin",

2
src/controllers/dashboard/dashboard.html
View file

@ -17,7 +17,7 @@
<div style="margin-top:1em;"> <div style="margin-top:1em;">
<button is="emby-button" type="button" id="btnRestartServer" class="raised" onclick="DashboardPage.restart(this);" style="margin-left:0;"> <button is="emby-button" type="button" id="btnRestartServer" class="raised" onclick="DashboardPage.restart(this);" style="margin-left:0;">
<span>${ButtonRestart}</span> <span>${Restart}</span>
</button> </button>
<button is="emby-button" type="button" id="btnShutdown" class="raised" onclick="DashboardPage.shutdown(this);"> <button is="emby-button" type="button" id="btnShutdown" class="raised" onclick="DashboardPage.shutdown(this);">
<span>${ButtonShutdown}</span> <span>${ButtonShutdown}</span>

19
src/controllers/dashboard/dashboard.js
View file

@ -7,7 +7,6 @@ import globalize from 'globalize';
import * as datefns from 'date-fns'; import * as datefns from 'date-fns';
import dfnshelper from 'dfnshelper'; import dfnshelper from 'dfnshelper';
import loading from 'loading'; import loading from 'loading';
import connectionManager from 'connectionManager';
import playMethodHelper from 'playMethodHelper'; import playMethodHelper from 'playMethodHelper';
import cardBuilder from 'cardBuilder'; import cardBuilder from 'cardBuilder';
import imageLoader from 'imageLoader'; import imageLoader from 'imageLoader';
@ -60,7 +59,7 @@ import 'emby-itemscontainer';
confirmText: globalize.translate('ButtonSend') confirmText: globalize.translate('ButtonSend')
}).then(function (text) { }).then(function (text) {
if (text) { if (text) {
connectionManager.getApiClient(session.ServerId).sendMessageCommand(session.Id, { window.connectionManager.getApiClient(session.ServerId).sendMessageCommand(session.Id, {
Text: text, Text: text,
TimeoutMs: 5e3 TimeoutMs: 5e3
}); });
@ -73,7 +72,7 @@ import 'emby-itemscontainer';
import('actionsheet').then(({default: actionsheet}) => { import('actionsheet').then(({default: actionsheet}) => {
const menuItems = []; const menuItems = [];
if (session.ServerId && session.DeviceId !== connectionManager.deviceId()) { if (session.ServerId && session.DeviceId !== window.connectionManager.deviceId()) {
menuItems.push({ menuItems.push({
name: globalize.translate('SendMessage'), name: globalize.translate('SendMessage'),
id: 'sendmessage' id: 'sendmessage'
@ -123,9 +122,9 @@ import 'emby-itemscontainer';
} else if (btn.classList.contains('btnSessionSendMessage')) { } else if (btn.classList.contains('btnSessionSendMessage')) {
showSendMessageForm(btn, session); showSendMessageForm(btn, session);
} else if (btn.classList.contains('btnSessionStop')) { } else if (btn.classList.contains('btnSessionStop')) {
connectionManager.getApiClient(session.ServerId).sendPlayStateCommand(session.Id, 'Stop'); window.connectionManager.getApiClient(session.ServerId).sendPlayStateCommand(session.Id, 'Stop');
} else if (btn.classList.contains('btnSessionPlayPause') && session.PlayState) { } else if (btn.classList.contains('btnSessionPlayPause') && session.PlayState) {
connectionManager.getApiClient(session.ServerId).sendPlayStateCommand(session.Id, 'PlayPause'); window.connectionManager.getApiClient(session.ServerId).sendPlayStateCommand(session.Id, 'PlayPause');
} }
} }
} }
@ -313,7 +312,7 @@ import 'emby-itemscontainer';
btnCssClass = session.TranscodingInfo && session.TranscodingInfo.TranscodeReasons && session.TranscodingInfo.TranscodeReasons.length ? '' : ' hide'; btnCssClass = session.TranscodingInfo && session.TranscodingInfo.TranscodeReasons && session.TranscodingInfo.TranscodeReasons.length ? '' : ' hide';
html += '<button is="paper-icon-button-light" class="sessionCardButton btnSessionInfo paper-icon-button-light ' + btnCssClass + '" title="' + globalize.translate('ViewPlaybackInfo') + '"><span class="material-icons info"></span></button>'; html += '<button is="paper-icon-button-light" class="sessionCardButton btnSessionInfo paper-icon-button-light ' + btnCssClass + '" title="' + globalize.translate('ViewPlaybackInfo') + '"><span class="material-icons info"></span></button>';
btnCssClass = session.ServerId && session.SupportedCommands.indexOf('DisplayMessage') !== -1 && session.DeviceId !== connectionManager.deviceId() ? '' : ' hide'; btnCssClass = session.ServerId && session.SupportedCommands.indexOf('DisplayMessage') !== -1 && session.DeviceId !== window.connectionManager.deviceId() ? '' : ' hide';
html += '<button is="paper-icon-button-light" class="sessionCardButton btnSessionSendMessage paper-icon-button-light ' + btnCssClass + '" title="' + globalize.translate('SendMessage') + '"><span class="material-icons message"></span></button>'; html += '<button is="paper-icon-button-light" class="sessionCardButton btnSessionSendMessage paper-icon-button-light ' + btnCssClass + '" title="' + globalize.translate('SendMessage') + '"><span class="material-icons message"></span></button>';
html += '</div>'; html += '</div>';
@ -551,7 +550,7 @@ import 'emby-itemscontainer';
row.classList.remove('playingSession'); row.classList.remove('playingSession');
} }
if (session.ServerId && session.SupportedCommands.indexOf('DisplayMessage') !== -1 && session.DeviceId !== connectionManager.deviceId()) { if (session.ServerId && session.SupportedCommands.indexOf('DisplayMessage') !== -1 && session.DeviceId !== window.connectionManager.deviceId()) {
row.querySelector('.btnSessionSendMessage').classList.remove('hide'); row.querySelector('.btnSessionSendMessage').classList.remove('hide');
} else { } else {
row.querySelector('.btnSessionSendMessage').classList.add('hide'); row.querySelector('.btnSessionSendMessage').classList.add('hide');
@ -565,7 +564,7 @@ import 'emby-itemscontainer';
const btnSessionPlayPause = row.querySelector('.btnSessionPlayPause'); const btnSessionPlayPause = row.querySelector('.btnSessionPlayPause');
if (session.ServerId && nowPlayingItem && session.SupportsRemoteControl && session.DeviceId !== connectionManager.deviceId()) { if (session.ServerId && nowPlayingItem && session.SupportsRemoteControl && session.DeviceId !== window.connectionManager.deviceId()) {
btnSessionPlayPause.classList.remove('hide'); btnSessionPlayPause.classList.remove('hide');
row.querySelector('.btnSessionStop').classList.remove('hide'); row.querySelector('.btnSessionStop').classList.remove('hide');
} else { } else {
@ -722,9 +721,9 @@ import 'emby-itemscontainer';
restart: function (btn) { restart: function (btn) {
import('confirm').then(({default: confirm}) => { import('confirm').then(({default: confirm}) => {
confirm({ confirm({
title: globalize.translate('HeaderRestart'), title: globalize.translate('Restart'),
text: globalize.translate('MessageConfirmRestart'), text: globalize.translate('MessageConfirmRestart'),
confirmText: globalize.translate('ButtonRestart'), confirmText: globalize.translate('Restart'),
primary: 'delete' primary: 'delete'
}).then(function () { }).then(function () {
const page = dom.parentWithClass(btn, 'page'); const page = dom.parentWithClass(btn, 'page');

44
src/controllers/dashboard/dlna/profile.html
View file

@ -29,15 +29,15 @@
<div class="checkboxList paperList checkboxList-paperList"> <div class="checkboxList paperList checkboxList-paperList">
<label> <label>
<input is="emby-checkbox" type="checkbox" id="chkAudio" data-value="Audio" class="chkMediaType" /> <input is="emby-checkbox" type="checkbox" id="chkAudio" data-value="Audio" class="chkMediaType" />
<span>${OptionProfileAudio}</span> <span>${Audio}</span>
</label> </label>
<label> <label>
<input is="emby-checkbox" type="checkbox" id="chkPhoto" data-value="Photo" class="chkMediaType" /> <input is="emby-checkbox" type="checkbox" id="chkPhoto" data-value="Photo" class="chkMediaType" />
<span>${OptionProfilePhoto}</span> <span>${Photo}</span>
</label> </label>
<label> <label>
<input is="emby-checkbox" type="checkbox" id="chkVideo" data-value="Video" class="chkMediaType" /> <input is="emby-checkbox" type="checkbox" id="chkVideo" data-value="Video" class="chkMediaType" />
<span>${OptionProfileVideo}</span> <span>${Video}</span>
</label> </label>
</div> </div>
</div> </div>
@ -144,19 +144,19 @@
</div> </div>
<div class="inputContainer"> <div class="inputContainer">
<input type="number" is="emby-input" id="txtAlbumArtMaxWidth" pattern="[0-9]*" min="1" label="${LabelAlbumArtMaxWidth}" /> <input type="number" is="emby-input" id="txtAlbumArtMaxWidth" pattern="[0-9]*" min="1" label="${LabelAlbumArtMaxWidth}" />
<div class="fieldDescription">${LabelAlbumArtMaxWidthHelp}</div> <div class="fieldDescription">${LabelAlbumArtMaxResHelp}</div>
</div> </div>
<div class="inputContainer"> <div class="inputContainer">
<input type="number" is="emby-input" id="txtAlbumArtMaxHeight" pattern="[0-9]*" min="1" label="${LabelAlbumArtMaxHeight}" /> <input type="number" is="emby-input" id="txtAlbumArtMaxHeight" pattern="[0-9]*" min="1" label="${LabelAlbumArtMaxHeight}" />
<div class="fieldDescription">${LabelAlbumArtMaxHeightHelp}</div> <div class="fieldDescription">${LabelAlbumArtMaxResHelp}</div>
</div> </div>
<div class="inputContainer"> <div class="inputContainer">
<input type="number" is="emby-input" id="txtIconMaxWidth" pattern="[0-9]*" min="1" label="${LabelIconMaxWidth}" /> <input type="number" is="emby-input" id="txtIconMaxWidth" pattern="[0-9]*" min="1" label="${LabelIconMaxWidth}" />
<div class="fieldDescription">${LabelIconMaxWidthHelp}</div> <div class="fieldDescription">${LabelIconMaxResHelp}</div>
</div> </div>
<div class="inputContainer"> <div class="inputContainer">
<input type="number" is="emby-input" id="txtIconMaxHeight" pattern="[0-9]*" min="1" label="${LabelIconMaxHeight}" /> <input type="number" is="emby-input" id="txtIconMaxHeight" pattern="[0-9]*" min="1" label="${LabelIconMaxHeight}" />
<div class="fieldDescription">${LabelIconMaxHeightHelp}</div> <div class="fieldDescription">${LabelIconMaxResHelp}</div>
</div> </div>
</div> </div>
</div> </div>
@ -279,9 +279,9 @@
<div data-role="content"> <div data-role="content">
<div class="selectContainer"> <div class="selectContainer">
<select id="selectDirectPlayProfileType" name="selectDirectPlayProfileType" is="emby-select" label="${LabelType}"> <select id="selectDirectPlayProfileType" name="selectDirectPlayProfileType" is="emby-select" label="${LabelType}">
<option value="Audio">${OptionProfileAudio}</option> <option value="Audio">${Audio}</option>
<option value="Photo">${OptionProfilePhoto}</option> <option value="Photo">${Photo}</option>
<option value="Video">${OptionProfileVideo}</option> <option value="Video">${Video}</option>
</select> </select>
</div> </div>
<div class="inputContainer"> <div class="inputContainer">
@ -327,9 +327,9 @@
<div class="tabContent tabTranscodingBasics" style="display: none;"> <div class="tabContent tabTranscodingBasics" style="display: none;">
<div class="selectContainer"> <div class="selectContainer">
<select id="selectTranscodingProfileType" name="selectTranscodingProfileType" is="emby-select" label="${LabelType}"> <select id="selectTranscodingProfileType" name="selectTranscodingProfileType" is="emby-select" label="${LabelType}">
<option value="Audio">${OptionProfileAudio}</option> <option value="Audio">${Audio}</option>
<option value="Photo">${OptionProfilePhoto}</option> <option value="Photo">${Photo}</option>
<option value="Video">${OptionProfileVideo}</option> <option value="Video">${Video}</option>
</select> </select>
</div> </div>
<div id="fldTranscodingProtocol" style="margin: 1em 0;"> <div id="fldTranscodingProtocol" style="margin: 1em 0;">
@ -403,9 +403,9 @@
<div class="tabContent tabContainerBasics"> <div class="tabContent tabContainerBasics">
<div class="selectContainer"> <div class="selectContainer">
<select id="selectContainerProfileType" name="selectContainerProfileType" is="emby-select" label="${LabelType}"> <select id="selectContainerProfileType" name="selectContainerProfileType" is="emby-select" label="${LabelType}">
<option value="Audio">${OptionProfileAudio}</option> <option value="Audio">${Audio}</option>
<option value="Photo">${OptionProfilePhoto}</option> <option value="Photo">${Photo}</option>
<option value="Video">${OptionProfileVideo}</option> <option value="Video">${Video}</option>
</select> </select>
</div> </div>
<div class="inputContainer"> <div class="inputContainer">
@ -434,9 +434,9 @@
<p>${HeaderCodecProfileHelp}</p> <p>${HeaderCodecProfileHelp}</p>
<div class="selectContainer"> <div class="selectContainer">
<select id="selectCodecProfileType" name="selectCodecProfileType" is="emby-select" label="${LabelType}"> <select id="selectCodecProfileType" name="selectCodecProfileType" is="emby-select" label="${LabelType}">
<option value="Video">${OptionProfileVideo}</option> <option value="Video">${Video}</option>
<option value="VideoAudio">${OptionProfileVideoAudio}</option> <option value="VideoAudio">${VideoAudio}</option>
<option value="Audio">${OptionProfileAudio}</option> <option value="Audio">${Audio}</option>
</select> </select>
</div> </div>
<div class="inputContainer"> <div class="inputContainer">
@ -462,9 +462,9 @@
<div data-role="content"> <div data-role="content">
<div class="selectContainer"> <div class="selectContainer">
<select id="selectResponseProfileType" name="selectResponseProfileType" is="emby-select" label="${LabelType}"> <select id="selectResponseProfileType" name="selectResponseProfileType" is="emby-select" label="${LabelType}">
<option value="Audio">${OptionProfileAudio}</option> <option value="Audio">${Audio}</option>
<option value="Photo">${OptionProfilePhoto}</option> <option value="Photo">${Photo}</option>
<option value="Video">${OptionProfileVideo}</option> <option value="Video">${Video}</option>
</select> </select>
</div> </div>
<div class="inputContainer"> <div class="inputContainer">

2
src/controllers/dashboard/dlna/profiles.js
View file

@ -81,7 +81,7 @@ import 'emby-button';
function getTabs() { function getTabs() {
return [{ return [{
href: 'dlnasettings.html', href: 'dlnasettings.html',
name: globalize.translate('TabSettings') name: globalize.translate('Settings')
}, { }, {
href: 'dlnaprofiles.html', href: 'dlnaprofiles.html',
name: globalize.translate('TabProfiles') name: globalize.translate('TabProfiles')

2
src/controllers/dashboard/dlna/settings.html
View file

@ -7,7 +7,7 @@
<div class="verticalSection"> <div class="verticalSection">
<div class="sectionTitleContainer flex align-items-center"> <div class="sectionTitleContainer flex align-items-center">
<h2 class="sectionTitle">${TabSettings}</h2> <h2 class="sectionTitle">${Settings}</h2>
<a is="emby-linkbutton" rel="noopener noreferrer" class="raised button-alt headerHelpButton" target="_blank" href="https://docs.jellyfin.org/general/networking/dlna.html">${Help}</a> <a is="emby-linkbutton" rel="noopener noreferrer" class="raised button-alt headerHelpButton" target="_blank" href="https://docs.jellyfin.org/general/networking/dlna.html">${Help}</a>
</div> </div>
</div> </div>

2
src/controllers/dashboard/dlna/settings.js
View file

@ -38,7 +38,7 @@ import globalize from 'globalize';
function getTabs() { function getTabs() {
return [{ return [{
href: 'dlnasettings.html', href: 'dlnasettings.html',
name: globalize.translate('TabSettings') name: globalize.translate('Settings')
}, { }, {
href: 'dlnaprofiles.html', href: 'dlnaprofiles.html',
name: globalize.translate('TabProfiles') name: globalize.translate('TabProfiles')

73
src/controllers/dashboard/encodingsettings.html
View file

@ -11,7 +11,7 @@
<div class="selectContainer"> <div class="selectContainer">
<select is="emby-select" id="selectVideoDecoder" label="${LabelHardwareAccelerationType}"> <select is="emby-select" id="selectVideoDecoder" label="${LabelHardwareAccelerationType}">
<option value="">${OptionNone}</option> <option value="">${None}</option>
<option value="amf">AMD AMF</option> <option value="amf">AMD AMF</option>
<option value="qsv">Intel Quick Sync</option> <option value="qsv">Intel Quick Sync</option>
<option value="mediacodec">MediaCodec Android</option> <option value="mediacodec">MediaCodec Android</option>
@ -31,6 +31,11 @@
<div class="fieldDescription">${LabelVaapiDeviceHelp}</div> <div class="fieldDescription">${LabelVaapiDeviceHelp}</div>
</div> </div>
<div class="inputContainer hide fldOpenclDevice">
<input is="emby-input" type="text" id="txtOpenclDevice" label="${LabelOpenclDevice}" />
<div class="fieldDescription">${LabelOpenclDeviceHelp}</div>
</div>
<div class="hardwareAccelerationOptions hide"> <div class="hardwareAccelerationOptions hide">
<div class="checkboxListContainer decodingCodecsList"> <div class="checkboxListContainer decodingCodecsList">
<h3 class="checkboxListLabel">${LabelEnableHardwareDecodingFor}</h3> <h3 class="checkboxListLabel">${LabelEnableHardwareDecodingFor}</h3>
@ -89,9 +94,57 @@
</div> </div>
</div> </div>
<div class="tonemappingOptions hide">
<div class="checkboxListContainer checkboxContainer-withDescription">
<label>
<input type="checkbox" is="emby-checkbox" id="chkTonemapping" />
<span>${EnableTonemapping}</span>
</label>
<div class="fieldDescription checkboxFieldDescription">${AllowTonemappingHelp}</div>
</div>
<div class="selectContainer">
<select is="emby-select" id="selectTonemappingAlgorithm" label="${LabelTonemappingAlgorithm}">
<option value="none">None</option>
<option value="clip">Clip</option>
<option value="linear">Linear</option>
<option value="gamma">Gamma</option>
<option value="reinhard">Reinhard</option>
<option value="hable">Hable</option>
<option value="mobius">Mobius</option>
</select>
<div class="fieldDescription">
<a is="emby-linkbutton" rel="noopener noreferrer" class="button-link" href="http://ffmpeg.org/ffmpeg-all.html#tonemap_005fopencl" target="_blank">${TonemappingAlgorithmHelp}</a>
</div>
</div>
<div class="selectContainer">
<select is="emby-select" id="selectTonemappingRange" label="${LabelTonemappingRange}">
<option value="auto">${Auto}</option>
<option value="tv">TV</option>
<option value="pc">PC</option>
</select>
<div class="fieldDescription">${TonemappingRangeHelp}</div>
</div>
<div class="inputContainer">
<input is="emby-input" type="number" id="txtTonemappingDesat" pattern="[0-9]*" min="0" max="1.79769e+308" step=".00001" label="${LabelTonemappingDesat}" />
<div class="fieldDescription">${LabelTonemappingDesatHelp}</div>
</div>
<div class="inputContainer">
<input is="emby-input" type="number" id="txtTonemappingThreshold" pattern="[0-9]*" min="0" max="1.79769e+308" step=".00001" label="${LabelTonemappingThreshold}" />
<div class="fieldDescription">${LabelTonemappingThresholdHelp}</div>
</div>
<div class="inputContainer">
<input is="emby-input" type="number" id="txtTonemappingPeak" pattern="[0-9]*" min="0" max="1.79769e+308" step=".00001" label="${LabelTonemappingPeak}" />
<div class="fieldDescription">${LabelTonemappingPeakHelp}</div>
</div>
<div class="inputContainer">
<input is="emby-input" type="number" id="txtTonemappingParam" pattern="[0-9]*" min="2.22507e-308" max="1.79769e+308" step=".00001" label="${LabelTonemappingParam}" />
<div class="fieldDescription">${LabelTonemappingParamHelp}</div>
</div>
</div>
<div class="selectContainer"> <div class="selectContainer">
<select is="emby-select" id="selectThreadCount" label="${LabelTranscodingThreadCount}"> <select is="emby-select" id="selectThreadCount" label="${LabelTranscodingThreadCount}">
<option value="-1">${OptionAuto}</option> <option value="-1">${Auto}</option>
<option value="1">1</option> <option value="1">1</option>
<option value="2">2</option> <option value="2">2</option>
<option value="3">3</option> <option value="3">3</option>
@ -129,10 +182,14 @@
<input is="emby-input" type="number" id="txtDownMixAudioBoost" pattern="[0-9]*" required="required" min=".5" max="3" step=".1" label="${LabelDownMixAudioScale}" /> <input is="emby-input" type="number" id="txtDownMixAudioBoost" pattern="[0-9]*" required="required" min=".5" max="3" step=".1" label="${LabelDownMixAudioScale}" />
<div class="fieldDescription">${LabelDownMixAudioScaleHelp}</div> <div class="fieldDescription">${LabelDownMixAudioScaleHelp}</div>
</div> </div>
<div class="inputContainer">
<input is="emby-input" type="number" id="txtMaxMuxingQueueSize" pattern="[0-9]*" required="required" min="128" max="2147483647" step="1" label="${LabelMaxMuxingQueueSize}" />
<div class="fieldDescription">${LabelMaxMuxingQueueSizeHelp}</div>
</div>
<div class="selectContainer"> <div class="selectContainer">
<select is="emby-select" id="selectEncoderPreset" label="${LabelEncoderPreset}"> <select is="emby-select" id="selectEncoderPreset" label="${LabelEncoderPreset}">
<option value="">${OptionAuto}</option> <option value="">${Auto}</option>
<option value="veryslow">veryslow</option> <option value="veryslow">veryslow</option>
<option value="slower">slower</option> <option value="slower">slower</option>
<option value="slow">slow</option> <option value="slow">slow</option>
@ -153,11 +210,19 @@
<div class="selectContainer"> <div class="selectContainer">
<select is="emby-select" id="selectDeinterlaceMethod" label="${LabelDeinterlaceMethod}"> <select is="emby-select" id="selectDeinterlaceMethod" label="${LabelDeinterlaceMethod}">
<option value="yadif">${Yadif}</option> <option value="yadif">${Yadif}</option>
<option value="yadif_bob">${YadifBob}</option> <option value="bwdif">${Bwdif}</option>
</select> </select>
<div class="fieldDescription">${DeinterlaceMethodHelp}</div> <div class="fieldDescription">${DeinterlaceMethodHelp}</div>
</div> </div>
<div class="checkboxContainer checkboxContainer-withDescription">
<label>
<input is="emby-checkbox" type="checkbox" id="chkDoubleRateDeinterlacing" />
<span>${UseDoubleRateDeinterlacing}</span>
</label>
<div class="fieldDescription checkboxFieldDescription">${UseDoubleRateDeinterlacingHelp}</div>
</div>
<div class="checkboxContainer checkboxContainer-withDescription"> <div class="checkboxContainer checkboxContainer-withDescription">
<label> <label>
<input is="emby-checkbox" type="checkbox" id="chkEnableSubtitleExtraction" /> <input is="emby-checkbox" type="checkbox" id="chkEnableSubtitleExtraction" />

33
src/controllers/dashboard/encodingsettings.js
View file

@ -16,12 +16,22 @@ import libraryMenu from 'libraryMenu';
$('#selectVideoDecoder', page).val(config.HardwareAccelerationType); $('#selectVideoDecoder', page).val(config.HardwareAccelerationType);
$('#selectThreadCount', page).val(config.EncodingThreadCount); $('#selectThreadCount', page).val(config.EncodingThreadCount);
$('#txtDownMixAudioBoost', page).val(config.DownMixAudioBoost); $('#txtDownMixAudioBoost', page).val(config.DownMixAudioBoost);
page.querySelector('#txtMaxMuxingQueueSize').value = config.MaxMuxingQueueSize || '';
page.querySelector('.txtEncoderPath').value = config.EncoderAppPathDisplay || ''; page.querySelector('.txtEncoderPath').value = config.EncoderAppPathDisplay || '';
$('#txtTranscodingTempPath', page).val(systemInfo.TranscodingTempPath || ''); $('#txtTranscodingTempPath', page).val(systemInfo.TranscodingTempPath || '');
$('#txtVaapiDevice', page).val(config.VaapiDevice || ''); $('#txtVaapiDevice', page).val(config.VaapiDevice || '');
page.querySelector('#chkTonemapping').checked = config.EnableTonemapping;
page.querySelector('#txtOpenclDevice').value = config.OpenclDevice || '';
page.querySelector('#selectTonemappingAlgorithm').value = config.TonemappingAlgorithm;
page.querySelector('#selectTonemappingRange').value = config.TonemappingRange;
page.querySelector('#txtTonemappingDesat').value = config.TonemappingDesat;
page.querySelector('#txtTonemappingThreshold').value = config.TonemappingThreshold;
page.querySelector('#txtTonemappingPeak').value = config.TonemappingPeak;
page.querySelector('#txtTonemappingParam').value = config.TonemappingParam || '';
page.querySelector('#selectEncoderPreset').value = config.EncoderPreset || ''; page.querySelector('#selectEncoderPreset').value = config.EncoderPreset || '';
page.querySelector('#txtH264Crf').value = config.H264Crf || ''; page.querySelector('#txtH264Crf').value = config.H264Crf || '';
page.querySelector('#selectDeinterlaceMethod').value = config.DeinterlaceMethod || ''; page.querySelector('#selectDeinterlaceMethod').value = config.DeinterlaceMethod || '';
page.querySelector('#chkDoubleRateDeinterlacing').checked = config.DeinterlaceDoubleRate;
page.querySelector('#chkEnableSubtitleExtraction').checked = config.EnableSubtitleExtraction || false; page.querySelector('#chkEnableSubtitleExtraction').checked = config.EnableSubtitleExtraction || false;
page.querySelector('#chkEnableThrottling').checked = config.EnableThrottling || false; page.querySelector('#chkEnableThrottling').checked = config.EnableThrottling || false;
page.querySelector('#selectVideoDecoder').dispatchEvent(new CustomEvent('change', { page.querySelector('#selectVideoDecoder').dispatchEvent(new CustomEvent('change', {
@ -48,7 +58,8 @@ import libraryMenu from 'libraryMenu';
data: JSON.stringify({ data: JSON.stringify({
Path: form.querySelector('.txtEncoderPath').value, Path: form.querySelector('.txtEncoderPath').value,
PathType: 'Custom' PathType: 'Custom'
}) }),
contentType: 'application/json'
}).then(Dashboard.processServerConfigurationUpdateResult, onSaveEncodingPathFailure); }).then(Dashboard.processServerConfigurationUpdateResult, onSaveEncodingPathFailure);
}); });
} }
@ -60,13 +71,23 @@ import libraryMenu from 'libraryMenu';
loading.show(); loading.show();
ApiClient.getNamedConfiguration('encoding').then(function (config) { ApiClient.getNamedConfiguration('encoding').then(function (config) {
config.DownMixAudioBoost = $('#txtDownMixAudioBoost', form).val(); config.DownMixAudioBoost = $('#txtDownMixAudioBoost', form).val();
config.MaxMuxingQueueSize = form.querySelector('#txtMaxMuxingQueueSize').value;
config.TranscodingTempPath = $('#txtTranscodingTempPath', form).val(); config.TranscodingTempPath = $('#txtTranscodingTempPath', form).val();
config.EncodingThreadCount = $('#selectThreadCount', form).val(); config.EncodingThreadCount = $('#selectThreadCount', form).val();
config.HardwareAccelerationType = $('#selectVideoDecoder', form).val(); config.HardwareAccelerationType = $('#selectVideoDecoder', form).val();
config.VaapiDevice = $('#txtVaapiDevice', form).val(); config.VaapiDevice = $('#txtVaapiDevice', form).val();
config.OpenclDevice = form.querySelector('#txtOpenclDevice').value;
config.EnableTonemapping = form.querySelector('#chkTonemapping').checked;
config.TonemappingAlgorithm = form.querySelector('#selectTonemappingAlgorithm').value;
config.TonemappingRange = form.querySelector('#selectTonemappingRange').value;
config.TonemappingDesat = form.querySelector('#txtTonemappingDesat').value;
config.TonemappingThreshold = form.querySelector('#txtTonemappingThreshold').value;
config.TonemappingPeak = form.querySelector('#txtTonemappingPeak').value;
config.TonemappingParam = form.querySelector('#txtTonemappingParam').value || '0';
config.EncoderPreset = form.querySelector('#selectEncoderPreset').value; config.EncoderPreset = form.querySelector('#selectEncoderPreset').value;
config.H264Crf = parseInt(form.querySelector('#txtH264Crf').value || '0'); config.H264Crf = parseInt(form.querySelector('#txtH264Crf').value || '0');
config.DeinterlaceMethod = form.querySelector('#selectDeinterlaceMethod').value; config.DeinterlaceMethod = form.querySelector('#selectDeinterlaceMethod').value;
config.DeinterlaceDoubleRate = form.querySelector('#chkDoubleRateDeinterlacing').checked;
config.EnableSubtitleExtraction = form.querySelector('#chkEnableSubtitleExtraction').checked; config.EnableSubtitleExtraction = form.querySelector('#chkEnableSubtitleExtraction').checked;
config.EnableThrottling = form.querySelector('#chkEnableThrottling').checked; config.EnableThrottling = form.querySelector('#chkEnableThrottling').checked;
config.HardwareDecodingCodecs = Array.prototype.map.call(Array.prototype.filter.call(form.querySelectorAll('.chkDecodeCodec'), function (c) { config.HardwareDecodingCodecs = Array.prototype.map.call(Array.prototype.filter.call(form.querySelectorAll('.chkDecodeCodec'), function (c) {
@ -146,6 +167,16 @@ import libraryMenu from 'libraryMenu';
page.querySelector('#txtVaapiDevice').removeAttribute('required'); page.querySelector('#txtVaapiDevice').removeAttribute('required');
} }
if (this.value == 'nvenc') {
page.querySelector('.fldOpenclDevice').classList.remove('hide');
page.querySelector('#txtOpenclDevice').setAttribute('required', 'required');
page.querySelector('.tonemappingOptions').classList.remove('hide');
} else {
page.querySelector('.fldOpenclDevice').classList.add('hide');
page.querySelector('#txtOpenclDevice').removeAttribute('required');
page.querySelector('.tonemappingOptions').classList.add('hide');
}
if (this.value) { if (this.value) {
page.querySelector('.hardwareAccelerationOptions').classList.remove('hide'); page.querySelector('.hardwareAccelerationOptions').classList.remove('hide');
} else { } else {

2
src/controllers/dashboard/general.html
View file

@ -4,7 +4,7 @@
<form class="dashboardGeneralForm"> <form class="dashboardGeneralForm">
<div class="verticalSection"> <div class="verticalSection">
<div class="sectionTitleContainer flex align-items-center"> <div class="sectionTitleContainer flex align-items-center">
<h2 class="sectionTitle">${TabSettings}</h2> <h2 class="sectionTitle">${Settings}</h2>
<a is="emby-linkbutton" rel="noopener noreferrer" class="raised button-alt headerHelpButton" target="_blank" href="https://docs.jellyfin.org/general/server/settings.html">${Help}</a> <a is="emby-linkbutton" rel="noopener noreferrer" class="raised button-alt headerHelpButton" target="_blank" href="https://docs.jellyfin.org/general/server/settings.html">${Help}</a>
</div> </div>
</div> </div>

16
src/controllers/dashboard/library.js
View file

@ -218,29 +218,29 @@ import 'emby-itemrefreshindicator';
name: '', name: '',
value: '' value: ''
}, { }, {
name: globalize.translate('FolderTypeMovies'), name: globalize.translate('Movies'),
value: 'movies', value: 'movies',
message: getLink('MovieLibraryHelp', 'https://docs.jellyfin.org/general/server/media/movies.html') message: getLink('MovieLibraryHelp', 'https://docs.jellyfin.org/general/server/media/movies.html')
}, { }, {
name: globalize.translate('FolderTypeMusic'), name: globalize.translate('TabMusic'),
value: 'music', value: 'music',
message: getLink('MusicLibraryHelp', 'https://docs.jellyfin.org/general/server/media/music.html') message: getLink('MusicLibraryHelp', 'https://docs.jellyfin.org/general/server/media/music.html')
}, { }, {
name: globalize.translate('FolderTypeTvShows'), name: globalize.translate('Shows'),
value: 'tvshows', value: 'tvshows',
message: getLink('TvLibraryHelp', 'https://docs.jellyfin.org/general/server/media/shows.html') message: getLink('TvLibraryHelp', 'https://docs.jellyfin.org/general/server/media/shows.html')
}, { }, {
name: globalize.translate('FolderTypeBooks'), name: globalize.translate('Books'),
value: 'books', value: 'books',
message: getLink('BookLibraryHelp', 'https://docs.jellyfin.org/general/server/media/books.html') message: getLink('BookLibraryHelp', 'https://docs.jellyfin.org/general/server/media/books.html')
}, { }, {
name: globalize.translate('OptionHomeVideos'), name: globalize.translate('Photos'),
value: 'homevideos' value: 'homevideos'
}, { }, {
name: globalize.translate('FolderTypeMusicVideos'), name: globalize.translate('MusicVideos'),
value: 'musicvideos' value: 'musicvideos'
}, { }, {
name: globalize.translate('FolderTypeUnset'), name: globalize.translate('Other'),
value: 'mixed', value: 'mixed',
message: globalize.translate('MessageUnsetContentHelp') message: globalize.translate('MessageUnsetContentHelp')
}]; }];
@ -326,7 +326,7 @@ import 'emby-itemrefreshindicator';
let typeName = getCollectionTypeOptions().filter(function (t) { let typeName = getCollectionTypeOptions().filter(function (t) {
return t.value == virtualFolder.CollectionType; return t.value == virtualFolder.CollectionType;
})[0]; })[0];
typeName = typeName ? typeName.name : globalize.translate('FolderTypeUnset'); typeName = typeName ? typeName.name : globalize.translate('Other');
html += "<div class='cardText cardText-secondary'>"; html += "<div class='cardText cardText-secondary'>";
if (virtualFolder.showType === false) { if (virtualFolder.showType === false) {

2
src/controllers/dashboard/metadatanfo.js
View file

@ -6,7 +6,7 @@ import globalize from 'globalize';
/* eslint-disable indent */ /* eslint-disable indent */
function loadPage(page, config, users) { function loadPage(page, config, users) {
let html = '<option value="" selected="selected">' + globalize.translate('OptionNone') + '</option>'; let html = '<option value="" selected="selected">' + globalize.translate('None') + '</option>';
html += users.map(function (user) { html += users.map(function (user) {
return '<option value="' + user.Id + '">' + user.Name + '</option>'; return '<option value="' + user.Id + '">' + user.Name + '</option>';
}).join(''); }).join('');

5
src/controllers/dashboard/networking.html
View file

@ -43,6 +43,11 @@
<input is="emby-input" type="text" id="txtLanNetworks" label="${LabelLanNetworks}" /> <input is="emby-input" type="text" id="txtLanNetworks" label="${LabelLanNetworks}" />
<div class="fieldDescription">${LanNetworksHelp}</div> <div class="fieldDescription">${LanNetworksHelp}</div>
</div> </div>
<div class="inputContainer">
<input is="emby-input" type="text" id="txtKnownProxies" label="${LabelKnownProxies}" />
<div class="fieldDescription">${KnownProxiesHelp}</div>
</div>
</fieldset> </fieldset>
<fieldset class='verticalSection verticalSection-extrabottompadding'> <fieldset class='verticalSection verticalSection-extrabottompadding'>

6
src/controllers/dashboard/networking.js
View file

@ -30,6 +30,11 @@ import 'emby-select';
}).filter(function (s) { }).filter(function (s) {
return s.length > 0; return s.length > 0;
}); });
config.KnownProxies = form.querySelector('#txtKnownProxies').value.split(',').map(function (s) {
return s.trim();
}).filter(function (s) {
return s.length > 0;
});
config.IsRemoteIPFilterBlacklist = form.querySelector('#selectExternalAddressFilterMode').value === 'blacklist'; config.IsRemoteIPFilterBlacklist = form.querySelector('#selectExternalAddressFilterMode').value === 'blacklist';
config.PublicPort = form.querySelector('#txtPublicPort').value; config.PublicPort = form.querySelector('#txtPublicPort').value;
config.PublicHttpsPort = form.querySelector('#txtPublicHttpsPort').value; config.PublicHttpsPort = form.querySelector('#txtPublicHttpsPort').value;
@ -108,6 +113,7 @@ import 'emby-select';
page.querySelector('#txtPublicHttpsPort').value = config.PublicHttpsPort; page.querySelector('#txtPublicHttpsPort').value = config.PublicHttpsPort;
page.querySelector('#txtLocalAddress').value = config.LocalNetworkAddresses[0] || ''; page.querySelector('#txtLocalAddress').value = config.LocalNetworkAddresses[0] || '';
page.querySelector('#txtLanNetworks').value = (config.LocalNetworkSubnets || []).join(', '); page.querySelector('#txtLanNetworks').value = (config.LocalNetworkSubnets || []).join(', ');
page.querySelector('#txtKnownProxies').value = (config.KnownProxies || []).join(', ');
page.querySelector('#txtExternalAddressFilter').value = (config.RemoteIPFilter || []).join(', '); page.querySelector('#txtExternalAddressFilter').value = (config.RemoteIPFilter || []).join(', ');
page.querySelector('#selectExternalAddressFilterMode').value = config.IsRemoteIPFilterBlacklist ? 'blacklist' : 'whitelist'; page.querySelector('#selectExternalAddressFilterMode').value = config.IsRemoteIPFilterBlacklist ? 'blacklist' : 'whitelist';
page.querySelector('#chkRemoteAccess').checked = config.EnableRemoteAccess == null || config.EnableRemoteAccess; page.querySelector('#chkRemoteAccess').checked = config.EnableRemoteAccess == null || config.EnableRemoteAccess;

4
src/controllers/dashboard/plugins/installed/index.js
View file

@ -39,7 +39,7 @@ function getPluginCardHtml(plugin, pluginConfigurationPages) {
const configPage = pluginConfigurationPages.filter(function (pluginConfigurationPage) { const configPage = pluginConfigurationPages.filter(function (pluginConfigurationPage) {
return pluginConfigurationPage.PluginId == plugin.Id; return pluginConfigurationPage.PluginId == plugin.Id;
})[0]; })[0];
const configPageUrl = configPage ? Dashboard.getConfigurationPageUrl(configPage.Name) : null; const configPageUrl = configPage ? Dashboard.getPluginUrl(configPage.Name) : null;
let html = ''; let html = '';
html += "<div data-id='" + plugin.Id + "' data-name='" + plugin.Name + "' data-removable='" + plugin.CanUninstall + "' class='card backdropCard'>"; html += "<div data-id='" + plugin.Id + "' data-name='" + plugin.Name + "' data-removable='" + plugin.CanUninstall + "' class='card backdropCard'>";
html += '<div class="cardBox visualCardBox">'; html += '<div class="cardBox visualCardBox">';
@ -118,7 +118,7 @@ function showPluginMenu(page, elem) {
if (configHref) { if (configHref) {
menuItems.push({ menuItems.push({
name: globalize.translate('ButtonSettings'), name: globalize.translate('Settings'),
id: 'open', id: 'open',
icon: 'mode_edit' icon: 'mode_edit'
}); });

2
src/controllers/dashboard/users/useredit.html
View file

@ -11,7 +11,7 @@
</div> </div>
<div data-role="controlgroup" data-type="horizontal" class="localnav" id="userProfileNavigation" data-mini="true"> <div data-role="controlgroup" data-type="horizontal" class="localnav" id="userProfileNavigation" data-mini="true">
<a href="#" is="emby-linkbutton" data-role="button" class="ui-btn-active">${TabProfile}</a> <a href="#" is="emby-linkbutton" data-role="button" class="ui-btn-active">${Profile}</a>
<a href="#" is="emby-linkbutton" data-role="button" onclick="Dashboard.navigate('userlibraryaccess.html', true);">${TabAccess}</a> <a href="#" is="emby-linkbutton" data-role="button" onclick="Dashboard.navigate('userlibraryaccess.html', true);">${TabAccess}</a>
<a href="#" is="emby-linkbutton" data-role="button" onclick="Dashboard.navigate('userparentalcontrol.html', true);">${TabParentalControl}</a> <a href="#" is="emby-linkbutton" data-role="button" onclick="Dashboard.navigate('userparentalcontrol.html', true);">${TabParentalControl}</a>
<a href="#" is="emby-linkbutton" data-role="button" onclick="Dashboard.navigate('userpassword.html', true);">${HeaderPassword}</a> <a href="#" is="emby-linkbutton" data-role="button" onclick="Dashboard.navigate('userpassword.html', true);">${HeaderPassword}</a>

2
src/controllers/dashboard/users/userlibraryaccess.html
View file

@ -11,7 +11,7 @@
</div> </div>
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true"> <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
<a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('useredit.html', true);">${TabProfile}</a> <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('useredit.html', true);">${Profile}</a>
<a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userlibraryaccess.html', true);" class="ui-btn-active">${TabAccess}</a> <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userlibraryaccess.html', true);" class="ui-btn-active">${TabAccess}</a>
<a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userparentalcontrol.html', true);">${TabParentalControl}</a> <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userparentalcontrol.html', true);">${TabParentalControl}</a>
<a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userpassword.html', true);">${HeaderPassword}</a> <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userpassword.html', true);">${HeaderPassword}</a>

2
src/controllers/dashboard/users/userparentalcontrol.html
View file

@ -9,7 +9,7 @@
</div> </div>
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true"> <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
<a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('useredit.html', true);">${TabProfile}</a> <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('useredit.html', true);">${Profile}</a>
<a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userlibraryaccess.html', true);">${TabAccess}</a> <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userlibraryaccess.html', true);">${TabAccess}</a>
<a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userparentalcontrol.html', true);" class="ui-btn-active">${TabParentalControl}</a> <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userparentalcontrol.html', true);" class="ui-btn-active">${TabParentalControl}</a>
<a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userpassword.html', true);">${HeaderPassword}</a> <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userpassword.html', true);">${HeaderPassword}</a>

14
src/controllers/dashboard/users/userparentalcontrol.js
View file

@ -40,25 +40,25 @@ import 'paper-icon-button-light';
function loadUnratedItems(page, user) { function loadUnratedItems(page, user) {
const items = [{ const items = [{
name: globalize.translate('OptionBlockBooks'), name: globalize.translate('Books'),
value: 'Book' value: 'Book'
}, { }, {
name: globalize.translate('OptionBlockChannelContent'), name: globalize.translate('Channels'),
value: 'ChannelContent' value: 'ChannelContent'
}, { }, {
name: globalize.translate('OptionBlockLiveTvChannels'), name: globalize.translate('LiveTV'),
value: 'LiveTvChannel' value: 'LiveTvChannel'
}, { }, {
name: globalize.translate('OptionBlockMovies'), name: globalize.translate('Movies'),
value: 'Movie' value: 'Movie'
}, { }, {
name: globalize.translate('OptionBlockMusic'), name: globalize.translate('Music'),
value: 'Music' value: 'Music'
}, { }, {
name: globalize.translate('OptionBlockTrailers'), name: globalize.translate('Trailers'),
value: 'Trailer' value: 'Trailer'
}, { }, {
name: globalize.translate('OptionBlockTvShows'), name: globalize.translate('Shows'),
value: 'Series' value: 'Series'
}]; }];
let html = ''; let html = '';

4
src/controllers/dashboard/users/userpassword.html
View file

@ -9,7 +9,7 @@
</div> </div>
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true"> <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
<a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('useredit.html', true);">${TabProfile}</a> <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('useredit.html', true);">${Profile}</a>
<a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userlibraryaccess.html', true);">${TabAccess}</a> <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userlibraryaccess.html', true);">${TabAccess}</a>
<a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userparentalcontrol.html', true);">${TabParentalControl}</a> <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userparentalcontrol.html', true);">${TabParentalControl}</a>
<a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userpassword.html', true);" class="ui-btn-active">${HeaderPassword}</a> <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userpassword.html', true);" class="ui-btn-active">${HeaderPassword}</a>
@ -31,7 +31,7 @@
<div> <div>
<button is="emby-button" type="submit" class="raised button-submit block"><span>${Save}</span></button> <button is="emby-button" type="submit" class="raised button-submit block"><span>${Save}</span></button>
<button is="emby-button" type="button" id="btnResetPassword" class="raised button-cancel block hide"> <button is="emby-button" type="button" id="btnResetPassword" class="raised button-cancel block hide">
<span>${ButtonResetPassword}</span> <span>${ResetPassword}</span>
</button> </button>
</div> </div>
</div> </div>

4
src/controllers/dashboard/users/userpasswordpage.js
View file

@ -145,14 +145,14 @@ import 'emby-button';
function resetPassword() { function resetPassword() {
const msg = globalize.translate('PasswordResetConfirmation'); const msg = globalize.translate('PasswordResetConfirmation');
import('confirm').then(({default: confirm}) => { import('confirm').then(({default: confirm}) => {
confirm(msg, globalize.translate('HeaderResetPassword')).then(function () { confirm(msg, globalize.translate('ResetPassword')).then(function () {
const userId = params.userId; const userId = params.userId;
loading.show(); loading.show();
ApiClient.resetUserPassword(userId).then(function () { ApiClient.resetUserPassword(userId).then(function () {
loading.hide(); loading.hide();
Dashboard.alert({ Dashboard.alert({
message: globalize.translate('PasswordResetComplete'), message: globalize.translate('PasswordResetComplete'),
title: globalize.translate('HeaderResetPassword') title: globalize.translate('ResetPassword')
}); });
loadUser(view, params); loadUser(view, params);
}); });

25
src/controllers/favorites.js
View file

@ -2,7 +2,6 @@ import appRouter from 'appRouter';
import cardBuilder from 'cardBuilder'; import cardBuilder from 'cardBuilder';
import dom from 'dom'; import dom from 'dom';
import globalize from 'globalize'; import globalize from 'globalize';
import connectionManager from 'connectionManager';
import appHost from 'apphost'; import appHost from 'apphost';
import layoutManager from 'layoutManager'; import layoutManager from 'layoutManager';
import focusManager from 'focusManager'; import focusManager from 'focusManager';
@ -29,7 +28,7 @@ import 'emby-scroller';
function getSections() { function getSections() {
return [{ return [{
name: 'HeaderFavoriteMovies', name: 'Movies',
types: 'Movie', types: 'Movie',
shape: getPosterShape(), shape: getPosterShape(),
showTitle: true, showTitle: true,
@ -38,7 +37,7 @@ import 'emby-scroller';
overlayText: false, overlayText: false,
centerText: true centerText: true
}, { }, {
name: 'HeaderFavoriteShows', name: 'Shows',
types: 'Series', types: 'Series',
shape: getPosterShape(), shape: getPosterShape(),
showTitle: true, showTitle: true,
@ -47,7 +46,7 @@ import 'emby-scroller';
overlayText: false, overlayText: false,
centerText: true centerText: true
}, { }, {
name: 'HeaderFavoriteEpisodes', name: 'Episodes',
types: 'Episode', types: 'Episode',
shape: getThumbShape(), shape: getThumbShape(),
preferThumb: false, preferThumb: false,
@ -57,7 +56,7 @@ import 'emby-scroller';
overlayText: false, overlayText: false,
centerText: true centerText: true
}, { }, {
name: 'HeaderFavoriteVideos', name: 'Videos',
types: 'Video', types: 'Video',
shape: getThumbShape(), shape: getThumbShape(),
preferThumb: true, preferThumb: true,
@ -66,7 +65,7 @@ import 'emby-scroller';
overlayText: false, overlayText: false,
centerText: true centerText: true
}, { }, {
name: 'HeaderFavoriteCollections', name: 'Collections',
types: 'BoxSet', types: 'BoxSet',
shape: getPosterShape(), shape: getPosterShape(),
showTitle: true, showTitle: true,
@ -74,7 +73,7 @@ import 'emby-scroller';
overlayText: false, overlayText: false,
centerText: true centerText: true
}, { }, {
name: 'HeaderFavoritePlaylists', name: 'Playlists',
types: 'Playlist', types: 'Playlist',
shape: getSquareShape(), shape: getSquareShape(),
preferThumb: false, preferThumb: false,
@ -85,7 +84,7 @@ import 'emby-scroller';
overlayPlayButton: true, overlayPlayButton: true,
coverImage: true coverImage: true
}, { }, {
name: 'HeaderFavoritePeople', name: 'People',
types: 'Person', types: 'Person',
shape: getPosterShape(), shape: getPosterShape(),
preferThumb: false, preferThumb: false,
@ -96,7 +95,7 @@ import 'emby-scroller';
overlayPlayButton: true, overlayPlayButton: true,
coverImage: true coverImage: true
}, { }, {
name: 'HeaderFavoriteArtists', name: 'Artists',
types: 'MusicArtist', types: 'MusicArtist',
shape: getSquareShape(), shape: getSquareShape(),
preferThumb: false, preferThumb: false,
@ -107,7 +106,7 @@ import 'emby-scroller';
overlayPlayButton: true, overlayPlayButton: true,
coverImage: true coverImage: true
}, { }, {
name: 'HeaderFavoriteAlbums', name: 'Albums',
types: 'MusicAlbum', types: 'MusicAlbum',
shape: getSquareShape(), shape: getSquareShape(),
preferThumb: false, preferThumb: false,
@ -118,7 +117,7 @@ import 'emby-scroller';
overlayPlayButton: true, overlayPlayButton: true,
coverImage: true coverImage: true
}, { }, {
name: 'HeaderFavoriteSongs', name: 'Songs',
types: 'Audio', types: 'Audio',
shape: getSquareShape(), shape: getSquareShape(),
preferThumb: false, preferThumb: false,
@ -130,7 +129,7 @@ import 'emby-scroller';
action: 'instantmix', action: 'instantmix',
coverImage: true coverImage: true
}, { }, {
name: 'HeaderFavoriteBooks', name: 'Books',
types: 'Book', types: 'Book',
shape: getPosterShape(), shape: getPosterShape(),
showTitle: true, showTitle: true,
@ -270,7 +269,7 @@ class FavoritesTab {
constructor(view, params) { constructor(view, params) {
this.view = view; this.view = view;
this.params = params; this.params = params;
this.apiClient = connectionManager.currentApiClient(); this.apiClient = window.connectionManager.currentApiClient();
this.sectionsContainer = view.querySelector('.sections'); this.sectionsContainer = view.querySelector('.sections');
createSections(this, this.sectionsContainer, this.apiClient); createSections(this, this.sectionsContainer, this.apiClient);
} }

3
src/controllers/hometab.js
View file

@ -1,6 +1,5 @@
import * as userSettings from 'userSettings'; import * as userSettings from 'userSettings';
import loading from 'loading'; import loading from 'loading';
import connectionManager from 'connectionManager';
import focusManager from 'focusManager'; import focusManager from 'focusManager';
import homeSections from 'homeSections'; import homeSections from 'homeSections';
import 'emby-itemscontainer'; import 'emby-itemscontainer';
@ -9,7 +8,7 @@ class HomeTab {
constructor(view, params) { constructor(view, params) {
this.view = view; this.view = view;
this.params = params; this.params = params;
this.apiClient = connectionManager.currentApiClient(); this.apiClient = window.connectionManager.currentApiClient();
this.sectionsContainer = view.querySelector('.sections'); this.sectionsContainer = view.querySelector('.sections');
view.querySelector('.sections').addEventListener('settingschange', onHomeScreenSettingsChanged.bind(this)); view.querySelector('.sections').addEventListener('settingschange', onHomeScreenSettingsChanged.bind(this));
} }

24
src/controllers/itemDetails/index.html
View file

@ -7,11 +7,11 @@
<div class="detailPagePrimaryContainer padded-left padded-right"> <div class="detailPagePrimaryContainer padded-left padded-right">
<div class="infoWrapper infoText"> <div class="infoWrapper infoText">
<div class="nameContainer"></div> <div class="nameContainer"></div>
<div class="itemMiscInfo itemMiscInfo-primary" style="margin-bottom: 0.6em"></div> <div class="itemMiscInfo itemMiscInfo-primary" style="margin-bottom: 0.6em;"></div>
<div class="itemMiscInfo itemMiscInfo-secondary" style="margin-bottom: 0.6em"></div> <div class="itemMiscInfo itemMiscInfo-secondary" style="margin-bottom: 0.6em;"></div>
</div> </div>
<div class="mainDetailButtons"> <div class="mainDetailButtons focuscontainer-x">
<button is="emby-button" type="button" class="button-flat btnResume hide detailButton" title="${ButtonResume}" data-mode="resume"> <button is="emby-button" type="button" class="button-flat btnResume hide detailButton" title="${ButtonResume}" data-mode="resume">
<div class="detailButton-content"> <div class="detailButton-content">
<span class="material-icons detailButton-icon play_arrow"></span> <span class="material-icons detailButton-icon play_arrow"></span>
@ -95,17 +95,17 @@
<div class="itemDetailsGroup"> <div class="itemDetailsGroup">
<div class="detailsGroupItem genresGroup hide"> <div class="detailsGroupItem genresGroup hide">
<div class="genresLabel label"></div> <div class="genresLabel label"></div>
<div class="genres content"></div> <div class="genres content focuscontainer-x"></div>
</div> </div>
<div class="detailsGroupItem directorsGroup hide"> <div class="detailsGroupItem directorsGroup hide">
<div class="directorsLabel label"></div> <div class="directorsLabel label"></div>
<div class="directors content"></div> <div class="directors content focuscontainer-x"></div>
</div> </div>
<div class="detailsGroupItem writersGroup hide"> <div class="detailsGroupItem writersGroup hide">
<div class="writersLabel label"></div> <div class="writersLabel label"></div>
<div class="writers content"></div> <div class="writers content focuscontainer-x"></div>
</div> </div>
</div> </div>
@ -124,7 +124,7 @@
</div> </div>
</form> </form>
<div class="recordingFields hide" style="margin: .5em 0 1.5em;"></div> <div class="recordingFields hide" style="margin: 0.5em 0 1.5em;"></div>
<div class="detailSectionContent"> <div class="detailSectionContent">
<div class="itemLastPlayed hide"></div> <div class="itemLastPlayed hide"></div>
@ -139,14 +139,14 @@
<p id="itemDeathDate"></p> <p id="itemDeathDate"></p>
<p id="seriesAirTime"></p> <p id="seriesAirTime"></p>
<div class="itemTags hide" style="margin: .7em 0;font-size:92%;"></div> <div class="itemTags focuscontainer-x hide" style="margin: 0.7em 0; font-size: 92%;"></div>
<div class="itemExternalLinks hide" style="margin: .7em 0;font-size:92%;"></div> <div class="itemExternalLinks focuscontainer-x hide" style="margin: 0.7em 0; font-size: 92%;"></div>
<div class="seriesRecordingEditor"></div> <div class="seriesRecordingEditor"></div>
</div> </div>
</div> </div>
</div> </div>
<div class="seriesTimerScheduleSection verticalSection detailVerticalSection hide" style="margin-top:-3em;"> <div class="seriesTimerScheduleSection verticalSection detailVerticalSection hide" style="margin-top: -3em;">
<h2 class="sectionTitle">${Schedule}</h2> <h2 class="sectionTitle">${Schedule}</h2>
<div class="seriesTimerSchedule padded-right"></div> <div class="seriesTimerSchedule padded-right"></div>
</div> </div>
@ -205,14 +205,14 @@
</div> </div>
<div id="specialsCollapsible" class="verticalSection detailVerticalSection hide"> <div id="specialsCollapsible" class="verticalSection detailVerticalSection hide">
<h2 class="sectionTitle sectionTitle-cards padded-right">${HeaderSpecialFeatures}</h2> <h2 class="sectionTitle sectionTitle-cards padded-right">${SpecialFeatures}</h2>
<div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale" data-centerfocus="true"> <div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale" data-centerfocus="true">
<div id="specialsContent" is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer"></div> <div id="specialsContent" is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer"></div>
</div> </div>
</div> </div>
<div id="musicVideosCollapsible" class="verticalSection detailVerticalSection hide"> <div id="musicVideosCollapsible" class="verticalSection detailVerticalSection hide">
<h2 class="sectionTitle sectionTitle-cards padded-right">${HeaderMusicVideos}</h2> <h2 class="sectionTitle sectionTitle-cards padded-right">${MusicVideos}</h2>
<div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale" data-centerfocus="true"> <div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale" data-centerfocus="true">
<div id="musicVideosContent" is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer"></div> <div id="musicVideosContent" is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer"></div>
</div> </div>

76
src/controllers/itemDetails/index.js
View file

@ -3,7 +3,6 @@ import loading from 'loading';
import appRouter from 'appRouter'; import appRouter from 'appRouter';
import itemShortcuts from 'itemShortcuts'; import itemShortcuts from 'itemShortcuts';
import layoutManager from 'layoutManager'; import layoutManager from 'layoutManager';
import connectionManager from 'connectionManager';
import * as userSettings from 'userSettings'; import * as userSettings from 'userSettings';
import cardBuilder from 'cardBuilder'; import cardBuilder from 'cardBuilder';
import datetime from 'datetime'; import datetime from 'datetime';
@ -206,7 +205,7 @@ function renderVideoSelections(page, mediaSources) {
}); });
const select = page.querySelector('.selectVideo'); const select = page.querySelector('.selectVideo');
select.setLabel(globalize.translate('LabelVideo')); select.setLabel(globalize.translate('Video'));
const selectedId = tracks.length ? tracks[0].Index : -1; const selectedId = tracks.length ? tracks[0].Index : -1;
select.innerHTML = tracks.map(function (v) { select.innerHTML = tracks.map(function (v) {
const selected = v.Index === selectedId ? ' selected' : ''; const selected = v.Index === selectedId ? ' selected' : '';
@ -414,7 +413,7 @@ function renderName(item, container, context) {
}, { }, {
context: context context: context
}); });
parentNameHtml.push('<a style="color:inherit;" class="button-link" is="emby-linkbutton" href="' + parentRoute + '">' + item.SeriesName + '</a>'); parentNameHtml.push('<a style="color:inherit;" class="button-link" tabindex="-1" is="emby-linkbutton" href="' + parentRoute + '">' + item.SeriesName + '</a>');
} else if (item.IsSeries || item.EpisodeTitle) { } else if (item.IsSeries || item.EpisodeTitle) {
parentNameHtml.push(item.Name); parentNameHtml.push(item.Name);
} }
@ -429,7 +428,7 @@ function renderName(item, container, context) {
}, { }, {
context: context context: context
}); });
parentNameHtml.push('<a style="color:inherit;" class="button-link" is="emby-linkbutton" href="' + parentRoute + '">' + item.SeriesName + '</a>'); parentNameHtml.push('<a style="color:inherit;" class="button-link" tabindex="-1" is="emby-linkbutton" href="' + parentRoute + '">' + item.SeriesName + '</a>');
} else if (item.ParentIndexNumber != null && item.Type === 'Episode') { } else if (item.ParentIndexNumber != null && item.Type === 'Episode') {
parentRoute = appRouter.getRouteUrl({ parentRoute = appRouter.getRouteUrl({
Id: item.SeasonId, Id: item.SeasonId,
@ -440,7 +439,7 @@ function renderName(item, container, context) {
}, { }, {
context: context context: context
}); });
parentNameHtml.push('<a style="color:inherit;" class="button-link" is="emby-linkbutton" href="' + parentRoute + '">' + item.SeasonName + '</a>'); parentNameHtml.push('<a style="color:inherit;" class="button-link" tabindex="-1" is="emby-linkbutton" href="' + parentRoute + '">' + item.SeasonName + '</a>');
} else if (item.ParentIndexNumber != null && item.IsSeries) { } else if (item.ParentIndexNumber != null && item.IsSeries) {
parentNameHtml.push(item.SeasonName || 'S' + item.ParentIndexNumber); parentNameHtml.push(item.SeasonName || 'S' + item.ParentIndexNumber);
} else if (item.Album && item.AlbumId && (item.Type === 'MusicVideo' || item.Type === 'Audio')) { } else if (item.Album && item.AlbumId && (item.Type === 'MusicVideo' || item.Type === 'Audio')) {
@ -453,7 +452,7 @@ function renderName(item, container, context) {
}, { }, {
context: context context: context
}); });
parentNameHtml.push('<a style="color:inherit;" class="button-link" is="emby-linkbutton" href="' + parentRoute + '">' + item.Album + '</a>'); parentNameHtml.push('<a style="color:inherit;" class="button-link" tabindex="-1" is="emby-linkbutton" href="' + parentRoute + '">' + item.Album + '</a>');
} else if (item.Album) { } else if (item.Album) {
parentNameHtml.push(item.Album); parentNameHtml.push(item.Album);
} }
@ -564,15 +563,18 @@ function renderDetailPageBackdrop(page, item, apiClient) {
} }
function reloadFromItem(instance, page, params, item, user) { function reloadFromItem(instance, page, params, item, user) {
const apiClient = connectionManager.getApiClient(item.ServerId); const apiClient = window.connectionManager.getApiClient(item.ServerId);
Emby.Page.setTitle(''); Emby.Page.setTitle('');
// Start rendering the artwork first // Start rendering the artwork first
renderImage(page, item); renderImage(page, item);
renderLogo(page, item, apiClient); // Save some screen real estate in TV mode
if (!layoutManager.tv) {
renderLogo(page, item, apiClient);
renderDetailPageBackdrop(page, item, apiClient);
}
renderBackdrop(item); renderBackdrop(item);
renderDetailPageBackdrop(page, item, apiClient);
// Render the main information for the item // Render the main information for the item
page.querySelector('.detailPagePrimaryContainer').classList.add('detailRibbon'); page.querySelector('.detailPagePrimaryContainer').classList.add('detailRibbon');
@ -764,6 +766,9 @@ function renderDetailImage(elem, item, imageLoader) {
elem.innerHTML = cardHtml; elem.innerHTML = cardHtml;
imageLoader.lazyChildren(elem); imageLoader.lazyChildren(elem);
// Avoid breaking the design by preventing focus of the poster using the keyboard.
elem.querySelector('button').tabIndex = -1;
} }
function renderImage(page, item) { function renderImage(page, item) {
@ -797,7 +802,7 @@ function renderNextUp(page, item, user) {
return void section.classList.add('hide'); return void section.classList.add('hide');
} }
connectionManager.getApiClient(item.ServerId).getNextUpEpisodes({ window.connectionManager.getApiClient(item.ServerId).getNextUpEpisodes({
SeriesId: item.Id, SeriesId: item.Id,
UserId: user.Id UserId: user.Id
}).then(function (result) { }).then(function (result) {
@ -1059,7 +1064,12 @@ function renderDetails(page, item, apiClient, context, isStatic) {
renderOverview(page, item); renderOverview(page, item);
renderMiscInfo(page, item); renderMiscInfo(page, item);
reloadUserDataButtons(page, item); reloadUserDataButtons(page, item);
renderLinks(page, item);
// Don't allow redirection to other websites from the TV layout
if (!layoutManager.tv) {
renderLinks(page, item);
}
renderTags(page, item); renderTags(page, item);
renderSeriesAirTime(page, item, isStatic); renderSeriesAirTime(page, item, isStatic);
} }
@ -1196,7 +1206,7 @@ function renderSimilarItems(page, item, context) {
} }
similarCollapsible.classList.remove('hide'); similarCollapsible.classList.remove('hide');
const apiClient = connectionManager.getApiClient(item.ServerId); const apiClient = window.connectionManager.getApiClient(item.ServerId);
const options = { const options = {
userId: apiClient.getCurrentUserId(), userId: apiClient.getCurrentUserId(),
limit: 12, limit: 12,
@ -1310,7 +1320,7 @@ function renderChildren(page, item) {
} }
let promise; let promise;
const apiClient = connectionManager.getApiClient(item.ServerId); const apiClient = window.connectionManager.getApiClient(item.ServerId);
const userId = apiClient.getCurrentUserId(); const userId = apiClient.getCurrentUserId();
if (item.Type == 'Series') { if (item.Type == 'Series') {
@ -1337,16 +1347,25 @@ function renderChildren(page, item) {
const childrenItemsContainer = page.querySelector('.childrenItemsContainer'); const childrenItemsContainer = page.querySelector('.childrenItemsContainer');
if (item.Type == 'MusicAlbum') { if (item.Type == 'MusicAlbum') {
const equalSet = (arr1, arr2) => arr1.every(x => arr2.indexOf(x) !== -1) && arr1.length === arr2.length;
let showArtist = false;
for (const track of result.Items) {
if (!equalSet(track.ArtistItems.map(x => x.Id), track.AlbumArtists.map(x => x.Id))) {
showArtist = true;
break;
}
}
const discNumbers = result.Items.map(x => x.ParentIndexNumber);
html = listView.getListViewHtml({ html = listView.getListViewHtml({
items: result.Items, items: result.Items,
smallIcon: true, smallIcon: true,
showIndex: true, showIndex: new Set(discNumbers).size > 1 || (discNumbers.length >= 1 && discNumbers[0] > 1),
index: 'disc', index: 'disc',
showIndexNumberLeft: true, showIndexNumberLeft: true,
playFromHere: true, playFromHere: true,
action: 'playallfromhere', action: 'playallfromhere',
image: false, image: false,
artist: 'auto', artist: showArtist,
containerAlbumArtists: item.AlbumArtists containerAlbumArtists: item.AlbumArtists
}); });
isList = true; isList = true;
@ -1549,7 +1568,7 @@ function renderChannelGuide(page, apiClient, item) {
} }
function renderSeriesSchedule(page, item) { function renderSeriesSchedule(page, item) {
const apiClient = connectionManager.getApiClient(item.ServerId); const apiClient = window.connectionManager.getApiClient(item.ServerId);
apiClient.getLiveTvPrograms({ apiClient.getLiveTvPrograms({
UserId: apiClient.getCurrentUserId(), UserId: apiClient.getCurrentUserId(),
HasAired: false, HasAired: false,
@ -1709,7 +1728,7 @@ function renderCollectionItemType(page, parentItem, type, items) {
} }
function renderMusicVideos(page, item, user) { function renderMusicVideos(page, item, user) {
connectionManager.getApiClient(item.ServerId).getItems(user.Id, { window.connectionManager.getApiClient(item.ServerId).getItems(user.Id, {
SortBy: 'SortName', SortBy: 'SortName',
SortOrder: 'Ascending', SortOrder: 'Ascending',
IncludeItemTypes: 'MusicVideo', IncludeItemTypes: 'MusicVideo',
@ -1729,7 +1748,7 @@ function renderMusicVideos(page, item, user) {
} }
function renderAdditionalParts(page, item, user) { function renderAdditionalParts(page, item, user) {
connectionManager.getApiClient(item.ServerId).getAdditionalVideoParts(user.Id, item.Id).then(function (result) { window.connectionManager.getApiClient(item.ServerId).getAdditionalVideoParts(user.Id, item.Id).then(function (result) {
if (result.Items.length) { if (result.Items.length) {
page.querySelector('#additionalPartsCollapsible').classList.remove('hide'); page.querySelector('#additionalPartsCollapsible').classList.remove('hide');
const additionalPartsContent = page.querySelector('#additionalPartsContent'); const additionalPartsContent = page.querySelector('#additionalPartsContent');
@ -1774,7 +1793,7 @@ function getVideosHtml(items) {
} }
function renderSpecials(page, item, user) { function renderSpecials(page, item, user) {
connectionManager.getApiClient(item.ServerId).getSpecialFeatures(user.Id, item.Id).then(function (specials) { window.connectionManager.getApiClient(item.ServerId).getSpecialFeatures(user.Id, item.Id).then(function (specials) {
const specialsContent = page.querySelector('#specialsContent'); const specialsContent = page.querySelector('#specialsContent');
specialsContent.innerHTML = getVideosHtml(specials); specialsContent.innerHTML = getVideosHtml(specials);
imageLoader.lazyChildren(specialsContent); imageLoader.lazyChildren(specialsContent);
@ -1830,7 +1849,7 @@ export default function (view, params) {
function reload(instance, page, params) { function reload(instance, page, params) {
loading.show(); loading.show();
const apiClient = params.serverId ? connectionManager.getApiClient(params.serverId) : ApiClient; const apiClient = params.serverId ? window.connectionManager.getApiClient(params.serverId) : ApiClient;
Promise.all([getPromise(apiClient, params), apiClient.getCurrentUser()]).then(([item, user]) => { Promise.all([getPromise(apiClient, params), apiClient.getCurrentUser()]).then(([item, user]) => {
currentItem = item; currentItem = item;
@ -1879,7 +1898,7 @@ export default function (view, params) {
const item = currentItem; const item = currentItem;
if (item.Type === 'Program') { if (item.Type === 'Program') {
const apiClient = connectionManager.getApiClient(item.ServerId); const apiClient = window.connectionManager.getApiClient(item.ServerId);
return void apiClient.getLiveTvChannel(item.ChannelId, apiClient.getCurrentUserId()).then(function (channel) { return void apiClient.getLiveTvChannel(item.ChannelId, apiClient.getCurrentUserId()).then(function (channel) {
playbackManager.play({ playbackManager.play({
items: [channel] items: [channel]
@ -1916,7 +1935,7 @@ export default function (view, params) {
function onCancelTimerClick() { function onCancelTimerClick() {
import('recordingHelper').then(({ default: recordingHelper }) => { import('recordingHelper').then(({ default: recordingHelper }) => {
recordingHelper.cancelTimer(connectionManager.getApiClient(currentItem.ServerId), currentItem.TimerId).then(function () { recordingHelper.cancelTimer(window.connectionManager.getApiClient(currentItem.ServerId), currentItem.TimerId).then(function () {
reload(self, view, params); reload(self, view, params);
}); });
}); });
@ -1980,7 +1999,18 @@ export default function (view, params) {
let currentItem; let currentItem;
const self = this; const self = this;
const apiClient = params.serverId ? connectionManager.getApiClient(params.serverId) : ApiClient; const apiClient = params.serverId ? window.connectionManager.getApiClient(params.serverId) : ApiClient;
const btnResume = view.querySelector('.mainDetailButtons .btnResume');
const btnPlay = view.querySelector('.mainDetailButtons .btnPlay');
if (layoutManager.tv && !btnResume.classList.contains('hide')) {
btnResume.classList.add('fab');
btnResume.classList.add('detailFloatingButton');
} else if (layoutManager.tv && btnResume.classList.contains('hide')) {
btnPlay.classList.add('fab');
btnPlay.classList.add('detailFloatingButton');
}
view.querySelectorAll('.btnPlay'); view.querySelectorAll('.btnPlay');
bindAll(view, '.btnPlay', 'click', onPlayClick); bindAll(view, '.btnPlay', 'click', onPlayClick);
bindAll(view, '.btnResume', 'click', onPlayClick); bindAll(view, '.btnResume', 'click', onPlayClick);

9
src/controllers/list.js
View file

@ -5,7 +5,6 @@ import * as userSettings from 'userSettings';
import focusManager from 'focusManager'; import focusManager from 'focusManager';
import cardBuilder from 'cardBuilder'; import cardBuilder from 'cardBuilder';
import loading from 'loading'; import loading from 'loading';
import connectionManager from 'connectionManager';
import AlphaNumericShortcuts from 'alphaNumericShortcuts'; import AlphaNumericShortcuts from 'alphaNumericShortcuts';
import playbackManager from 'playbackManager'; import playbackManager from 'playbackManager';
import AlphaPicker from 'alphaPicker'; import AlphaPicker from 'alphaPicker';
@ -16,7 +15,7 @@ import 'emby-scroller';
function getInitialLiveTvQuery(instance, params) { function getInitialLiveTvQuery(instance, params) {
const query = { const query = {
UserId: connectionManager.getApiClient(params.serverId).getCurrentUserId(), UserId: window.connectionManager.getApiClient(params.serverId).getCurrentUserId(),
StartIndex: 0, StartIndex: 0,
Fields: 'ChannelInfo,PrimaryImageAspectRatio', Fields: 'ChannelInfo,PrimaryImageAspectRatio',
Limit: 300 Limit: 300
@ -164,7 +163,7 @@ import 'emby-scroller';
instance.setFilterStatus(hasFilters); instance.setFilterStatus(hasFilters);
if (instance.alphaPicker) { if (instance.alphaPicker) {
query.NameStartsWithOrGreater = instance.alphaPicker.value(); query.NameStartsWith = instance.alphaPicker.value();
} }
return query; return query;
@ -232,7 +231,7 @@ import 'emby-scroller';
} }
function getItems(instance, params, item, sortBy, startIndex, limit) { function getItems(instance, params, item, sortBy, startIndex, limit) {
const apiClient = connectionManager.getApiClient(params.serverId); const apiClient = window.connectionManager.getApiClient(params.serverId);
instance.queryRecursive = false; instance.queryRecursive = false;
if (params.type === 'Recordings') { if (params.type === 'Recordings') {
@ -333,7 +332,7 @@ import 'emby-scroller';
return Promise.resolve(null); return Promise.resolve(null);
} }
const apiClient = connectionManager.getApiClient(params.serverId); const apiClient = window.connectionManager.getApiClient(params.serverId);
const itemId = params.genreId || params.musicGenreId || params.studioId || params.personId || params.parentId; const itemId = params.genreId || params.musicGenreId || params.studioId || params.personId || params.parentId;
if (itemId) { if (itemId) {

2
src/controllers/livetvsettings.html
View file

@ -11,7 +11,7 @@
<form class="liveTvSettingsForm"> <form class="liveTvSettingsForm">
<div class="selectContainer"> <div class="selectContainer">
<select is="emby-select" id="selectGuideDays" label="${LabelNumberOfGuideDays}"> <select is="emby-select" id="selectGuideDays" label="${LabelNumberOfGuideDays}">
<option value="">${OptionAuto}</option> <option value="">${Auto}</option>
<option value="1">1</option> <option value="1">1</option>
<option value="2">2</option> <option value="2">2</option>
<option value="3">3</option> <option value="3">3</option>

2
src/controllers/movies/moviecollections.js
View file

@ -210,7 +210,7 @@ import 'emby-itemscontainer';
tabContent.querySelector('.btnSort').addEventListener('click', function (e) { tabContent.querySelector('.btnSort').addEventListener('click', function (e) {
libraryBrowser.showSortMenu({ libraryBrowser.showSortMenu({
items: [{ items: [{
name: globalize.translate('OptionNameSort'), name: globalize.translate('Name'),
id: 'SortName' id: 'SortName'
}, { }, {
name: globalize.translate('OptionImdbRating'), name: globalize.translate('OptionImdbRating'),

16
src/controllers/movies/movies.js
View file

@ -25,7 +25,7 @@ import 'emby-itemscontainer';
const updateFilterControls = () => { const updateFilterControls = () => {
if (this.alphaPicker) { if (this.alphaPicker) {
this.alphaPicker.value(query.NameStartsWithOrGreater); this.alphaPicker.value(query.NameStartsWith);
if (query.SortBy.indexOf('SortName') === 0) { if (query.SortBy.indexOf('SortName') === 0) {
this.alphaPicker.visible(true); this.alphaPicker.visible(true);
} else { } else {
@ -168,12 +168,12 @@ import 'emby-itemscontainer';
itemsContainer.fetchData = fetchData; itemsContainer.fetchData = fetchData;
itemsContainer.getItemsHtml = getItemsHtml; itemsContainer.getItemsHtml = getItemsHtml;
itemsContainer.afterRefresh = afterRefresh; itemsContainer.afterRefresh = afterRefresh;
let alphaPickerElement = tabContent.querySelector('.alphaPicker'); const alphaPickerElement = tabContent.querySelector('.alphaPicker');
if (alphaPickerElement) { if (alphaPickerElement) {
alphaPickerElement.addEventListener('alphavaluechanged', function (e) { alphaPickerElement.addEventListener('alphavaluechanged', function (e) {
let newValue = e.detail.value; const newValue = e.detail.value;
query.NameStartsWithOrGreater = newValue; query.NameStartsWith = newValue;
query.StartIndex = 0; query.StartIndex = 0;
itemsContainer.refreshItems(); itemsContainer.refreshItems();
}); });
@ -200,7 +200,7 @@ import 'emby-itemscontainer';
btnSort.addEventListener('click', function (e) { btnSort.addEventListener('click', function (e) {
libraryBrowser.showSortMenu({ libraryBrowser.showSortMenu({
items: [{ items: [{
name: globalize.translate('OptionNameSort'), name: globalize.translate('Name'),
id: 'SortName,ProductionYear' id: 'SortName,ProductionYear'
}, { }, {
name: globalize.translate('OptionImdbRating'), name: globalize.translate('OptionImdbRating'),
@ -224,7 +224,7 @@ import 'emby-itemscontainer';
name: globalize.translate('OptionReleaseDate'), name: globalize.translate('OptionReleaseDate'),
id: 'PremiereDate,SortName,ProductionYear' id: 'PremiereDate,SortName,ProductionYear'
}, { }, {
name: globalize.translate('OptionRuntime'), name: globalize.translate('Runtime'),
id: 'Runtime,SortName,ProductionYear' id: 'Runtime,SortName,ProductionYear'
}], }],
callback: function () { callback: function () {
@ -242,7 +242,7 @@ import 'emby-itemscontainer';
libraryBrowser.showLayoutMenu(e.target, this.getCurrentViewStyle, 'Banner,List,Poster,PosterCard,Thumb,ThumbCard'.split(',')); libraryBrowser.showLayoutMenu(e.target, this.getCurrentViewStyle, 'Banner,List,Poster,PosterCard,Thumb,ThumbCard'.split(','));
}); });
btnSelectView.addEventListener('layoutchange', function (e) { btnSelectView.addEventListener('layoutchange', function (e) {
let viewStyle = e.detail.viewStyle; const viewStyle = e.detail.viewStyle;
userSettings.set(savedViewKey, viewStyle); userSettings.set(savedViewKey, viewStyle);
query.StartIndex = 0; query.StartIndex = 0;
onViewStyleChange(); onViewStyleChange();
@ -279,7 +279,7 @@ import 'emby-itemscontainer';
this.showFilterMenu = function () { this.showFilterMenu = function () {
import('components/filterdialog/filterdialog').then(({default: filterDialogFactory}) => { import('components/filterdialog/filterdialog').then(({default: filterDialogFactory}) => {
let filterDialog = new filterDialogFactory({ const filterDialog = new filterDialogFactory({
query: query, query: query,
mode: 'movies', mode: 'movies',
serverId: ApiClient.serverId() serverId: ApiClient.serverId()

14
src/controllers/movies/moviesrecommended.js
View file

@ -58,7 +58,7 @@ import 'emby-button';
} }
function loadResume(page, userId, parentId) { function loadResume(page, userId, parentId) {
let screenWidth = dom.getWindowSize().innerWidth; const screenWidth = dom.getWindowSize().innerWidth;
const options = { const options = {
SortBy: 'DatePlayed', SortBy: 'DatePlayed',
SortOrder: 'Descending', SortOrder: 'Descending',
@ -154,8 +154,8 @@ import 'emby-button';
} }
function loadSuggestions(page, userId, parentId) { function loadSuggestions(page, userId, parentId) {
let screenWidth = dom.getWindowSize().innerWidth; const screenWidth = dom.getWindowSize().innerWidth;
let url = ApiClient.getUrl('Movies/Recommendations', { const url = ApiClient.getUrl('Movies/Recommendations', {
userId: userId, userId: userId,
categoryLimit: 6, categoryLimit: 6,
ItemLimit: screenWidth >= 1920 ? 8 : screenWidth >= 1600 ? 8 : screenWidth >= 1200 ? 6 : 5, ItemLimit: screenWidth >= 1920 ? 8 : screenWidth >= 1600 ? 8 : screenWidth >= 1200 ? 6 : 5,
@ -172,7 +172,7 @@ import 'emby-button';
const html = recommendations.map(getRecommendationHtml).join(''); const html = recommendations.map(getRecommendationHtml).join('');
page.querySelector('.noItemsMessage').classList.add('hide'); page.querySelector('.noItemsMessage').classList.add('hide');
let recs = page.querySelector('.recommendations'); const recs = page.querySelector('.recommendations');
recs.innerHTML = html; recs.innerHTML = html;
imageLoader.lazyChildren(recs); imageLoader.lazyChildren(recs);
@ -381,16 +381,16 @@ import 'emby-button';
const suggestionsTabIndex = 1; const suggestionsTabIndex = 1;
this.initTab = function () { this.initTab = function () {
let tabContent = view.querySelector(".pageTabContent[data-index='" + suggestionsTabIndex + "']"); const tabContent = view.querySelector(".pageTabContent[data-index='" + suggestionsTabIndex + "']");
initSuggestedTab(view, tabContent); initSuggestedTab(view, tabContent);
}; };
this.renderTab = function () { this.renderTab = function () {
let tabContent = view.querySelector(".pageTabContent[data-index='" + suggestionsTabIndex + "']"); const tabContent = view.querySelector(".pageTabContent[data-index='" + suggestionsTabIndex + "']");
loadSuggestionsTab(view, params, tabContent); loadSuggestionsTab(view, params, tabContent);
}; };
let tabControllers = []; const tabControllers = [];
let renderedTabs = []; let renderedTabs = [];
view.addEventListener('viewshow', function (e) { view.addEventListener('viewshow', function (e) {
initTabs(); initTabs();

6
src/controllers/movies/movietrailers.js
View file

@ -185,7 +185,7 @@ import 'emby-itemscontainer';
const updateFilterControls = (tabContent) => { const updateFilterControls = (tabContent) => {
const query = getQuery(tabContent); const query = getQuery(tabContent);
this.alphaPicker.value(query.NameStartsWithOrGreater); this.alphaPicker.value(query.NameStartsWith);
}; };
const data = {}; const data = {};
@ -216,7 +216,7 @@ import 'emby-itemscontainer';
alphaPickerElement.addEventListener('alphavaluechanged', function (e) { alphaPickerElement.addEventListener('alphavaluechanged', function (e) {
const newValue = e.detail.value; const newValue = e.detail.value;
const query = getQuery(tabContent); const query = getQuery(tabContent);
query.NameStartsWithOrGreater = newValue; query.NameStartsWith = newValue;
query.StartIndex = 0; query.StartIndex = 0;
reloadItems(); reloadItems();
}); });
@ -235,7 +235,7 @@ import 'emby-itemscontainer';
tabContent.querySelector('.btnSort').addEventListener('click', function (e) { tabContent.querySelector('.btnSort').addEventListener('click', function (e) {
libraryBrowser.showSortMenu({ libraryBrowser.showSortMenu({
items: [{ items: [{
name: globalize.translate('OptionNameSort'), name: globalize.translate('Name'),
id: 'SortName' id: 'SortName'
}, { }, {
name: globalize.translate('OptionImdbRating'), name: globalize.translate('OptionImdbRating'),

8
src/controllers/music/musicalbums.js
View file

@ -189,7 +189,7 @@ import 'emby-itemscontainer';
const query = getQuery(); const query = getQuery();
if (this.alphaPicker) { if (this.alphaPicker) {
this.alphaPicker.value(query.NameStartsWithOrGreater); this.alphaPicker.value(query.NameStartsWith);
if (query.SortBy.indexOf('SortName') === 0) { if (query.SortBy.indexOf('SortName') === 0) {
this.alphaPicker.visible(true); this.alphaPicker.visible(true);
@ -231,7 +231,7 @@ import 'emby-itemscontainer';
alphaPickerElement.addEventListener('alphavaluechanged', function (e) { alphaPickerElement.addEventListener('alphavaluechanged', function (e) {
const newValue = e.detail.value; const newValue = e.detail.value;
const query = getQuery(); const query = getQuery();
query.NameStartsWithOrGreater = newValue; query.NameStartsWith = newValue;
query.StartIndex = 0; query.StartIndex = 0;
reloadItems(tabContent); reloadItems(tabContent);
}); });
@ -252,10 +252,10 @@ import 'emby-itemscontainer';
tabContent.querySelector('.btnSort').addEventListener('click', (e) => { tabContent.querySelector('.btnSort').addEventListener('click', (e) => {
libraryBrowser.showSortMenu({ libraryBrowser.showSortMenu({
items: [{ items: [{
name: globalize.translate('OptionNameSort'), name: globalize.translate('Name'),
id: 'SortName' id: 'SortName'
}, { }, {
name: globalize.translate('OptionAlbumArtist'), name: globalize.translate('AlbumArtist'),
id: 'AlbumArtist,SortName' id: 'AlbumArtist,SortName'
}, { }, {
name: globalize.translate('OptionCommunityRating'), name: globalize.translate('OptionCommunityRating'),

4
src/controllers/music/musicartists.js
View file

@ -169,7 +169,7 @@ import 'emby-itemscontainer';
const updateFilterControls = (tabContent) => { const updateFilterControls = (tabContent) => {
const query = getQuery(tabContent); const query = getQuery(tabContent);
this.alphaPicker.value(query.NameStartsWithOrGreater); this.alphaPicker.value(query.NameStartsWith);
}; };
const data = {}; const data = {};
@ -201,7 +201,7 @@ import 'emby-itemscontainer';
alphaPickerElement.addEventListener('alphavaluechanged', function (e) { alphaPickerElement.addEventListener('alphavaluechanged', function (e) {
const newValue = e.detail.value; const newValue = e.detail.value;
const query = getQuery(tabContent); const query = getQuery(tabContent);
query.NameStartsWithOrGreater = newValue; query.NameStartsWith = newValue;
query.StartIndex = 0; query.StartIndex = 0;
reloadItems(tabContent); reloadItems(tabContent);
}); });

Some files were not shown because too many files have changed in this diff Show more