diff --git a/.dependabot/config.yml b/.dependabot/config.yml index 4ee827471a..02dfd18aac 100644 --- a/.dependabot/config.yml +++ b/.dependabot/config.yml @@ -2,4 +2,4 @@ version: 1 update_configs: - package_manager: "javascript" directory: "/" - update_schedule: "live" + update_schedule: "weekly" diff --git a/.eslintrc.js b/.eslintrc.js index 7de812ea6e..e5ee2dfe86 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -44,12 +44,12 @@ module.exports = { 'no-restricted-globals': ['error'].concat(restrictedGlobals), 'no-trailing-spaces': ['error'], '@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'], 'padded-blocks': ['error', 'never'], - //'prefer-const': ['error', {'destructuring': 'all'}], + 'prefer-const': ['error', {'destructuring': 'all'}], 'quotes': ['error', 'single', { 'avoidEscape': true, 'allowTemplateLiterals': false }], '@babel/semi': ['error'], + 'no-var': ['error'], 'space-before-blocks': ['error'], 'space-infix-ops': 'error', 'yoda': 'error' @@ -84,7 +84,6 @@ module.exports = { 'ApiClient': 'writable', 'AppInfo': 'writable', 'chrome': 'writable', - 'ConnectionManager': 'writable', 'DlnaProfilePage': 'writable', 'Dashboard': 'writable', 'DashboardPage': 'writable', diff --git a/.gitignore b/.gitignore index 36b843f022..98aa2d974b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,9 @@ dist web node_modules +# config +config.json + # ide .idea .vscode diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 46c40b6c99..1bdf1cd903 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -34,10 +34,13 @@ - [Ryan Hartzell](https://github.com/ryan-hartzell) - [Thibault Nocchi](https://github.com/ThibaultNocchi) - [MrTimscampi](https://github.com/MrTimscampi) + - [ConfusedPolarBear](https://github.com/ConfusedPolarBear) - [Sarab Singh](https://github.com/sarab97) - [GuilhermeHideki](https://github.com/GuilhermeHideki) - [Andrei Oanca](https://github.com/OancaAndrei) - [Cromefire_](https://github.com/cromefire) + - [Orry Verducci](https://github.com/orryverducci) + - [Camc314](https://github.com/camc314) # Emby Contributors diff --git a/fedora/jellyfin-web.spec b/fedora/jellyfin-web.spec index 1d85e5ae6b..c35a1caab2 100644 --- a/fedora/jellyfin-web.spec +++ b/fedora/jellyfin-web.spec @@ -11,11 +11,12 @@ Source0: jellyfin-web-%{version}.tar.gz %if 0%{?centos} BuildRequires: yarn -# sadly the yarn RPM at https://dl.yarnpkg.com/rpm/ uses git but doesn't Requires: it -BuildRequires: git %else BuildRequires: nodejs-yarn %endif +# sadly the yarn RPM at https://dl.yarnpkg.com/rpm/ uses git but doesn't Requires: it +# ditto for Fedora's yarn RPM +BuildRequires: git BuildArch: noarch # Disable Automatic Dependency Processing diff --git a/package.json b/package.json index b40fe54453..97055cd78a 100644 --- a/package.json +++ b/package.json @@ -5,28 +5,28 @@ "repository": "https://github.com/jellyfin/jellyfin-web", "license": "GPL-2.0-or-later", "devDependencies": { - "@babel/core": "^7.11.4", - "@babel/eslint-parser": "^7.11.4", - "@babel/eslint-plugin": "^7.11.3", + "@babel/core": "^7.11.6", + "@babel/eslint-parser": "^7.12.1", + "@babel/eslint-plugin": "^7.12.1", "@babel/plugin-proposal-class-properties": "^7.10.1", "@babel/plugin-proposal-private-methods": "^7.10.1", "@babel/plugin-transform-modules-amd": "^7.10.5", - "@babel/polyfill": "^7.8.7", - "@babel/preset-env": "^7.11.0", + "@babel/polyfill": "^7.12.1", + "@babel/preset-env": "^7.11.5", "autoprefixer": "^9.8.6", "babel-loader": "^8.0.6", "browser-sync": "^2.26.12", "confusing-browser-globals": "^1.0.9", "copy-webpack-plugin": "^5.1.1", - "css-loader": "^4.2.2", + "css-loader": "^5.0.0", "cssnano": "^4.1.10", - "del": "^5.1.0", - "eslint": "^7.7.0", + "del": "^6.0.0", + "eslint": "^7.11.0", "eslint-plugin-compat": "^3.5.1", "eslint-plugin-eslint-comments": "^3.2.0", - "eslint-plugin-import": "^2.21.2", + "eslint-plugin-import": "^2.22.1", "eslint-plugin-promise": "^4.2.1", - "file-loader": "^6.0.0", + "file-loader": "^6.1.1", "gulp": "^4.0.2", "gulp-babel": "^8.0.0", "gulp-cli": "^2.3.0", @@ -40,19 +40,19 @@ "gulp-sass": "^4.0.2", "gulp-sourcemaps": "^2.6.5", "gulp-terser": "^1.4.0", - "html-webpack-plugin": "^4.4.1", + "html-webpack-plugin": "^4.5.0", "lazypipe": "^1.0.2", "node-sass": "^4.13.1", "postcss-loader": "^3.0.0", "postcss-preset-env": "^6.7.0", - "style-loader": "^1.1.3", - "stylelint": "^13.6.1", + "style-loader": "^2.0.0", + "stylelint": "^13.7.2", "stylelint-config-rational-order": "^0.1.2", "stylelint-no-browser-hacks": "^1.2.1", "stylelint-order": "^4.1.0", - "webpack": "^4.44.1", + "webpack": "^5.0.0", "webpack-merge": "^4.2.2", - "webpack-stream": "^6.0.0", + "webpack-stream": "^6.1.0", "worker-plugin": "^5.0.0" }, "dependencies": { @@ -60,31 +60,31 @@ "blurhash": "^1.1.3", "classlist.js": "https://github.com/eligrey/classList.js/archive/1.2.20180112.tar.gz", "core-js": "^3.6.5", - "date-fns": "^2.16.0", + "date-fns": "^2.16.1", "epubjs": "^0.3.85", "pdfjs-dist": "^2.4.456", "fast-text-encoding": "^1.0.3", "flv.js": "^1.5.0", "headroom.js": "^0.11.0", - "hls.js": "^0.14.10", + "hls.js": "^0.14.15", "howler": "^2.2.0", "intersection-observer": "^0.11.0", - "jellyfin-apiclient": "^1.4.1", + "jellyfin-apiclient": "^1.4.2", "jellyfin-noto": "https://github.com/jellyfin/jellyfin-noto", "jquery": "^3.5.1", "jstree": "^3.3.10", "libarchive.js": "^1.3.0", "libass-wasm": "https://github.com/jellyfin/JavascriptSubtitlesOctopus#4.0.0-jf-smarttv", - "material-design-icons-iconfont": "^6.0.1", + "material-design-icons-iconfont": "^6.1.0", "native-promise-only": "^0.8.0-a", "page": "^1.11.6", - "query-string": "^6.13.1", + "query-string": "^6.13.6", "resize-observer-polyfill": "^1.5.1", "screenfull": "^5.0.2", - "sortablejs": "^1.10.2", - "swiper": "^6.1.1", + "sortablejs": "^1.12.0", + "swiper": "^6.3.3", "webcomponents.js": "^0.7.24", - "whatwg-fetch": "^3.4.0" + "whatwg-fetch": "^3.4.1" }, "babel": { "presets": [ @@ -167,6 +167,8 @@ "src/components/playmenu.js", "src/components/pluginManager.js", "src/components/prompt/prompt.js", + "src/components/qualityOptions.js", + "src/components/quickConnectSettings/quickConnectSettings.js", "src/components/recordingcreator/recordingbutton.js", "src/components/recordingcreator/recordingcreator.js", "src/components/recordingcreator/seriesrecordingeditor.js", @@ -174,7 +176,6 @@ "src/components/refreshdialog/refreshdialog.js", "src/components/recordingcreator/recordingeditor.js", "src/components/recordingcreator/recordingfields.js", - "src/components/qualityOptions.js", "src/components/remotecontrol/remotecontrol.js", "src/components/sanatizefilename.js", "src/components/scrollManager.js", @@ -214,7 +215,7 @@ "src/components/castSenderApi.js", "src/controllers/session/addServer/index.js", "src/controllers/session/forgotPassword/index.js", - "src/controllers/session/redeemPassword/index.js", + "src/controllers/session/resetPassword/index.js", "src/controllers/session/login/index.js", "src/controllers/session/selectServer/index.js", "src/controllers/dashboard/apikeys.js", @@ -245,6 +246,7 @@ "src/controllers/dashboard/plugins/installed/index.js", "src/controllers/dashboard/plugins/available/index.js", "src/controllers/dashboard/plugins/repositories/index.js", + "src/controllers/dashboard/quickConnect.js", "src/controllers/dashboard/scheduledtasks/scheduledtask.js", "src/controllers/dashboard/scheduledtasks/scheduledtasks.js", "src/controllers/dashboard/serveractivity.js", @@ -293,6 +295,7 @@ "src/controllers/user/menu/index.js", "src/controllers/user/playback/index.js", "src/controllers/user/profile/index.js", + "src/controllers/user/quickConnect/index.js", "src/controllers/user/subtitles/index.js", "src/controllers/wizard/finish/index.js", "src/controllers/wizard/remote/index.js", @@ -331,6 +334,7 @@ "src/plugins/youtubePlayer/plugin.js", "src/scripts/alphanumericshortcuts.js", "src/scripts/autoBackdrops.js", + "src/scripts/autocast.js", "src/scripts/browser.js", "src/scripts/clientUtils.js", "src/scripts/datetime.js", diff --git a/scripts/unused.py b/scripts/unused.py index 12af27320a..abbc399cf6 100644 --- a/scripts/unused.py +++ b/scripts/unused.py @@ -16,7 +16,7 @@ langlst.append('en-us.json') dep = [] 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) output = p.stdout.readlines() if output: diff --git a/src/assets/css/videoosd.css b/src/assets/css/videoosd.css index 808915e58b..b2446d5d48 100644 --- a/src/assets/css/videoosd.css +++ b/src/assets/css/videoosd.css @@ -6,29 +6,42 @@ -ms-user-select: none; } -.osdPoster img, .videoOsdBottom { bottom: 0; left: 0; right: 0; + position: fixed; + background: linear-gradient(0deg, rgba(16, 16, 16, 0.75) 0%, rgba(16, 16, 16, 0) 100%); + padding-top: 7.5em; + padding-bottom: 1.75em; + display: flex; + flex-direction: row; + justify-content: center; + will-change: opacity; + transition: opacity 0.3s ease-out; + color: #fff; + user-select: none; + -webkit-touch-callout: none; } -.osdHeader { - -webkit-transition: opacity 0.3s ease-out; - -o-transition: opacity 0.3s ease-out; +.skinHeader-withBackground.osdHeader { transition: opacity 0.3s ease-out; position: relative; z-index: 1; - background: rgba(0, 0, 0, 0.7) !important; - -webkit-backdrop-filter: none !important; - backdrop-filter: none !important; - color: #eee !important; + background: linear-gradient(180deg, rgba(16, 16, 16, 0.75) 0%, rgba(16, 16, 16, 0) 100%); + backdrop-filter: none; + color: #eee; + height: 7.5em; } .osdHeader-hidden { opacity: 0; } +.osdHeader .headerTop { + max-height: 3.5em; +} + .osdHeader .headerButton:not(.headerBackButton):not(.headerCastButton):not(.headerSyncButton) { display: none; } @@ -86,34 +99,17 @@ opacity: 0.6; } -.videoOsdBottom { - position: fixed; - background-color: rgba(0, 0, 0, 0.7); - padding: 1%; - display: -webkit-box; - display: -webkit-flex; - display: flex; - -webkit-box-orient: horizontal; - -webkit-box-direction: normal; - -webkit-flex-direction: row; - flex-direction: row; - will-change: opacity; - -webkit-transition: opacity 0.3s ease-out; - -o-transition: opacity 0.3s ease-out; - transition: opacity 0.3s ease-out; - color: #fff; - user-select: none; - -webkit-touch-callout: none; -} - .videoOsdBottom-hidden { opacity: 0; } .osdControls { - -webkit-box-flex: 1; - -webkit-flex-grow: 1; flex-grow: 1; + padding: 0 0.8em; +} + +.layout-desktop .osdControls { + max-width: calc(100vh * 1.77 - 2vh); } .videoOsdBottom .buttons { @@ -145,7 +141,7 @@ } .volumeButtons { - margin: 0 0.5em 0 auto; + margin: 0 1em 0 0.29em; display: flex; -webkit-align-items: center; align-items: center; @@ -153,33 +149,13 @@ .osdTimeText { margin-left: 1em; + margin-right: auto; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none; } -.osdPoster { - width: 10%; - position: relative; - margin-right: 0.5em; -} - -.osdPoster img { - position: absolute; - height: auto; - width: 100%; - -webkit-box-shadow: 0 0 1.9vh #000; - box-shadow: 0 0 1.9vh #000; - border: 0.08em solid #222; - user-drag: none; - user-select: none; - -moz-user-select: none; - -webkit-user-drag: none; - -webkit-user-select: none; - -ms-user-select: none; -} - .osdTitle, .osdTitleSmall { margin: 0 1em 0 0; diff --git a/src/assets/img/avatar.png b/src/assets/img/avatar.png index 0453f24897..4023d1c5c7 100644 Binary files a/src/assets/img/avatar.png and b/src/assets/img/avatar.png differ diff --git a/src/assets/img/icon-transparent.png b/src/assets/img/icon-transparent.png index 0d71b56067..76ef75baf9 100644 Binary files a/src/assets/img/icon-transparent.png and b/src/assets/img/icon-transparent.png differ diff --git a/src/assets/splash/ipad_splash.png b/src/assets/splash/ipad_splash.png index 0faca927b7..45ed7d398d 100755 Binary files a/src/assets/splash/ipad_splash.png and b/src/assets/splash/ipad_splash.png differ diff --git a/src/assets/splash/ipad_splash_l.png b/src/assets/splash/ipad_splash_l.png index 3ecf2d5adc..baf016e865 100644 Binary files a/src/assets/splash/ipad_splash_l.png and b/src/assets/splash/ipad_splash_l.png differ diff --git a/src/assets/splash/ipadpro1_splash.png b/src/assets/splash/ipadpro1_splash.png index 9e7fdb7f6c..c5afa50986 100755 Binary files a/src/assets/splash/ipadpro1_splash.png and b/src/assets/splash/ipadpro1_splash.png differ diff --git a/src/assets/splash/ipadpro1_splash_l.png b/src/assets/splash/ipadpro1_splash_l.png index cffad337c8..f5ef6f3b04 100644 Binary files a/src/assets/splash/ipadpro1_splash_l.png and b/src/assets/splash/ipadpro1_splash_l.png differ diff --git a/src/assets/splash/ipadpro2_splash.png b/src/assets/splash/ipadpro2_splash.png index a2e9624c65..500cad2b3d 100755 Binary files a/src/assets/splash/ipadpro2_splash.png and b/src/assets/splash/ipadpro2_splash.png differ diff --git a/src/assets/splash/ipadpro2_splash_l.png b/src/assets/splash/ipadpro2_splash_l.png index 588902a2b1..ec17e3e81b 100644 Binary files a/src/assets/splash/ipadpro2_splash_l.png and b/src/assets/splash/ipadpro2_splash_l.png differ diff --git a/src/assets/splash/ipadpro3_splash.png b/src/assets/splash/ipadpro3_splash.png index 89a04afe07..3a1c82e983 100755 Binary files a/src/assets/splash/ipadpro3_splash.png and b/src/assets/splash/ipadpro3_splash.png differ diff --git a/src/assets/splash/ipadpro3_splash_l.png b/src/assets/splash/ipadpro3_splash_l.png index a0b6c56904..df275b3448 100644 Binary files a/src/assets/splash/ipadpro3_splash_l.png and b/src/assets/splash/ipadpro3_splash_l.png differ diff --git a/src/assets/splash/iphone5_splash.png b/src/assets/splash/iphone5_splash.png index 3e073a9e1b..bdbc28ab0d 100755 Binary files a/src/assets/splash/iphone5_splash.png and b/src/assets/splash/iphone5_splash.png differ diff --git a/src/assets/splash/iphone5_splash_l.png b/src/assets/splash/iphone5_splash_l.png index 28fa8838e1..789f50f628 100644 Binary files a/src/assets/splash/iphone5_splash_l.png and b/src/assets/splash/iphone5_splash_l.png differ diff --git a/src/assets/splash/iphone6_splash.png b/src/assets/splash/iphone6_splash.png index afe42fa26a..879d5b716f 100755 Binary files a/src/assets/splash/iphone6_splash.png and b/src/assets/splash/iphone6_splash.png differ diff --git a/src/assets/splash/iphone6_splash_l.png b/src/assets/splash/iphone6_splash_l.png index c7de58510f..396224fcb2 100644 Binary files a/src/assets/splash/iphone6_splash_l.png and b/src/assets/splash/iphone6_splash_l.png differ diff --git a/src/assets/splash/iphoneplus_splash.png b/src/assets/splash/iphoneplus_splash.png index 2cc62163ac..a9e7de01ca 100755 Binary files a/src/assets/splash/iphoneplus_splash.png and b/src/assets/splash/iphoneplus_splash.png differ diff --git a/src/assets/splash/iphoneplus_splash_l.png b/src/assets/splash/iphoneplus_splash_l.png index c989f2237e..f14f0af1ff 100644 Binary files a/src/assets/splash/iphoneplus_splash_l.png and b/src/assets/splash/iphoneplus_splash_l.png differ diff --git a/src/assets/splash/iphonex_splash.png b/src/assets/splash/iphonex_splash.png index 2d9698c287..435bbe07a9 100755 Binary files a/src/assets/splash/iphonex_splash.png and b/src/assets/splash/iphonex_splash.png differ diff --git a/src/assets/splash/iphonex_splash_l.png b/src/assets/splash/iphonex_splash_l.png index 9eb9e037ce..cbadd0a239 100644 Binary files a/src/assets/splash/iphonex_splash_l.png and b/src/assets/splash/iphonex_splash_l.png differ diff --git a/src/assets/splash/iphonexr_splash.png b/src/assets/splash/iphonexr_splash.png index 0f911eb2e8..b6072df329 100755 Binary files a/src/assets/splash/iphonexr_splash.png and b/src/assets/splash/iphonexr_splash.png differ diff --git a/src/assets/splash/iphonexr_splash_l.png b/src/assets/splash/iphonexr_splash_l.png index 1522f372a9..f78e825192 100644 Binary files a/src/assets/splash/iphonexr_splash_l.png and b/src/assets/splash/iphonexr_splash_l.png differ diff --git a/src/assets/splash/iphonexsmax_splash.png b/src/assets/splash/iphonexsmax_splash.png index 3e9aaf56af..b4e9255b31 100755 Binary files a/src/assets/splash/iphonexsmax_splash.png and b/src/assets/splash/iphonexsmax_splash.png differ diff --git a/src/assets/splash/iphonexsmax_splash_l.png b/src/assets/splash/iphonexsmax_splash_l.png index e2961f512e..e94692de0e 100644 Binary files a/src/assets/splash/iphonexsmax_splash_l.png and b/src/assets/splash/iphonexsmax_splash_l.png differ diff --git a/src/bundle.js b/src/bundle.js index c498016c44..7ea1cee45f 100644 --- a/src/bundle.js +++ b/src/bundle.js @@ -182,7 +182,7 @@ _define('appStorage', function () { }); // libarchive.js -var libarchive = require('libarchive.js'); +const libarchive = require('libarchive.js'); _define('libarchive', function () { return libarchive; }); diff --git a/src/components/activitylog.js b/src/components/activitylog.js index ab489a3f31..3878d03355 100644 --- a/src/components/activitylog.js +++ b/src/components/activitylog.js @@ -4,7 +4,6 @@ import dom from 'dom'; import * as datefns from 'date-fns'; import dfnshelper from 'dfnshelper'; import serverNotifications from 'serverNotifications'; -import connectionManager from 'connectionManager'; import 'emby-button'; import 'listViewStyle'; @@ -141,7 +140,7 @@ class ActivityLog { const element = options.element; element.classList.add('activityLogListWidget'); element.addEventListener('click', onListClick.bind(this)); - const apiClient = connectionManager.getApiClient(options.serverId); + const apiClient = window.connectionManager.getApiClient(options.serverId); reloadData(this, element, apiClient); const onUpdate = onActivityLogUpdate.bind(this); this.updateFn = onUpdate; @@ -153,7 +152,7 @@ class ActivityLog { if (options) { 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; diff --git a/src/components/appFooter/appFooter.js b/src/components/appFooter/appFooter.js index c60aa1a27c..260aea8280 100644 --- a/src/components/appFooter/appFooter.js +++ b/src/components/appFooter/appFooter.js @@ -27,7 +27,7 @@ class appFooter { }; } destroy() { - var self = this; + const self = this; self.element = null; } diff --git a/src/components/appRouter.js b/src/components/appRouter.js index f986e71357..a6bb6da618 100644 --- a/src/components/appRouter.js +++ b/src/components/appRouter.js @@ -2,7 +2,6 @@ import appHost from 'apphost'; import appSettings from 'appSettings'; import backdrop from 'backdrop'; import browser from 'browser'; -import connectionManager from 'connectionManager'; import events from 'events'; import globalize from 'globalize'; import itemHelper from 'itemHelper'; @@ -95,7 +94,7 @@ class AppRouter { beginConnectionWizard() { backdrop.clearBackdrop(); loading.show(); - connectionManager.connect({ + window.connectionManager.connect({ enableAutoLogin: appSettings.enableAutoLogin() }).then((result) => { this.handleConnectionResult(result); @@ -154,7 +153,7 @@ class AppRouter { events.on(appHost, 'beforeexit', this.onBeforeExit); events.on(appHost, 'resume', this.onAppResume); - connectionManager.connect({ + window.connectionManager.connect({ enableAutoLogin: appSettings.enableAutoLogin() }).then((result) => { this.firstConnectionResult = result; @@ -210,7 +209,7 @@ class AppRouter { showItem(item, serverId, options) { // TODO: Refactor this so it only gets items, not strings. 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) => { this.showItem(itemObject, options); }); @@ -309,7 +308,9 @@ class AppRouter { 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 if (url.indexOf('/') !== 0) { url = '/' + url; @@ -492,15 +493,15 @@ class AppRouter { } initApiClients() { - connectionManager.getApiClients().forEach((apiClient) => { + window.connectionManager.getApiClients().forEach((apiClient) => { this.initApiClient(apiClient, this); }); - events.on(connectionManager, 'apiclientcreated', this.onApiClientCreated); + events.on(window.connectionManager, 'apiclientcreated', this.onApiClientCreated); } onAppResume() { - const apiClient = connectionManager.currentApiClient(); + const apiClient = window.connectionManager.currentApiClient(); if (apiClient) { apiClient.ensureWebSocket(); @@ -518,7 +519,7 @@ class AppRouter { } } - const apiClient = connectionManager.currentApiClient(); + const apiClient = window.connectionManager.currentApiClient(); const pathname = ctx.pathname.toLowerCase(); console.debug('appRouter - processing path request ' + pathname); diff --git a/src/components/apphost.js b/src/components/apphost.js index b44c8e621f..df2f7c2d2c 100644 --- a/src/components/apphost.js +++ b/src/components/apphost.js @@ -78,7 +78,7 @@ function getDeviceId() { } function getDeviceName() { - var deviceName; + let deviceName; if (browser.tizen) { deviceName = 'Samsung Smart TV'; } else if (browser.web0s) { diff --git a/src/components/backdrop/backdrop.js b/src/components/backdrop/backdrop.js index d3c9e58b59..83888b81b9 100644 --- a/src/components/backdrop/backdrop.js +++ b/src/components/backdrop/backdrop.js @@ -1,5 +1,4 @@ import browser from 'browser'; -import connectionManager from 'connectionManager'; import playbackManager from 'playbackManager'; import dom from 'dom'; import * as userSettings from 'userSettings'; @@ -177,7 +176,7 @@ import 'css!./backdrop'; function getItemImageUrls(item, imageOptions) { imageOptions = imageOptions || {}; - const apiClient = connectionManager.getApiClient(item.ServerId); + const apiClient = window.connectionManager.getApiClient(item.ServerId); if (item.BackdropImageTags && item.BackdropImageTags.length > 0) { return item.BackdropImageTags.map((imgTag, index) => { return apiClient.getScaledImageUrl(item.BackdropItemId || item.Id, Object.assign(imageOptions, { diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js index 63eaf2bdfe..63b2e26adb 100644 --- a/src/components/cardbuilder/cardBuilder.js +++ b/src/components/cardbuilder/cardBuilder.js @@ -7,7 +7,6 @@ import datetime from 'datetime'; import imageLoader from 'imageLoader'; -import connectionManager from 'connectionManager'; import itemHelper from 'itemHelper'; import focusManager from 'focusManager'; import indicators from 'indicators'; @@ -371,7 +370,7 @@ import 'programStyles'; if (serverId !== lastServerId) { lastServerId = serverId; - apiClient = connectionManager.getApiClient(lastServerId); + apiClient = window.connectionManager.getApiClient(lastServerId); } if (options.indexBy) { diff --git a/src/components/cardbuilder/chaptercardbuilder.js b/src/components/cardbuilder/chaptercardbuilder.js index 642a87db2a..35ae2b0cdd 100644 --- a/src/components/cardbuilder/chaptercardbuilder.js +++ b/src/components/cardbuilder/chaptercardbuilder.js @@ -7,7 +7,6 @@ import datetime from 'datetime'; import imageLoader from 'imageLoader'; -import connectionManager from 'connectionManager'; import layoutManager from 'layoutManager'; import browser from 'browser'; @@ -48,7 +47,7 @@ import browser from 'browser'; let html = ''; 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++) { if (options.rows && itemsInRow === 0) { diff --git a/src/components/channelMapper/channelMapper.js b/src/components/channelMapper/channelMapper.js index 2cf65e647c..294f9e223a 100644 --- a/src/components/channelMapper/channelMapper.js +++ b/src/components/channelMapper/channelMapper.js @@ -1,7 +1,6 @@ import dom from 'dom'; import dialogHelper from 'dialogHelper'; import loading from 'loading'; -import connectionManager from 'connectionManager'; import globalize from 'globalize'; import actionsheet from 'actionsheet'; import 'emby-input'; @@ -16,7 +15,7 @@ export default class channelMapper { function mapChannel(button, channelId, providerChannelId) { loading.show(); const providerId = options.providerId; - connectionManager.getApiClient(options.serverId).ajax({ + window.connectionManager.getApiClient(options.serverId).ajax({ type: 'POST', url: ApiClient.getUrl('LiveTv/ChannelMappings'), data: JSON.stringify({ @@ -59,7 +58,7 @@ export default class channelMapper { } function getChannelMappingOptions(serverId, providerId) { - const apiClient = connectionManager.getApiClient(serverId); + const apiClient = window.connectionManager.getApiClient(serverId); return apiClient.getJSON(apiClient.getUrl('LiveTv/ChannelMappingOptions', { providerId: providerId })); diff --git a/src/components/collectionEditor/collectionEditor.js b/src/components/collectionEditor/collectionEditor.js index dd8b3d6837..2d0d025929 100644 --- a/src/components/collectionEditor/collectionEditor.js +++ b/src/components/collectionEditor/collectionEditor.js @@ -2,7 +2,6 @@ import dom from 'dom'; import dialogHelper from 'dialogHelper'; import loading from 'loading'; import layoutManager from 'layoutManager'; -import connectionManager from 'connectionManager'; import appRouter from 'appRouter'; import globalize from 'globalize'; import 'emby-checkbox'; @@ -25,7 +24,7 @@ import 'flexStyles'; const collectionId = panel.querySelector('#selectCollectionToAddTo').value; - const apiClient = connectionManager.getApiClient(currentServerId); + const apiClient = window.connectionManager.getApiClient(currentServerId); if (collectionId) { addToCollection(apiClient, panel, collectionId); @@ -106,7 +105,7 @@ import 'flexStyles'; EnableTotalRecordCount: false }; - const apiClient = connectionManager.getApiClient(currentServerId); + const apiClient = window.connectionManager.getApiClient(currentServerId); apiClient.getItems(apiClient.getCurrentUserId(), options).then(result => { let html = ''; diff --git a/src/components/dialogHelper/dialogHelper.js b/src/components/dialogHelper/dialogHelper.js index e1a267fed2..eb46d98b12 100644 --- a/src/components/dialogHelper/dialogHelper.js +++ b/src/components/dialogHelper/dialogHelper.js @@ -375,7 +375,7 @@ import 'scrollStyles'; dlg.setAttribute('data-lockscroll', 'true'); } - if (options.enableHistory !== false) { + if (options.enableHistory === true) { dlg.setAttribute('data-history', 'true'); } diff --git a/src/components/displaySettings/displaySettings.js b/src/components/displaySettings/displaySettings.js index ae7647f98b..efaab16b3f 100644 --- a/src/components/displaySettings/displaySettings.js +++ b/src/components/displaySettings/displaySettings.js @@ -6,7 +6,6 @@ import focusManager from 'focusManager'; import datetime from 'datetime'; import globalize from 'globalize'; import loading from 'loading'; -import connectionManager from 'connectionManager'; import skinManager from 'skinManager'; import events from 'events'; import 'emby-select'; @@ -24,7 +23,7 @@ import 'emby-button'; }).join(''); // get default theme - var defaultTheme = themes.find(theme => { + const defaultTheme = themes.find(theme => { return theme.default; }); @@ -182,7 +181,7 @@ import 'emby-button'; function onSubmit(e) { const self = this; - const apiClient = connectionManager.getApiClient(self.options.serverId); + const apiClient = window.connectionManager.getApiClient(self.options.serverId); const userId = self.options.userId; const userSettings = self.options.userSettings; @@ -221,7 +220,7 @@ import 'emby-button'; loading.show(); 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; return apiClient.getUser(userId).then(user => { diff --git a/src/components/favoriteitems.js b/src/components/favoriteitems.js index 7a94b07454..86cd050216 100644 --- a/src/components/favoriteitems.js +++ b/src/components/favoriteitems.js @@ -28,21 +28,21 @@ import 'emby-itemscontainer'; function getSections() { return [{ - name: 'HeaderFavoriteMovies', + name: 'Movies', types: 'Movie', id: 'favoriteMovies', shape: getPosterShape(), showTitle: false, overlayPlayButton: true }, { - name: 'HeaderFavoriteShows', + name: 'Shows', types: 'Series', id: 'favoriteShows', shape: getPosterShape(), showTitle: false, overlayPlayButton: true }, { - name: 'HeaderFavoriteEpisodes', + name: 'Episodes', types: 'Episode', id: 'favoriteEpisode', shape: getThumbShape(), @@ -53,7 +53,7 @@ import 'emby-itemscontainer'; overlayText: false, centerText: true }, { - name: 'HeaderFavoriteVideos', + name: 'Videos', types: 'Video,MusicVideo', id: 'favoriteVideos', shape: getThumbShape(), @@ -63,7 +63,7 @@ import 'emby-itemscontainer'; overlayText: false, centerText: true }, { - name: 'HeaderFavoriteArtists', + name: 'Artists', types: 'MusicArtist', id: 'favoriteArtists', shape: getSquareShape(), @@ -75,7 +75,7 @@ import 'emby-itemscontainer'; overlayPlayButton: true, coverImage: true }, { - name: 'HeaderFavoriteAlbums', + name: 'Albums', types: 'MusicAlbum', id: 'favoriteAlbums', shape: getSquareShape(), @@ -87,7 +87,7 @@ import 'emby-itemscontainer'; overlayPlayButton: true, coverImage: true }, { - name: 'HeaderFavoriteSongs', + name: 'Songs', types: 'Audio', id: 'favoriteSongs', shape: getSquareShape(), diff --git a/src/components/filterdialog/filterdialog.js b/src/components/filterdialog/filterdialog.js index df17c19dec..d11edb40a2 100644 --- a/src/components/filterdialog/filterdialog.js +++ b/src/components/filterdialog/filterdialog.js @@ -1,7 +1,6 @@ import dom from 'dom'; import dialogHelper from 'dialogHelper'; import globalize from 'globalize'; -import connectionManager from 'connectionManager'; import events from 'events'; import 'emby-checkbox'; import 'emby-collapse'; @@ -420,7 +419,7 @@ import 'css!./style.css'; this.bindEvents(dlg); if (enableDynamicFilters(this.options.mode)) { 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); } }); diff --git a/src/components/filterdialog/filterdialog.template.html b/src/components/filterdialog/filterdialog.template.html index 1d61f3923e..03aba5ee35 100644 --- a/src/components/filterdialog/filterdialog.template.html +++ b/src/components/filterdialog/filterdialog.template.html @@ -6,12 +6,12 @@