mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Merge branch 'master' into deinterlace-improvements

Browse source
This commit is contained in:
Orry Verducci 2020-09-03 22:01:22 +01:00 • committed by GitHub
commit 5f96b19772
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
280 changed files with 8207 additions and 13009 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"

11
.eslintrc.js
View file

@ -1,3 +1,5 @@
const restrictedGlobals = require('confusing-browser-globals');
module.exports = { module.exports = {
root: true, root: true,
plugins: [ plugins: [
@ -39,14 +41,15 @@ module.exports = {
'no-floating-decimal': ['error'], 'no-floating-decimal': ['error'],
'no-multi-spaces': ['error'], 'no-multi-spaces': ['error'],
'no-multiple-empty-lines': ['error', { 'max': 1 }], 'no-multiple-empty-lines': ['error', { 'max': 1 }],
'no-restricted-globals': ['error'].concat(restrictedGlobals),
'no-trailing-spaces': ['error'], 'no-trailing-spaces': ['error'],
'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 }], //'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 }],
'semi': ['error'], '@babel/semi': ['error'],
'space-before-blocks': ['error'], 'space-before-blocks': ['error'],
'space-infix-ops': 'error', 'space-infix-ops': 'error',
'yoda': 'error' 'yoda': 'error'
@ -81,7 +84,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',
@ -106,6 +108,7 @@ module.exports = {
// TODO: Fix warnings and remove these rules // TODO: Fix warnings and remove these rules
'no-redeclare': ['off'], 'no-redeclare': ['off'],
'no-useless-escape': ['off'], 'no-useless-escape': ['off'],
'no-unused-vars': ['off'],
// TODO: Remove after ES6 migration is complete // TODO: Remove after ES6 migration is complete
'import/no-unresolved': ['off'] 'import/no-unresolved': ['off']
}, },

2
fedora/jellyfin-web.spec
View file

@ -11,6 +11,8 @@ Source0: jellyfin-web-%{version}.tar.gz
%if 0%{?centos} %if 0%{?centos}
BuildRequires: yarn BuildRequires: yarn
# sadly the yarn RPM at https://dl.yarnpkg.com/rpm/ uses git but doesn't Requires: it
BuildRequires: git
%else %else
BuildRequires: nodejs-yarn BuildRequires: nodejs-yarn
%endif %endif

45
package.json
View file

@ -5,27 +5,28 @@
"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.1", "@babel/core": "^7.11.5",
"@babel/eslint-parser": "^7.11.3", "@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",
"confusing-browser-globals": "^1.0.9",
"copy-webpack-plugin": "^5.1.1", "copy-webpack-plugin": "^5.1.1",
"css-loader": "^4.2.1", "css-loader": "^4.2.2",
"cssnano": "^4.1.10", "cssnano": "^4.1.10",
"del": "^5.1.0", "del": "^5.1.0",
"eslint": "^7.6.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",
@ -38,47 +39,49 @@
"gulp-postcss": "^8.0.0", "gulp-postcss": "^8.0.0",
"gulp-sass": "^4.0.2", "gulp-sass": "^4.0.2",
"gulp-sourcemaps": "^2.6.5", "gulp-sourcemaps": "^2.6.5",
"gulp-terser": "^1.3.2", "gulp-terser": "^1.4.0",
"html-webpack-plugin": "^4.3.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": "^5.2.1" "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.15.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.8", "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.0.1",
"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": "^5.4.5", "swiper": "^6.1.1",
"webcomponents.js": "^0.7.24", "webcomponents.js": "^0.7.24",
"whatwg-fetch": "^3.4.0" "whatwg-fetch": "^3.4.0"
}, },
@ -96,6 +99,7 @@
"src/components/alphaPicker/alphaPicker.js", "src/components/alphaPicker/alphaPicker.js",
"src/components/appFooter/appFooter.js", "src/components/appFooter/appFooter.js",
"src/components/apphost.js", "src/components/apphost.js",
"src/components/appRouter.js",
"src/components/autoFocuser.js", "src/components/autoFocuser.js",
"src/components/backdrop/backdrop.js", "src/components/backdrop/backdrop.js",
"src/components/cardbuilder/cardBuilder.js", "src/components/cardbuilder/cardBuilder.js",
@ -144,6 +148,7 @@
"src/components/multiSelect/multiSelect.js", "src/components/multiSelect/multiSelect.js",
"src/components/notifications/notifications.js", "src/components/notifications/notifications.js",
"src/components/nowPlayingBar/nowPlayingBar.js", "src/components/nowPlayingBar/nowPlayingBar.js",
"src/components/packageManager.js",
"src/components/playback/brightnessosd.js", "src/components/playback/brightnessosd.js",
"src/components/playback/mediasession.js", "src/components/playback/mediasession.js",
"src/components/playback/nowplayinghelper.js", "src/components/playback/nowplayinghelper.js",
@ -159,17 +164,23 @@
"src/components/playerstats/playerstats.js", "src/components/playerstats/playerstats.js",
"src/components/playlisteditor/playlisteditor.js", "src/components/playlisteditor/playlisteditor.js",
"src/components/playmenu.js", "src/components/playmenu.js",
"src/components/pluginManager.js",
"src/components/prompt/prompt.js", "src/components/prompt/prompt.js",
"src/components/recordingcreator/recordingbutton.js", "src/components/recordingcreator/recordingbutton.js",
"src/components/recordingcreator/recordingcreator.js", "src/components/recordingcreator/recordingcreator.js",
"src/components/recordingcreator/seriesrecordingeditor.js", "src/components/recordingcreator/seriesrecordingeditor.js",
"src/components/recordingcreator/recordinghelper.js", "src/components/recordingcreator/recordinghelper.js",
"src/components/refreshdialog/refreshdialog.js", "src/components/refreshdialog/refreshdialog.js",
"src/components/recordingcreator/recordingeditor.js",
"src/components/recordingcreator/recordingfields.js",
"src/components/qualityOptions.js", "src/components/qualityOptions.js",
"src/components/remotecontrol/remotecontrol.js", "src/components/remotecontrol/remotecontrol.js",
"src/components/sanatizefilename.js", "src/components/sanatizefilename.js",
"src/components/scrollManager.js", "src/components/scrollManager.js",
"src/plugins/experimentalWarnings/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",
@ -313,11 +324,13 @@
"src/plugins/backdropScreensaver/plugin.js", "src/plugins/backdropScreensaver/plugin.js",
"src/plugins/bookPlayer/plugin.js", "src/plugins/bookPlayer/plugin.js",
"src/plugins/bookPlayer/tableOfContents.js", "src/plugins/bookPlayer/tableOfContents.js",
"src/plugins/chromecastPlayer/chromecastHelper.js",
"src/plugins/photoPlayer/plugin.js", "src/plugins/photoPlayer/plugin.js",
"src/plugins/youtubePlayer/plugin.js", "src/plugins/youtubePlayer/plugin.js",
"src/scripts/alphanumericshortcuts.js", "src/scripts/alphanumericshortcuts.js",
"src/scripts/autoBackdrops.js", "src/scripts/autoBackdrops.js",
"src/scripts/browser.js", "src/scripts/browser.js",
"src/scripts/clientUtils.js",
"src/scripts/datetime.js", "src/scripts/datetime.js",
"src/scripts/deleteHelper.js", "src/scripts/deleteHelper.js",
"src/scripts/dfnshelper.js", "src/scripts/dfnshelper.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) {

2
src/assets/css/videoosd.css
View file

@ -248,8 +248,6 @@
} }
@media all and (max-width: 30em) { @media all and (max-width: 30em) {
.btnFastForward,
.btnRewind,
.osdMediaInfo, .osdMediaInfo,
.osdPoster { .osdPoster {
display: none !important; display: none !important;

10
src/bundle.js
View file

@ -60,8 +60,8 @@ _define('resize-observer-polyfill', function() {
}); });
// swiper // swiper
const swiper = require('swiper/js/swiper'); const swiper = require('swiper/swiper-bundle');
require('swiper/css/swiper.min.css'); require('swiper/swiper-bundle.css');
_define('swiper', function() { _define('swiper', function() {
return swiper; return swiper;
}); });
@ -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;
});

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

@ -1,5 +1,5 @@
<div class="formDialogHeader"> <div class="formDialogHeader">
<button is="paper-icon-button-light" class="btnCancel autoSize" title="${LabelPrevious}" tabindex="-1"> <button is="paper-icon-button-light" class="btnCancel autoSize" title="${Previous}" tabindex="-1">
<span class="material-icons arrow_back" aria-hidden="true"></span> <span class="material-icons arrow_back" aria-hidden="true"></span>
</button> </button>
<h3 class="formDialogHeaderTitle"> <h3 class="formDialogHeaderTitle">
@ -12,13 +12,13 @@
<div class="selectContainer"> <div class="selectContainer">
<select is="emby-select" id="selectDay" label="${LabelAccessDay}"> <select is="emby-select" id="selectDay" label="${LabelAccessDay}">
<option value="Sunday">${OptionSunday}</option> <option value="Sunday">${Sunday}</option>
<option value="Monday">${OptionMonday}</option> <option value="Monday">${Monday}</option>
<option value="Tuesday">${OptionTuesday}</option> <option value="Tuesday">${Tuesday}</option>
<option value="Wednesday">${OptionWednesday}</option> <option value="Wednesday">${Wednesday}</option>
<option value="Thursday">${OptionThursday}</option> <option value="Thursday">${Thursday}</option>
<option value="Friday">${OptionFriday}</option> <option value="Friday">${Friday}</option>
<option value="Saturday">${OptionSaturday}</option> <option value="Saturday">${Saturday}</option>
<option value="Everyday">${OptionEveryday}</option> <option value="Everyday">${OptionEveryday}</option>
<option value="Weekday">${OptionWeekdays}</option> <option value="Weekday">${OptionWeekdays}</option>
<option value="Weekend">${OptionWeekends}</option> <option value="Weekend">${OptionWeekends}</option>

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;

904
src/components/appRouter.js
View file

File diff suppressed because it is too large Load diff

8
src/components/apphost.js
View file

@ -55,7 +55,7 @@ function replaceAll(originalString, strReplace, strWith) {
function generateDeviceId() { function generateDeviceId() {
const keys = []; const keys = [];
if (keys.push(navigator.userAgent), keys.push(new Date().getTime()), self.btoa) { if (keys.push(navigator.userAgent), keys.push(new Date().getTime()), window.btoa) {
const result = replaceAll(btoa(keys.join('|')), '=', '1'); const result = replaceAll(btoa(keys.join('|')), '=', '1');
return Promise.resolve(result); return Promise.resolve(result);
} }
@ -404,9 +404,9 @@ document.addEventListener(visibilityChange, function () {
} }
}, false); }, false);
if (self.addEventListener) { if (window.addEventListener) {
self.addEventListener('focus', onAppVisible); window.addEventListener('focus', onAppVisible);
self.addEventListener('blur', onAppHidden); window.addEventListener('blur', onAppHidden);
} }
export default appHost; export default appHost;

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, {

30
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;
} }
@ -239,33 +243,13 @@ button::-moz-focus-inner {
border: none; border: none;
} }
.cardImage-img {
max-height: 100%;
max-width: 100%;
/* This is simply for lazy image purposes, to ensure the image is visible sooner when scrolling */
min-height: 70%;
min-width: 70%;
margin: auto;
}
.coveredImage-img {
width: 100%;
height: 100%;
}
.coveredImage-noscale-img {
max-height: none;
max-width: none;
}
.coveredImage { .coveredImage {
background-size: cover; background-size: cover;
background-position: center center; background-position: center center;
} }
.coveredImage-noScale { .coveredImage.coveredImage-contain {
background-size: cover; background-size: contain;
} }
.cardFooter { .cardFooter {
@ -372,6 +356,8 @@ button::-moz-focus-inner {
.cardDefaultText { .cardDefaultText {
white-space: normal; white-space: normal;
text-align: center; text-align: center;
font-size: 2em;
font-weight: bold;
} }
.cardImageContainer .cardImageIcon { .cardImageContainer .cardImageIcon {

17
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) {
@ -986,6 +985,10 @@ import 'programStyles';
lines = []; lines = [];
} }
if (overlayText && showTitle) {
lines = [item.Name];
}
const addRightTextMargin = isOuterFooter && options.cardLayout && !options.centerText && options.cardFooterAside !== 'none' && layoutManager.mobile; const addRightTextMargin = isOuterFooter && options.cardLayout && !options.centerText && options.cardFooterAside !== 'none' && layoutManager.mobile;
html += getCardTextLines(lines, cssClass, !options.overlayText, isOuterFooter, options.cardLayout, addRightTextMargin, options.lines); html += getCardTextLines(lines, cssClass, !options.overlayText, isOuterFooter, options.cardLayout, addRightTextMargin, options.lines);
@ -1117,7 +1120,7 @@ import 'programStyles';
function importRefreshIndicator() { function importRefreshIndicator() {
if (!refreshIndicatorLoaded) { if (!refreshIndicatorLoaded) {
refreshIndicatorLoaded = true; refreshIndicatorLoaded = true;
/* eslint-disable-next-line no-unused-expressions */ /* eslint-disable-next-line @babel/no-unused-expressions */
import('emby-itemrefreshindicator'); import('emby-itemrefreshindicator');
} }
} }
@ -1212,8 +1215,8 @@ import 'programStyles';
if (coveredImage) { if (coveredImage) {
cardImageContainerClass += ' coveredImage'; cardImageContainerClass += ' coveredImage';
if (item.MediaType === 'Photo' || item.Type === 'PhotoAlbum' || item.Type === 'Folder' || item.ProgramInfo || item.Type === 'Program' || item.Type === 'Recording') { if (item.Type === 'TvChannel') {
cardImageContainerClass += ' coveredImage-noScale'; cardImageContainerClass += ' coveredImage-contain';
} }
} }
@ -1449,7 +1452,7 @@ import 'programStyles';
const userData = item.UserData || {}; const userData = item.UserData || {};
if (itemHelper.canMarkPlayed(item)) { if (itemHelper.canMarkPlayed(item)) {
/* eslint-disable-next-line no-unused-expressions */ /* eslint-disable-next-line @babel/no-unused-expressions */
import('emby-playstatebutton'); import('emby-playstatebutton');
html += '<button is="emby-playstatebutton" type="button" data-action="none" class="' + btnCssClass + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-played="' + (userData.Played) + '"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover check"></span></button>'; html += '<button is="emby-playstatebutton" type="button" data-action="none" class="' + btnCssClass + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-played="' + (userData.Played) + '"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover check"></span></button>';
} }
@ -1457,7 +1460,7 @@ import 'programStyles';
if (itemHelper.canRate(item)) { if (itemHelper.canRate(item)) {
const likes = userData.Likes == null ? '' : userData.Likes; const likes = userData.Likes == null ? '' : userData.Likes;
/* eslint-disable-next-line no-unused-expressions */ /* eslint-disable-next-line @babel/no-unused-expressions */
import('emby-ratingbutton'); import('emby-ratingbutton');
html += '<button is="emby-ratingbutton" type="button" data-action="none" class="' + btnCssClass + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-likes="' + likes + '" data-isfavorite="' + (userData.IsFavorite) + '"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover favorite"></span></button>'; html += '<button is="emby-ratingbutton" type="button" data-action="none" class="' + btnCssClass + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-likes="' + likes + '" data-isfavorite="' + (userData.IsFavorite) + '"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover favorite"></span></button>';
} }

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) {

12
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,14 +15,15 @@ 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: { data: JSON.stringify({
providerId: providerId, providerId: providerId,
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
})); }));
@ -93,7 +93,7 @@ export default class channelMapper {
html += '<div class="formDialogContent smoothScrollY">'; html += '<div class="formDialogContent smoothScrollY">';
html += '<div class="dialogContentInner dialog-content-centered">'; html += '<div class="dialogContentInner dialog-content-centered">';
html += '<form style="margin:auto;">'; html += '<form style="margin:auto;">';
html += `<h1>${globalize.translate('HeaderChannels')}</h1>`; html += `<h1>${globalize.translate('Channels')}</h1>`;
html += '<div class="channels paperList">'; html += '<div class="channels paperList">';
html += '</div>'; html += '</div>';
html += '</form>'; html += '</form>';

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/confirm/confirm.js
View file

@ -19,7 +19,7 @@ export default (() => {
} }
const text = replaceAll(options.text || '', '<br/>', '\n'); const text = replaceAll(options.text || '', '<br/>', '\n');
const result = confirm(text); const result = window.confirm(text);
if (result) { if (result) {
return Promise.resolve(); return Promise.resolve();

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

@ -85,9 +85,9 @@ import 'scrollStyles';
} }
if (!self.closedByBack && isHistoryEnabled(dlg)) { if (!self.closedByBack && isHistoryEnabled(dlg)) {
const state = history.state || {}; const state = window.history.state || {};
if (state.dialogId === hash) { if (state.dialogId === hash) {
history.back(); window.history.back();
} }
} }
@ -213,7 +213,7 @@ import 'scrollStyles';
export function close(dlg) { export function close(dlg) {
if (isOpened(dlg)) { if (isOpened(dlg)) {
if (isHistoryEnabled(dlg)) { if (isHistoryEnabled(dlg)) {
history.back(); window.history.back();
} else { } else {
closeDialog(dlg); closeDialog(dlg);
} }
@ -375,7 +375,7 @@ import 'scrollStyles';
dlg.setAttribute('data-lockscroll', 'true'); dlg.setAttribute('data-lockscroll', 'true');
} }
if (options.enableHistory !== false && appRouter.enableNativeHistory()) { if (options.enableHistory === true) {
dlg.setAttribute('data-history', 'true'); dlg.setAttribute('data-history', 'true');
} }

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

@ -125,7 +125,7 @@ import 'emby-button';
html += `<input is="emby-input" id="txtDirectoryPickerPath" type="text" required="required" ${readOnlyAttribute} label="${globalize.translate(labelKey)}"/>`; html += `<input is="emby-input" id="txtDirectoryPickerPath" type="text" required="required" ${readOnlyAttribute} label="${globalize.translate(labelKey)}"/>`;
html += '</div>'; html += '</div>';
if (!readOnlyAttribute) { if (!readOnlyAttribute) {
html += `<button type="button" is="paper-icon-button-light" class="btnRefreshDirectories emby-input-iconbutton" title="${globalize.translate('ButtonRefresh')}"><span class="material-icons search"></span></button>`; html += `<button type="button" is="paper-icon-button-light" class="btnRefreshDirectories emby-input-iconbutton" title="${globalize.translate('Refresh')}"><span class="material-icons search"></span></button>`;
} }
html += '</div>'; html += '</div>';
if (!readOnlyAttribute) { if (!readOnlyAttribute) {
@ -166,10 +166,11 @@ import 'emby-button';
return apiClient.ajax({ return apiClient.ajax({
type: 'POST', type: 'POST',
url: apiClient.getUrl('Environment/ValidatePath'), url: apiClient.getUrl('Environment/ValidatePath'),
data: { 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 => {

6
src/components/displaySettings/displaySettings.template.html
View file

@ -162,7 +162,7 @@
<div class="checkboxContainer checkboxContainer-withDescription fldBackdrops hide"> <div class="checkboxContainer checkboxContainer-withDescription fldBackdrops hide">
<label> <label>
<input type="checkbox" is="emby-checkbox" id="chkBackdrops" /> <input type="checkbox" is="emby-checkbox" id="chkBackdrops" />
<span>${EnableBackdrops}</span> <span>${Backdrops}</span>
</label> </label>
<div class="fieldDescription checkboxFieldDescription">${EnableBackdropsHelp}</div> <div class="fieldDescription checkboxFieldDescription">${EnableBackdropsHelp}</div>
</div> </div>
@ -170,7 +170,7 @@
<div class="checkboxContainer checkboxContainer-withDescription fldThemeSong hide"> <div class="checkboxContainer checkboxContainer-withDescription fldThemeSong hide">
<label> <label>
<input type="checkbox" is="emby-checkbox" id="chkThemeSong" /> <input type="checkbox" is="emby-checkbox" id="chkThemeSong" />
<span>${EnableThemeSongs}</span> <span>${ThemeSongs}</span>
</label> </label>
<div class="fieldDescription checkboxFieldDescription">${EnableThemeSongsHelp}</div> <div class="fieldDescription checkboxFieldDescription">${EnableThemeSongsHelp}</div>
</div> </div>
@ -178,7 +178,7 @@
<div class="checkboxContainer checkboxContainer-withDescription fldThemeVideo hide"> <div class="checkboxContainer checkboxContainer-withDescription fldThemeVideo hide">
<label> <label>
<input type="checkbox" is="emby-checkbox" id="chkThemeVideo" /> <input type="checkbox" is="emby-checkbox" id="chkThemeVideo" />
<span>${EnableThemeVideos}</span> <span>${ThemeVideos}</span>
</label> </label>
<div class="fieldDescription checkboxFieldDescription">${EnableThemeVideosHelp}</div> <div class="fieldDescription checkboxFieldDescription">${EnableThemeVideosHelp}</div>
</div> </div>

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);
} }
}); });

18
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" />
@ -90,7 +90,7 @@
</div> </div>
</div> </div>
<div is="emby-collapse" title="${HeaderGenres}" class="genreFilters hide"> <div is="emby-collapse" title="${Genres}" class="genreFilters hide">
<div class="collapseContent filterOptions"> <div class="collapseContent filterOptions">
</div> </div>
</div> </div>

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;

2
src/components/guide/guide-settings.template.html
View file

@ -1,5 +1,5 @@
<div class="formDialogHeader"> <div class="formDialogHeader">
<button is="paper-icon-button-light" class="btnCancel autoSize" title="${LabelPrevious}" tabindex="-1"> <button is="paper-icon-button-light" class="btnCancel autoSize" title="${Previous}" tabindex="-1">
<span class="material-icons arrow_back" aria-hidden="true"></span> <span class="material-icons arrow_back" aria-hidden="true"></span>
</button> </button>
<h3 class="formDialogHeaderTitle"> <h3 class="formDialogHeaderTitle">

4
src/components/guide/guide.css
View file

@ -70,6 +70,10 @@
contain: strict; contain: strict;
} }
.programContainer.emby-scroller {
margin: 0;
}
.channelPrograms { .channelPrograms {
height: 4.42em; height: 4.42em;
contain: strict; contain: strict;

7
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 = {
@ -547,7 +546,7 @@ function Guide(options) {
} else if (program.IsPremiere && options.showPremiereIndicator) { } else if (program.IsPremiere && options.showPremiereIndicator) {
indicatorHtml = '<span class="premiereTvProgram guideProgramIndicator">' + globalize.translate('Premiere') + '</span>'; indicatorHtml = '<span class="premiereTvProgram guideProgramIndicator">' + globalize.translate('Premiere') + '</span>';
} else if (program.IsSeries && !program.IsRepeat && options.showNewIndicator) { } else if (program.IsSeries && !program.IsRepeat && options.showNewIndicator) {
indicatorHtml = '<span class="newTvProgram guideProgramIndicator">' + globalize.translate('AttributeNew') + '</span>'; indicatorHtml = '<span class="newTvProgram guideProgramIndicator">' + globalize.translate('New') + '</span>';
} else if (program.IsSeries && program.IsRepeat && options.showRepeatIndicator) { } else if (program.IsSeries && program.IsRepeat && options.showRepeatIndicator) {
indicatorHtml = '<span class="repeatTvProgram guideProgramIndicator">' + globalize.translate('Repeat') + '</span>'; indicatorHtml = '<span class="repeatTvProgram guideProgramIndicator">' + globalize.translate('Repeat') + '</span>';
} }
@ -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);

4
src/components/guide/tvguide.template.html
View file

@ -29,10 +29,10 @@
</div> </div>
<div class="guideOptions hide"> <div class="guideOptions hide">
<button is="paper-icon-button-light" type="button" class="btnPreviousPage" title="${LabelPrevious}"> <button is="paper-icon-button-light" type="button" class="btnPreviousPage" title="${Previous}">
<span class="material-icons arrow_back" aria-hidden="true"></span> <span class="material-icons arrow_back" aria-hidden="true"></span>
</button> </button>
<button is="paper-icon-button-light" type="button" class="btnNextPage" title="${LabelNext}"> <button is="paper-icon-button-light" type="button" class="btnNextPage" title="${Next}">
<span class="material-icons arrow_forward" aria-hidden="true"></span> <span class="material-icons arrow_forward" aria-hidden="true"></span>
</button> </button>
</div> </div>

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 => {

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

@ -1,6 +1,6 @@
<form style="margin:0 auto;"> <form style="margin:0 auto;">
<div class="verticalSection verticalSection-extrabottompadding"> <div class="verticalSection verticalSection-extrabottompadding">
<h2 class="sectionTitle">${HeaderHome}</h2> <h2 class="sectionTitle">${Home}</h2>
<div class="selectContainer hide selectTVHomeScreenContainer"> <div class="selectContainer hide selectTVHomeScreenContainer">
<select is="emby-select" class="selectTVHomeScreen" label="${LabelTVHomeScreen}"> <select is="emby-select" class="selectTVHomeScreen" label="${LabelTVHomeScreen}">
@ -25,7 +25,7 @@
<option value="resume">${HeaderContinueWatching}</option> <option value="resume">${HeaderContinueWatching}</option>
<option value="resumeaudio">${HeaderContinueListening}</option> <option value="resumeaudio">${HeaderContinueListening}</option>
<option value="latestmedia">${HeaderLatestMedia}</option> <option value="latestmedia">${HeaderLatestMedia}</option>
<option value="nextup">${HeaderNextUp}</option> <option value="nextup">${NextUp}</option>
<option value="livetv">${LiveTV}</option> <option value="livetv">${LiveTV}</option>
<option value="none">${None}</option> <option value="none">${None}</option>
</select> </select>
@ -38,7 +38,7 @@
<option value="resume">${HeaderContinueWatching}</option> <option value="resume">${HeaderContinueWatching}</option>
<option value="resumeaudio">${HeaderContinueListening}</option> <option value="resumeaudio">${HeaderContinueListening}</option>
<option value="latestmedia">${HeaderLatestMedia}</option> <option value="latestmedia">${HeaderLatestMedia}</option>
<option value="nextup">${HeaderNextUp}</option> <option value="nextup">${NextUp}</option>
<option value="livetv">${LiveTV}</option> <option value="livetv">${LiveTV}</option>
<option value="none">${None}</option> <option value="none">${None}</option>
</select> </select>
@ -51,7 +51,7 @@
<option value="resume">${HeaderContinueWatching}</option> <option value="resume">${HeaderContinueWatching}</option>
<option value="resumeaudio">${HeaderContinueListening}</option> <option value="resumeaudio">${HeaderContinueListening}</option>
<option value="latestmedia">${HeaderLatestMedia}</option> <option value="latestmedia">${HeaderLatestMedia}</option>
<option value="nextup">${HeaderNextUp}</option> <option value="nextup">${NextUp}</option>
<option value="livetv">${LiveTV}</option> <option value="livetv">${LiveTV}</option>
<option value="none">${None}</option> <option value="none">${None}</option>
</select> </select>
@ -64,7 +64,7 @@
<option value="resume">${HeaderContinueWatching}</option> <option value="resume">${HeaderContinueWatching}</option>
<option value="resumeaudio">${HeaderContinueListening}</option> <option value="resumeaudio">${HeaderContinueListening}</option>
<option value="latestmedia">${HeaderLatestMedia}</option> <option value="latestmedia">${HeaderLatestMedia}</option>
<option value="nextup">${HeaderNextUp}</option> <option value="nextup">${NextUp}</option>
<option value="livetv">${LiveTV}</option> <option value="livetv">${LiveTV}</option>
<option value="none">${None}</option> <option value="none">${None}</option>
</select> </select>
@ -77,7 +77,7 @@
<option value="resume">${HeaderContinueWatching}</option> <option value="resume">${HeaderContinueWatching}</option>
<option value="resumeaudio">${HeaderContinueListening}</option> <option value="resumeaudio">${HeaderContinueListening}</option>
<option value="latestmedia">${HeaderLatestMedia}</option> <option value="latestmedia">${HeaderLatestMedia}</option>
<option value="nextup">${HeaderNextUp}</option> <option value="nextup">${NextUp}</option>
<option value="livetv">${LiveTV}</option> <option value="livetv">${LiveTV}</option>
<option value="none">${None}</option> <option value="none">${None}</option>
</select> </select>
@ -90,7 +90,7 @@
<option value="resume">${HeaderContinueWatching}</option> <option value="resume">${HeaderContinueWatching}</option>
<option value="resumeaudio">${HeaderContinueListening}</option> <option value="resumeaudio">${HeaderContinueListening}</option>
<option value="latestmedia">${HeaderLatestMedia}</option> <option value="latestmedia">${HeaderLatestMedia}</option>
<option value="nextup">${HeaderNextUp}</option> <option value="nextup">${NextUp}</option>
<option value="livetv">${LiveTV}</option> <option value="livetv">${LiveTV}</option>
<option value="none">${None}</option> <option value="none">${None}</option>
</select> </select>
@ -103,7 +103,7 @@
<option value="resume">${HeaderContinueWatching}</option> <option value="resume">${HeaderContinueWatching}</option>
<option value="resumeaudio">${HeaderContinueListening}</option> <option value="resumeaudio">${HeaderContinueListening}</option>
<option value="latestmedia">${HeaderLatestMedia}</option> <option value="latestmedia">${HeaderLatestMedia}</option>
<option value="nextup">${HeaderNextUp}</option> <option value="nextup">${NextUp}</option>
<option value="livetv">${LiveTV}</option> <option value="livetv">${LiveTV}</option>
<option value="none">${None}</option> <option value="none">${None}</option>
</select> </select>

17
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',
@ -696,12 +695,12 @@ import 'css!./homesections';
serverId: apiClient.serverId() serverId: apiClient.serverId()
}) + '" class="button-flat button-flat-mini sectionTitleTextButton">'; }) + '" class="button-flat button-flat-mini sectionTitleTextButton">';
html += '<h2 class="sectionTitle sectionTitle-cards">'; html += '<h2 class="sectionTitle sectionTitle-cards">';
html += globalize.translate('HeaderNextUp'); html += globalize.translate('NextUp');
html += '</h2>'; html += '</h2>';
html += '<span class="material-icons chevron_right"></span>'; html += '<span class="material-icons chevron_right"></span>';
html += '</a>'; html += '</a>';
} else { } else {
html += '<h2 class="sectionTitle sectionTitle-cards">' + globalize.translate('HeaderNextUp') + '</h2>'; html += '<h2 class="sectionTitle sectionTitle-cards">' + globalize.translate('NextUp') + '</h2>';
} }
html += '</div>'; html += '</div>';
@ -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

4
src/components/images/imageLoader.js
View file

@ -87,6 +87,9 @@ import 'css!./style';
requestAnimationFrame(() => { requestAnimationFrame(() => {
if (elem.tagName !== 'IMG') { if (elem.tagName !== 'IMG') {
elem.style.backgroundImage = "url('" + url + "')"; elem.style.backgroundImage = "url('" + url + "')";
if (elem.classList.contains('blurhashed')) {
elem.style.backgroundColor = '#fff';
}
} else { } else {
elem.setAttribute('src', url); elem.setAttribute('src', url);
} }
@ -108,6 +111,7 @@ import 'css!./style';
if (elem.tagName !== 'IMG') { if (elem.tagName !== 'IMG') {
url = elem.style.backgroundImage.slice(4, -1).replace(/"/g, ''); url = elem.style.backgroundImage.slice(4, -1).replace(/"/g, '');
elem.style.backgroundImage = 'none'; elem.style.backgroundImage = 'none';
elem.style.backgroundColor = null;
} else { } else {
url = elem.getAttribute('src'); url = elem.getAttribute('src');
elem.setAttribute('src', ''); elem.setAttribute('src', '');

4
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';
@ -8,7 +7,6 @@ import browser from 'browser';
import actionsheet from 'actionsheet'; import actionsheet from 'actionsheet';
/* eslint-disable indent */ /* eslint-disable indent */
export function getCommands(options) { export function getCommands(options) {
const item = options.item; const item = options.item;
const user = options.user; const user = options.user;
@ -331,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) {

19
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) {
@ -137,7 +150,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',

2
src/components/itemMediaInfo/itemMediaInfo.template.html
View file

@ -2,7 +2,7 @@
<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"> <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1">
<span class="material-icons arrow_back"></span> <span class="material-icons arrow_back"></span>
</button> </button>
<h3 class="formDialogHeaderTitle">${HeaderMediaInfo}</h3> <h3 class="formDialogHeaderTitle">${MoreMediaInfo}</h3>
</div> </div>
<div class="formDialogContent smoothScrollY"> <div class="formDialogContent smoothScrollY">

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) {

20
src/components/libraryoptionseditor/libraryoptionseditor.js
View file

@ -75,9 +75,9 @@ import 'emby-input';
html += '</h3>'; html += '</h3>';
html += '</div>'; html += '</div>';
if (i > 0) { if (i > 0) {
html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('ButtonUp')}" class="btnSortableMoveUp btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_up"></span></button>`; html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('Up')}" class="btnSortableMoveUp btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_up"></span></button>`;
} else if (plugins.length > 1) { } else if (plugins.length > 1) {
html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('ButtonDown')}" class="btnSortableMoveDown btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_down"></span></button>`; html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('Down')}" class="btnSortableMoveDown btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_down"></span></button>`;
} }
html += '</div>'; html += '</div>';
} }
@ -131,9 +131,9 @@ import 'emby-input';
html += '</h3>'; html += '</h3>';
html += '</div>'; html += '</div>';
if (index > 0) { if (index > 0) {
html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('ButtonUp') + '" class="btnSortableMoveUp btnSortable" data-pluginindex="' + index + '"><span class="material-icons keyboard_arrow_up"></span></button>'; html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('Up') + '" class="btnSortableMoveUp btnSortable" data-pluginindex="' + index + '"><span class="material-icons keyboard_arrow_up"></span></button>';
} else if (plugins.length > 1) { } else if (plugins.length > 1) {
html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('ButtonDown') + '" class="btnSortableMoveDown btnSortable" data-pluginindex="' + index + '"><span class="material-icons keyboard_arrow_down"></span></button>'; html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('Down') + '" class="btnSortableMoveDown btnSortable" data-pluginindex="' + index + '"><span class="material-icons keyboard_arrow_down"></span></button>';
} }
html += '</div>'; html += '</div>';
}); });
@ -197,9 +197,9 @@ import 'emby-input';
html += '</h3>'; html += '</h3>';
html += '</div>'; html += '</div>';
if (i > 0) { if (i > 0) {
html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('ButtonUp')}" class="btnSortableMoveUp btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_up"></span></button>`; html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('Up')}" class="btnSortableMoveUp btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_up"></span></button>`;
} else if (plugins.length > 1) { } else if (plugins.length > 1) {
html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('ButtonDown')}" class="btnSortableMoveDown btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_down"></span></button>`; html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('Down')}" class="btnSortableMoveDown btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_down"></span></button>`;
} }
html += '</div>'; html += '</div>';
} }
@ -236,9 +236,9 @@ import 'emby-input';
html += '</h3>'; html += '</h3>';
html += '</div>'; html += '</div>';
if (i > 0) { if (i > 0) {
html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('ButtonUp') + '" class="btnSortableMoveUp btnSortable" data-pluginindex="' + i + '"><span class="material-icons keyboard_arrow_up"></span></button>'; html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('Up') + '" class="btnSortableMoveUp btnSortable" data-pluginindex="' + i + '"><span class="material-icons keyboard_arrow_up"></span></button>';
} else if (plugins.length > 1) { } else if (plugins.length > 1) {
html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('ButtonDown') + '" class="btnSortableMoveDown btnSortable" data-pluginindex="' + i + '"><span class="material-icons keyboard_arrow_down"></span></button>'; html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('Down') + '" class="btnSortableMoveDown btnSortable" data-pluginindex="' + i + '"><span class="material-icons keyboard_arrow_down"></span></button>';
} }
html += '</div>'; html += '</div>';
} }
@ -291,13 +291,13 @@ import 'emby-input';
const btnSortable = elem.querySelector('.btnSortable'); const btnSortable = elem.querySelector('.btnSortable');
const inner = btnSortable.querySelector('.material-icons'); const inner = btnSortable.querySelector('.material-icons');
if (elem.previousSibling) { if (elem.previousSibling) {
btnSortable.title = globalize.translate('ButtonUp'); btnSortable.title = globalize.translate('Up');
btnSortable.classList.add('btnSortableMoveUp'); btnSortable.classList.add('btnSortableMoveUp');
btnSortable.classList.remove('btnSortableMoveDown'); btnSortable.classList.remove('btnSortableMoveDown');
inner.classList.remove('keyboard_arrow_down'); inner.classList.remove('keyboard_arrow_down');
inner.classList.add('keyboard_arrow_up'); inner.classList.add('keyboard_arrow_up');
} else { } else {
btnSortable.title = globalize.translate('ButtonDown'); btnSortable.title = globalize.translate('Down');
btnSortable.classList.remove('btnSortableMoveUp'); btnSortable.classList.remove('btnSortableMoveUp');
btnSortable.classList.add('btnSortableMoveDown'); btnSortable.classList.add('btnSortableMoveDown');
inner.classList.remove('keyboard_arrow_up'); inner.classList.remove('keyboard_arrow_up');

2
src/components/libraryoptionseditor/libraryoptionseditor.template.html
View file

@ -88,7 +88,7 @@
<div class="checkboxContainer checkboxContainer-withDescription hide chkImportMissingEpisodesContainer advanced"> <div class="checkboxContainer checkboxContainer-withDescription hide chkImportMissingEpisodesContainer advanced">
<label> <label>
<input is="emby-checkbox" type="checkbox" id="chkImportMissingEpisodes" /> <input is="emby-checkbox" type="checkbox" id="chkImportMissingEpisodes" />
<span>${LabelDisplayMissingEpisodesWithinSeasons}</span> <span>${DisplayMissingEpisodesWithinSeasons}</span>
</label> </label>
<div class="fieldDescription checkboxFieldDescription">${ImportMissingEpisodesHelp}</div> <div class="fieldDescription checkboxFieldDescription">${ImportMissingEpisodesHelp}</div>
</div> </div>

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;

2
src/components/mediaLibraryCreator/mediaLibraryCreator.template.html
View file

@ -24,7 +24,7 @@
<div class="folders"> <div class="folders">
<div style="display: flex; align-items: center;"> <div style="display: flex; align-items: center;">
<h1 style="margin: .5em 0;">${HeadersFolders}</h1> <h1 style="margin: .5em 0;">${Folders}</h1>
<button is="emby-button" type="button" class="fab btnAddFolder submit" style="margin-left:1em;" title="${Add}"> <button is="emby-button" type="button" class="fab btnAddFolder submit" style="margin-left:1em;" title="${Add}">
<span class="material-icons add"></span> <span class="material-icons add"></span>
</button> </button>

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

@ -76,7 +76,7 @@ import 'flexStyles';
confirm({ confirm({
title: globalize.translate('HeaderRemoveMediaLocation'), title: globalize.translate('HeaderRemoveMediaLocation'),
text: globalize.translate('MessageConfirmRemoveMediaLocation'), text: globalize.translate('MessageConfirmRemoveMediaLocation'),
confirmText: globalize.translate('ButtonDelete'), confirmText: globalize.translate('Delete'),
primary: 'delete' primary: 'delete'
}).then(() => { }).then(() => {
const refreshAfterChange = currentOptions.refresh; const refreshAfterChange = currentOptions.refresh;

2
src/components/mediaLibraryEditor/mediaLibraryEditor.template.html
View file

@ -18,7 +18,7 @@
<div class="folders hide"> <div class="folders hide">
<div style="display: flex; align-items: center;"> <div style="display: flex; align-items: center;">
<h1 style="margin: .5em 0;">${HeadersFolders}</h1> <h1 style="margin: .5em 0;">${Folders}</h1>
<button is="emby-button" type="button" class="fab btnAddFolder submit" style="margin-left:1em;" title="${Add}"> <button is="emby-button" type="button" class="fab btnAddFolder submit" style="margin-left:1em;" title="${Add}">
<span class="material-icons add"></span> <span class="material-icons add"></span>
</button> </button>

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

@ -9,7 +9,6 @@ import 'programStyles';
import 'emby-button'; import 'emby-button';
/* eslint-disable indent */ /* eslint-disable indent */
function getTimerIndicator(item) { function getTimerIndicator(item) {
let status; let status;
@ -208,7 +207,7 @@ import 'emby-button';
}); });
} else if (item.IsSeries && !item.IsRepeat) { } else if (item.IsSeries && !item.IsRepeat) {
miscInfo.push({ miscInfo.push({
html: `<div class="mediaInfoProgramAttribute mediaInfoItem newTvProgram">${globalize.translate('AttributeNew')}</div>` html: `<div class="mediaInfoProgramAttribute mediaInfoItem newTvProgram">${globalize.translate('New')}</div>`
}); });
} else if (item.IsSeries && item.IsRepeat) { } else if (item.IsSeries && item.IsRepeat) {
miscInfo.push({ miscInfo.push({

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);

5
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 = [];
@ -198,7 +197,7 @@ import 'css!./multiSelect';
if (user.Policy.EnableContentDownloading && appHost.supports('filedownload')) { if (user.Policy.EnableContentDownloading && appHost.supports('filedownload')) {
menuItems.push({ menuItems.push({
name: globalize.translate('ButtonDownload'), name: globalize.translate('Download'),
id: 'download', id: 'download',
icon: 'file_download' icon: 'file_download'
}); });

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

@ -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()
} }
]; ];

15
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;
@ -701,7 +700,7 @@ import 'emby-ratingbutton';
const player = this; const player = this;
currentRuntimeTicks = playbackManager.duration(player); currentRuntimeTicks = playbackManager.duration(player);
updateTimeDisplay(playbackManager.currentTime(player), currentRuntimeTicks, playbackManager.getBufferedRanges(player)); updateTimeDisplay(playbackManager.currentTime(player) * 10000, currentRuntimeTicks, playbackManager.getBufferedRanges(player));
} }
function releaseCurrentPlayer() { function releaseCurrentPlayer() {

224
src/components/packageManager.js
View file

@ -1,134 +1,140 @@
define(['appSettings', 'pluginManager'], function (appSettings, pluginManager) { import appSettings from 'appSettings';
'use strict'; import pluginManager from 'pluginManager';
/* eslint-disable indent */
var settingsKey = 'installedpackages1'; class PackageManager {
#packagesList = [];
#settingsKey = 'installedpackages1';
function addPackage(packageManager, pkg) { init() {
packageManager.packagesList = packageManager.packagesList.filter(function (p) { console.groupCollapsed('loading packages');
return p.name !== pkg.name; var manifestUrls = JSON.parse(appSettings.get(this.#settingsKey) || '[]');
});
packageManager.packagesList.push(pkg); return Promise.all(manifestUrls.map((url) => {
} return this.loadPackage(url);
}))
.then(() => {
console.debug('finished loading packages');
return Promise.resolve();
})
.catch(() => {
return Promise.resolve();
}).finally(() => {
console.groupEnd('loading packages');
});
}
function removeUrl(url) { get packages() {
var manifestUrls = JSON.parse(appSettings.get(settingsKey) || '[]'); return this.#packagesList.slice(0);
}
manifestUrls = manifestUrls.filter(function (i) { install(url) {
return i !== url; return this.loadPackage(url, true).then((pkg) => {
}); var manifestUrls = JSON.parse(appSettings.get(this.#settingsKey) || '[]');
appSettings.set(settingsKey, JSON.stringify(manifestUrls)); if (!manifestUrls.includes(url)) {
} manifestUrls.push(url);
appSettings.set(this.#settingsKey, JSON.stringify(manifestUrls));
function loadPackage(packageManager, url, throwError) {
return new Promise(function (resolve, reject) {
var xhr = new XMLHttpRequest();
var originalUrl = url;
url += url.indexOf('?') === -1 ? '?' : '&';
url += 't=' + new Date().getTime();
xhr.open('GET', url, true);
var onError = function () {
if (throwError === true) {
reject();
} else {
removeUrl(originalUrl);
resolve();
} }
};
xhr.onload = function (e) { return pkg;
if (this.status < 400) { });
var pkg = JSON.parse(this.response); }
pkg.url = originalUrl;
addPackage(packageManager, pkg); uninstall(name) {
var pkg = this.#packagesList.filter((p) => {
return p.name === name;
})[0];
var plugins = pkg.plugins || []; if (pkg) {
if (pkg.plugin) { this.#packagesList = this.#packagesList.filter((p) => {
plugins.push(pkg.plugin); return p.name !== name;
} });
var promises = plugins.map(function (pluginUrl) {
return pluginManager.loadPlugin(packageManager.mapPath(pkg, pluginUrl));
});
Promise.all(promises).then(resolve, resolve);
} else {
onError();
}
};
xhr.onerror = onError; this.removeUrl(pkg.url);
xhr.send();
});
}
function PackageManager() {
this.packagesList = [];
}
PackageManager.prototype.init = function () {
var manifestUrls = JSON.parse(appSettings.get(settingsKey) || '[]');
var instance = this;
return Promise.all(manifestUrls.map(function (u) {
return loadPackage(instance, u);
})).then(function () {
return Promise.resolve();
}, function () {
return Promise.resolve();
});
};
PackageManager.prototype.packages = function () {
return this.packagesList.slice(0);
};
PackageManager.prototype.install = function (url) {
return loadPackage(this, url, true).then(function (pkg) {
var manifestUrls = JSON.parse(appSettings.get(settingsKey) || '[]');
if (manifestUrls.indexOf(url) === -1) {
manifestUrls.push(url);
appSettings.set(settingsKey, JSON.stringify(manifestUrls));
} }
return pkg; return Promise.resolve();
}); }
};
PackageManager.prototype.uninstall = function (name) { mapPath(pkg, pluginUrl) {
var pkg = this.packagesList.filter(function (p) { var urlLower = pluginUrl.toLowerCase();
return p.name === name; if (urlLower.startsWith('http:') || urlLower.startsWith('https:') || urlLower.startsWith('file:')) {
})[0]; return pluginUrl;
}
if (pkg) { var packageUrl = pkg.url;
this.packagesList = this.packagesList.filter(function (p) { packageUrl = packageUrl.substring(0, packageUrl.lastIndexOf('/'));
return p.name !== name;
packageUrl += '/';
packageUrl += pluginUrl;
return packageUrl;
}
addPackage(pkg) {
this.#packagesList = this.#packagesList.filter((p) => {
return p.name !== pkg.name;
}); });
removeUrl(pkg.url); this.#packagesList.push(pkg);
} }
return Promise.resolve(); removeUrl(url) {
}; var manifestUrls = JSON.parse(appSettings.get(this.#settingsKey) || '[]');
PackageManager.prototype.mapPath = function (pkg, pluginUrl) { manifestUrls = manifestUrls.filter((i) => {
var urlLower = pluginUrl.toLowerCase(); return i !== url;
if (urlLower.indexOf('http:') === 0 || urlLower.indexOf('https:') === 0 || urlLower.indexOf('file:') === 0) { });
return pluginUrl;
appSettings.set(this.#settingsKey, JSON.stringify(manifestUrls));
} }
var packageUrl = pkg.url; loadPackage(url, throwError = false) {
packageUrl = packageUrl.substring(0, packageUrl.lastIndexOf('/')); return new Promise((resolve, reject) => {
var xhr = new XMLHttpRequest();
var originalUrl = url;
url += url.indexOf('?') === -1 ? '?' : '&';
url += 't=' + new Date().getTime();
packageUrl += '/'; xhr.open('GET', url, true);
packageUrl += pluginUrl;
return packageUrl; var onError = () => {
}; if (throwError === true) {
reject();
} else {
this.removeUrl(originalUrl);
resolve();
}
};
return new PackageManager(); xhr.onload = () => {
}); if (this.status < 400) {
var pkg = JSON.parse(this.response);
pkg.url = originalUrl;
this.addPackage(pkg);
var plugins = pkg.plugins || [];
if (pkg.plugin) {
plugins.push(pkg.plugin);
}
var promises = plugins.map((pluginUrl) => {
return pluginManager.loadPlugin(this.mapPath(pkg, pluginUrl));
});
Promise.all(promises).then(resolve, resolve);
} else {
onError();
}
};
xhr.onerror = onError;
xhr.send();
});
}
}
/* eslint-enable indent */
export default new PackageManager();

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;

136
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({
@ -1112,6 +1107,52 @@ class PlaybackManager {
} }
}; };
self.increasePlaybackRate = function (player) {
player = player || self._currentPlayer;
if (player) {
let current = self.getPlaybackRate(player);
let supported = self.getSupportedPlaybackRates(player);
let index = -1;
for (let i = 0, length = supported.length; i < length; i++) {
if (supported[i].id === current) {
index = i;
break;
}
}
index = Math.min(index + 1, supported.length - 1);
self.setPlaybackRate(supported[index].id, player);
}
};
self.decreasePlaybackRate = function (player) {
player = player || self._currentPlayer;
if (player) {
let current = self.getPlaybackRate(player);
let supported = self.getSupportedPlaybackRates(player);
let index = -1;
for (let i = 0, length = supported.length; i < length; i++) {
if (supported[i].id === current) {
index = i;
break;
}
}
index = Math.max(index - 1, 0);
self.setPlaybackRate(supported[index].id, player);
}
};
self.getSupportedPlaybackRates = function (player) {
player = player || self._currentPlayer;
if (player && player.getSupportedPlaybackRates) {
return player.getSupportedPlaybackRates();
}
return [];
};
let brightnessOsdLoaded; let brightnessOsdLoaded;
self.setBrightness = function (val, player) { self.setBrightness = function (val, player) {
player = player || self._currentPlayer; player = player || self._currentPlayer;
@ -1326,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() || {};
@ -1349,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);
}; };
@ -1363,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);
@ -1375,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);
@ -1416,8 +1457,8 @@ class PlaybackManager {
self.toggleFullscreen = function (player) { self.toggleFullscreen = function (player) {
player = player || self._currentPlayer; player = player || self._currentPlayer;
if (!player.isLocalPlayer || player.toggleFulscreen) { if (!player.isLocalPlayer || player.toggleFullscreen) {
return player.toggleFulscreen(); return player.toggleFullscreen();
} }
if (screenfull.isEnabled) { if (screenfull.isEnabled) {
@ -1572,11 +1613,7 @@ class PlaybackManager {
player = player || self._currentPlayer; player = player || self._currentPlayer;
if (player && !enableLocalPlaylistManagement(player)) { if (player && !enableLocalPlaylistManagement(player)) {
if (player.isLocalPlayer) { return player.seek(ticks);
return player.seek((ticks || 0) / 10000);
} else {
return player.seek(ticks);
}
} }
changeStream(player, ticks); changeStream(player, ticks);
@ -1585,11 +1622,7 @@ class PlaybackManager {
self.seekRelative = function (offsetTicks, player) { self.seekRelative = function (offsetTicks, player) {
player = player || self._currentPlayer; player = player || self._currentPlayer;
if (player && !enableLocalPlaylistManagement(player) && player.seekRelative) { if (player && !enableLocalPlaylistManagement(player) && player.seekRelative) {
if (player.isLocalPlayer) { return player.seekRelative(ticks);
return player.seekRelative((ticks || 0) / 10000);
} else {
return player.seekRelative(ticks);
}
} }
const ticks = getCurrentTicks(player) + offsetTicks; const ticks = getCurrentTicks(player) + offsetTicks;
@ -1645,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);
@ -1664,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;
} }
@ -1801,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) {
@ -2024,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();
} }
@ -2032,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;
@ -2073,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();
} }
@ -2095,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) {
@ -2221,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;
@ -2266,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) {
@ -2286,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) {
@ -2442,7 +2475,7 @@ class PlaybackManager {
return mediaSource; return mediaSource;
} }
} else { } else {
showPlaybackInfoErrorMessage(self, 'NoCompatibleStream'); showPlaybackInfoErrorMessage(self, 'PlaybackErrorNoCompatibleStream');
return Promise.reject(); return Promise.reject();
} }
}); });
@ -2674,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 () {
@ -2931,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 {
@ -3124,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 () {
@ -3173,7 +3206,7 @@ class PlaybackManager {
return player.currentTime(); return player.currentTime();
} }
return this.getCurrentTicks(player); return this.getCurrentTicks(player) / 10000;
} }
nextItem(player = this._currentPlayer) { nextItem(player = this._currentPlayer) {
@ -3187,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);
} }
@ -3328,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;
@ -3360,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;
} }
@ -3440,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();
@ -3697,6 +3730,9 @@ class PlaybackManager {
case 'SetAspectRatio': case 'SetAspectRatio':
this.setAspectRatio(cmd.Arguments.AspectRatio, player); this.setAspectRatio(cmd.Arguments.AspectRatio, player);
break; break;
case 'PlaybackRate':
this.setPlaybackRate(cmd.Arguments.PlaybackRate, player);
break;
case 'SetBrightness': case 'SetBrightness':
this.setBrightness(cmd.Arguments.Brightness, player); this.setBrightness(cmd.Arguments.Brightness, player);
break; break;

4
src/components/playback/playbackorientation.js
View file

@ -18,7 +18,7 @@ events.on(playbackManager, 'playbackstart', function (e, player, state) {
if (isLocalVideo && layoutManager.mobile) { if (isLocalVideo && layoutManager.mobile) {
/* eslint-disable-next-line compat/compat */ /* eslint-disable-next-line compat/compat */
var lockOrientation = screen.lockOrientation || screen.mozLockOrientation || screen.msLockOrientation || (screen.orientation && screen.orientation.lock); var lockOrientation = window.screen.lockOrientation || window.screen.mozLockOrientation || window.screen.msLockOrientation || (window.screen.orientation && window.screen.orientation.lock);
if (lockOrientation) { if (lockOrientation) {
try { try {
@ -39,7 +39,7 @@ events.on(playbackManager, 'playbackstart', function (e, player, state) {
events.on(playbackManager, 'playbackstop', function (e, playbackStopInfo) { events.on(playbackManager, 'playbackstop', function (e, playbackStopInfo) {
if (orientationLocked && !playbackStopInfo.nextMediaType) { if (orientationLocked && !playbackStopInfo.nextMediaType) {
/* eslint-disable-next-line compat/compat */ /* eslint-disable-next-line compat/compat */
var unlockOrientation = screen.unlockOrientation || screen.mozUnlockOrientation || screen.msUnlockOrientation || (screen.orientation && screen.orientation.unlock); var unlockOrientation = window.screen.unlockOrientation || window.screen.mozUnlockOrientation || window.screen.msUnlockOrientation || (window.screen.orientation && window.screen.orientation.unlock);
if (unlockOrientation) { if (unlockOrientation) {
try { try {

38
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';
@ -149,6 +148,28 @@ function showAspectRatioMenu(player, btn) {
}); });
} }
function showPlaybackRateMenu(player, btn) {
// each has a name and id
const currentId = playbackManager.getPlaybackRate(player);
const menuItems = playbackManager.getSupportedPlaybackRates(player).map(i => ({
id: i.id,
name: i.name,
selected: i.id === currentId
}));
return actionsheet.show({
items: menuItems,
positionTo: btn
}).then(function (id) {
if (id) {
playbackManager.setPlaybackRate(id, player);
return Promise.resolve();
}
return Promise.reject();
});
}
function showWithUser(options, player, user) { function showWithUser(options, player, user) {
var supportedCommands = playbackManager.getSupportedCommands(player); var supportedCommands = playbackManager.getSupportedCommands(player);
@ -166,6 +187,17 @@ function showWithUser(options, player, user) {
}); });
} }
if (supportedCommands.indexOf('PlaybackRate') !== -1) {
const currentPlaybackRateId = playbackManager.getPlaybackRate(player);
const currentPlaybackRate = playbackManager.getSupportedPlaybackRates(player).filter(i => i.id === currentPlaybackRateId)[0];
menuItems.push({
name: globalize.translate('PlaybackRate'),
id: 'playbackrate',
asideText: currentPlaybackRate ? currentPlaybackRate.name : null
});
}
if (user && user.Policy.EnableVideoPlaybackTranscoding) { if (user && user.Policy.EnableVideoPlaybackTranscoding) {
var secondaryQualityText = getQualitySecondaryText(player); var secondaryQualityText = getQualitySecondaryText(player);
@ -218,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);
}); });
@ -230,6 +262,8 @@ function handleSelectedOption(id, options, player) {
return showQualityMenu(player, options.positionTo); return showQualityMenu(player, options.positionTo);
case 'aspectratio': case 'aspectratio':
return showAspectRatioMenu(player, options.positionTo); return showAspectRatioMenu(player, options.positionTo);
case 'playbackrate':
return showPlaybackRateMenu(player, options.positionTo);
case 'repeatmode': case 'repeatmode':
return showRepeatModeMenu(player, options.positionTo); return showRepeatModeMenu(player, options.positionTo);
case 'stats': case 'stats':

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 => {

5
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()
@ -386,7 +385,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 = '';

210
src/components/pluginManager.js
View file

@ -1,37 +1,38 @@
define(['events', 'globalize'], function (events, globalize) { import events from 'events';
'use strict'; import globalize from 'globalize';
/* eslint-disable indent */
// TODO: replace with each plugin version // TODO: replace with each plugin version
var cacheParam = new Date().getTime(); var cacheParam = new Date().getTime();
function loadStrings(plugin) { class PluginManager {
var strings = plugin.getTranslations ? plugin.getTranslations() : []; pluginsList = [];
return globalize.loadStrings({
name: plugin.id || plugin.packageName,
strings: strings
});
}
function definePluginRoute(pluginManager, route, plugin) { get plugins() {
route.contentPath = pluginManager.mapPath(plugin, route.path); return this.pluginsList;
route.path = pluginManager.mapRoute(plugin, route); }
Emby.App.defineRoute(route, plugin.id); #loadStrings(plugin) {
} var strings = plugin.getTranslations ? plugin.getTranslations() : [];
return globalize.loadStrings({
name: plugin.id || plugin.packageName,
strings: strings
});
}
function PluginManager() { #definePluginRoute(route, plugin) {
this.pluginsList = []; route.contentPath = this.mapPath(plugin, route.path);
} route.path = this.#mapRoute(plugin, route);
PluginManager.prototype.loadPlugin = function(pluginSpec) { Emby.App.defineRoute(route, plugin.id);
var instance = this; }
function registerPlugin(plugin) { #registerPlugin(plugin) {
instance.register(plugin); this.#register(plugin);
if (plugin.getRoutes) { if (plugin.getRoutes) {
plugin.getRoutes().forEach(function (route) { plugin.getRoutes().forEach((route) => {
definePluginRoute(instance, route, plugin); this.#definePluginRoute(route, plugin);
}); });
} }
@ -40,7 +41,7 @@ define(['events', 'globalize'], function (events, globalize) {
return Promise.resolve(plugin); return Promise.resolve(plugin);
} else { } else {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
loadStrings(plugin) this.#loadStrings(plugin)
.then(function () { .then(function () {
resolve(plugin); resolve(plugin);
}) })
@ -49,103 +50,102 @@ define(['events', 'globalize'], function (events, globalize) {
} }
} }
if (typeof pluginSpec === 'string') { loadPlugin(pluginSpec) {
console.debug('Loading plugin (via deprecated requirejs method): ' + pluginSpec); if (typeof pluginSpec === 'string') {
console.debug('Loading plugin (via deprecated requirejs method): ' + pluginSpec);
return new Promise(function (resolve, reject) { return new Promise((resolve, reject) => {
require([pluginSpec], (pluginFactory) => { require([pluginSpec], (pluginFactory) => {
var plugin = pluginFactory.default ? new pluginFactory.default() : new pluginFactory(); var plugin = pluginFactory.default ? new pluginFactory.default() : new pluginFactory();
// See if it's already installed // See if it's already installed
var existing = instance.pluginsList.filter(function (p) { var existing = this.pluginsList.filter(function (p) {
return p.id === plugin.id; return p.id === plugin.id;
})[0]; })[0];
if (existing) { if (existing) {
resolve(pluginSpec); resolve(pluginSpec);
} }
plugin.installUrl = pluginSpec; plugin.installUrl = pluginSpec;
var separatorIndex = Math.max(pluginSpec.lastIndexOf('/'), pluginSpec.lastIndexOf('\\')); var separatorIndex = Math.max(pluginSpec.lastIndexOf('/'), pluginSpec.lastIndexOf('\\'));
plugin.baseUrl = pluginSpec.substring(0, separatorIndex); plugin.baseUrl = pluginSpec.substring(0, separatorIndex);
var paths = {}; var paths = {};
paths[plugin.id] = plugin.baseUrl; paths[plugin.id] = plugin.baseUrl;
requirejs.config({ requirejs.config({
waitSeconds: 0, waitSeconds: 0,
paths: paths paths: paths
});
this.#registerPlugin(plugin).then(resolve).catch(reject);
}); });
registerPlugin(plugin).then(resolve).catch(reject);
}); });
} else if (pluginSpec.then) {
return pluginSpec.then(pluginBuilder => {
return pluginBuilder();
}).then((plugin) => {
console.debug(`Plugin loaded: ${plugin.id}`);
return this.#registerPlugin(plugin);
});
} else {
const err = new TypeError('Plugins have to be a Promise that resolves to a plugin builder function or a RequireJS url (deprecated)');
console.error(err);
return Promise.reject(err);
}
}
// In lieu of automatic discovery, plugins will register dynamic objects
// Each object will have the following properties:
// name
// type (skin, screensaver, etc)
#register(obj) {
this.pluginsList.push(obj);
events.trigger(this, 'registered', [obj]);
}
ofType(type) {
return this.pluginsList.filter((o) => {
return o.type === type;
}); });
} else if (pluginSpec.then) {
return pluginSpec.then(pluginBuilder => {
return pluginBuilder();
}).then(plugin => {
console.debug(`Plugin loaded: ${plugin.id}`);
return registerPlugin(plugin);
});
} else {
const err = new Error('Plugins have to be a Promise that resolves to a plugin builder function or a requirejs urls (deprecated)');
console.error(err);
return Promise.reject(err);
}
};
// In lieu of automatic discovery, plugins will register dynamic objects
// Each object will have the following properties:
// name
// type (skin, screensaver, etc)
PluginManager.prototype.register = function (obj) {
this.pluginsList.push(obj);
events.trigger(this, 'registered', [obj]);
};
PluginManager.prototype.ofType = function (type) {
return this.pluginsList.filter(function (o) {
return o.type === type;
});
};
PluginManager.prototype.plugins = function () {
return this.pluginsList;
};
PluginManager.prototype.mapRoute = function (plugin, route) {
if (typeof plugin === 'string') {
plugin = this.pluginsList.filter(function (p) {
return (p.id || p.packageName) === plugin;
})[0];
} }
route = route.path || route; #mapRoute(plugin, route) {
if (typeof plugin === 'string') {
plugin = this.pluginsList.filter((p) => {
return (p.id || p.packageName) === plugin;
})[0];
}
if (route.toLowerCase().indexOf('http') === 0) { route = route.path || route;
return route;
if (route.toLowerCase().startsWith('http')) {
return route;
}
return '/plugins/' + plugin.id + '/' + route;
} }
return '/plugins/' + plugin.id + '/' + route; mapPath(plugin, path, addCacheParam) {
}; if (typeof plugin === 'string') {
plugin = this.pluginsList.filter((p) => {
return (p.id || p.packageName) === plugin;
})[0];
}
PluginManager.prototype.mapPath = function (plugin, path, addCacheParam) { var url = plugin.baseUrl + '/' + path;
if (typeof plugin === 'string') {
plugin = this.pluginsList.filter(function (p) { if (addCacheParam) {
return (p.id || p.packageName) === plugin; url += url.includes('?') ? '&' : '?';
})[0]; url += 'v=' + cacheParam;
}
return url;
} }
}
var url = plugin.baseUrl + '/' + path; /* eslint-enable indent */
if (addCacheParam) { export default new PluginManager();
url += url.indexOf('?') === -1 ? '?' : '&';
url += 'v=' + cacheParam;
}
return url;
};
return new PluginManager();
});

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);

9
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());
@ -118,8 +117,8 @@ 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({
@ -138,7 +137,7 @@ function showEditor(itemId, serverId) {
loading.show(); loading.show();
import('text!./recordingcreator.template.html').then(({default: template}) => { import('text!./recordingcreator.template.html').then(({ default: template }) => {
const dialogOptions = { const dialogOptions = {
removeOnClose: true, removeOnClose: true,
scrollY: false scrollY: false

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

@ -1,151 +1,154 @@
define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'connectionManager', 'require', 'loading', 'scrollHelper', 'imageLoader', 'scrollStyles', 'emby-button', 'emby-collapse', 'emby-input', 'paper-icon-button-light', 'css!./../formdialog', 'css!./recordingcreator', 'material-icons', 'flexStyles'], function (dialogHelper, globalize, layoutManager, mediaInfo, appHost, connectionManager, require, loading, scrollHelper, imageLoader) { import dialogHelper from 'dialogHelper';
'use strict'; import globalize from 'globalize';
import layoutManager from 'layoutManager';
import loading from 'loading';
import scrollHelper from 'scrollHelper';
import 'scrollStyles';
import 'emby-button';
import 'emby-collapse';
import 'emby-input';
import 'paper-icon-button-light';
import 'css!./../formdialog';
import 'css!./recordingcreator';
import 'material-icons';
import 'flexStyles';
scrollHelper = scrollHelper.default || scrollHelper; let currentDialog;
loading = loading.default || loading; let recordingDeleted = false;
layoutManager = layoutManager.default || layoutManager; let currentItemId;
let currentServerId;
let currentResolve;
var currentDialog; function deleteTimer(apiClient, timerId) {
var recordingDeleted = false; return import('recordingHelper').then(({ default: recordingHelper }) => {
var currentItemId; recordingHelper.cancelTimerWithConfirmation(timerId, apiClient.serverId());
var currentServerId; });
var currentResolve; }
function deleteTimer(apiClient, timerId) { function renderTimer(context, item, apiClient) {
return new Promise(function (resolve, reject) { context.querySelector('#txtPrePaddingMinutes').value = item.PrePaddingSeconds / 60;
require(['recordingHelper'], function (recordingHelper) { context.querySelector('#txtPostPaddingMinutes').value = item.PostPaddingSeconds / 60;
recordingHelper = recordingHelper.default || recordingHelper;
recordingHelper.cancelTimerWithConfirmation(timerId, apiClient.serverId()).then(resolve, reject); loading.hide();
}); }
function closeDialog(isDeleted) {
recordingDeleted = isDeleted;
dialogHelper.close(currentDialog);
}
function onSubmit(e) {
const form = this;
const apiClient = window.connectionManager.getApiClient(currentServerId);
apiClient.getLiveTvTimer(currentItemId).then(function (item) {
item.PrePaddingSeconds = form.querySelector('#txtPrePaddingMinutes').value * 60;
item.PostPaddingSeconds = form.querySelector('#txtPostPaddingMinutes').value * 60;
apiClient.updateLiveTvTimer(item).then(currentResolve);
});
e.preventDefault();
// Disable default form submission
return false;
}
function init(context) {
context.querySelector('.btnCancel').addEventListener('click', function () {
closeDialog(false);
});
context.querySelector('.btnCancelRecording').addEventListener('click', function () {
const apiClient = window.connectionManager.getApiClient(currentServerId);
deleteTimer(apiClient, currentItemId).then(function () {
closeDialog(true);
}); });
} });
function renderTimer(context, item, apiClient) { context.querySelector('form').addEventListener('submit', onSubmit);
context.querySelector('#txtPrePaddingMinutes').value = item.PrePaddingSeconds / 60; }
context.querySelector('#txtPostPaddingMinutes').value = item.PostPaddingSeconds / 60;
function reload(context, id) {
loading.show();
currentItemId = id;
const apiClient = window.connectionManager.getApiClient(currentServerId);
apiClient.getLiveTvTimer(id).then(function (result) {
renderTimer(context, result, apiClient);
loading.hide(); loading.hide();
} });
}
function closeDialog(isDeleted) { function showEditor(itemId, serverId, options) {
recordingDeleted = isDeleted; return new Promise(function (resolve, reject) {
recordingDeleted = false;
dialogHelper.close(currentDialog); currentServerId = serverId;
}
function onSubmit(e) {
var form = this;
var apiClient = connectionManager.getApiClient(currentServerId);
apiClient.getLiveTvTimer(currentItemId).then(function (item) {
item.PrePaddingSeconds = form.querySelector('#txtPrePaddingMinutes').value * 60;
item.PostPaddingSeconds = form.querySelector('#txtPostPaddingMinutes').value * 60;
apiClient.updateLiveTvTimer(item).then(currentResolve);
});
e.preventDefault();
// Disable default form submission
return false;
}
function init(context) {
context.querySelector('.btnCancel').addEventListener('click', function () {
closeDialog(false);
});
context.querySelector('.btnCancelRecording').addEventListener('click', function () {
var apiClient = connectionManager.getApiClient(currentServerId);
deleteTimer(apiClient, currentItemId).then(function () {
closeDialog(true);
});
});
context.querySelector('form').addEventListener('submit', onSubmit);
}
function reload(context, id) {
loading.show(); loading.show();
currentItemId = id; options = options || {};
currentResolve = resolve;
var apiClient = connectionManager.getApiClient(currentServerId); import('text!./recordingeditor.template.html').then(({default: template}) => {
apiClient.getLiveTvTimer(id).then(function (result) { const dialogOptions = {
renderTimer(context, result, apiClient); removeOnClose: true,
loading.hide(); scrollY: false
}); };
}
function showEditor(itemId, serverId, options) { if (layoutManager.tv) {
return new Promise(function (resolve, reject) { dialogOptions.size = 'fullscreen';
recordingDeleted = false; }
currentServerId = serverId;
loading.show();
options = options || {};
currentResolve = resolve;
require(['text!./recordingeditor.template.html'], function (template) { const dlg = dialogHelper.createDialog(dialogOptions);
var dialogOptions = {
removeOnClose: true,
scrollY: false
};
if (layoutManager.tv) { dlg.classList.add('formDialog');
dialogOptions.size = 'fullscreen'; dlg.classList.add('recordingDialog');
if (!layoutManager.tv) {
dlg.style['min-width'] = '20%';
dlg.classList.add('dialog-fullscreen-lowres');
}
let html = '';
html += globalize.translateHtml(template, 'core');
dlg.innerHTML = html;
if (options.enableCancel === false) {
dlg.querySelector('.formDialogFooter').classList.add('hide');
}
currentDialog = dlg;
dlg.addEventListener('closing', function () {
if (!recordingDeleted) {
dlg.querySelector('.btnSubmit').click();
} }
var dlg = dialogHelper.createDialog(dialogOptions);
dlg.classList.add('formDialog');
dlg.classList.add('recordingDialog');
if (!layoutManager.tv) {
dlg.style['min-width'] = '20%';
dlg.classList.add('dialog-fullscreen-lowres');
}
var html = '';
html += globalize.translateHtml(template, 'core');
dlg.innerHTML = html;
if (options.enableCancel === false) {
dlg.querySelector('.formDialogFooter').classList.add('hide');
}
currentDialog = dlg;
dlg.addEventListener('closing', function () {
if (!recordingDeleted) {
dlg.querySelector('.btnSubmit').click();
}
});
dlg.addEventListener('close', function () {
if (recordingDeleted) {
resolve({
updated: true,
deleted: true
});
}
});
if (layoutManager.tv) {
scrollHelper.centerFocus.on(dlg.querySelector('.formDialogContent'), false);
}
init(dlg);
reload(dlg, itemId);
dialogHelper.open(dlg);
}); });
});
}
return { dlg.addEventListener('close', function () {
show: showEditor if (recordingDeleted) {
}; resolve({
}); updated: true,
deleted: true
});
}
});
if (layoutManager.tv) {
scrollHelper.centerFocus.on(dlg.querySelector('.formDialogContent'), false);
}
init(dlg);
reload(dlg, itemId);
dialogHelper.open(dlg);
});
});
}
export default {
show: showEditor
};

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

@ -1,223 +1,125 @@
define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loading', 'apphost', 'dom', 'recordingHelper', 'events', 'paper-icon-button-light', 'emby-button', 'css!./recordingfields', 'flexStyles'], function (globalize, connectionManager, serverNotifications, require, loading, appHost, dom, recordingHelper, events) { import globalize from 'globalize';
'use strict'; import serverNotifications from 'serverNotifications';
import loading from 'loading';
import dom from 'dom';
import recordingHelper from 'recordingHelper';
import events from 'events';
import 'paper-icon-button-light';
import 'emby-button';
import 'css!./recordingfields';
import 'flexStyles';
serverNotifications = serverNotifications.default || serverNotifications; /*eslint prefer-const: "error"*/
recordingHelper = recordingHelper.default || recordingHelper;
loading = loading.default || loading;
function loadData(parent, program, apiClient) { function loadData(parent, program, apiClient) {
if (program.IsSeries) { if (program.IsSeries) {
parent.querySelector('.recordSeriesContainer').classList.remove('hide'); parent.querySelector('.recordSeriesContainer').classList.remove('hide');
} else {
parent.querySelector('.recordSeriesContainer').classList.add('hide');
}
if (program.SeriesTimerId) {
parent.querySelector('.btnManageSeriesRecording').classList.remove('hide');
parent.querySelector('.seriesRecordingButton .recordingIcon').classList.add('recordingIcon-active');
parent.querySelector('.seriesRecordingButton .buttonText').innerHTML = globalize.translate('CancelSeries');
} else {
parent.querySelector('.btnManageSeriesRecording').classList.add('hide');
parent.querySelector('.seriesRecordingButton .recordingIcon').classList.remove('recordingIcon-active');
parent.querySelector('.seriesRecordingButton .buttonText').innerHTML = globalize.translate('RecordSeries');
}
if (program.TimerId && program.Status !== 'Cancelled') {
parent.querySelector('.btnManageRecording').classList.remove('hide');
parent.querySelector('.singleRecordingButton .recordingIcon').classList.add('recordingIcon-active');
if (program.Status === 'InProgress') {
parent.querySelector('.singleRecordingButton .buttonText').innerHTML = globalize.translate('StopRecording');
} else { } else {
parent.querySelector('.recordSeriesContainer').classList.add('hide'); parent.querySelector('.singleRecordingButton .buttonText').innerHTML = globalize.translate('DoNotRecord');
} }
} else {
parent.querySelector('.btnManageRecording').classList.add('hide');
parent.querySelector('.singleRecordingButton .recordingIcon').classList.remove('recordingIcon-active');
parent.querySelector('.singleRecordingButton .buttonText').innerHTML = globalize.translate('Record');
}
}
if (program.SeriesTimerId) { function fetchData(instance) {
parent.querySelector('.btnManageSeriesRecording').classList.remove('hide'); const options = instance.options;
parent.querySelector('.seriesRecordingButton .recordingIcon').classList.add('recordingIcon-active'); const apiClient = window.connectionManager.getApiClient(options.serverId);
parent.querySelector('.seriesRecordingButton .buttonText').innerHTML = globalize.translate('CancelSeries');
} else { options.parent.querySelector('.recordingFields').classList.remove('hide');
parent.querySelector('.btnManageSeriesRecording').classList.add('hide'); return apiClient.getLiveTvProgram(options.programId, apiClient.getCurrentUserId()).then(function (program) {
parent.querySelector('.seriesRecordingButton .recordingIcon').classList.remove('recordingIcon-active'); instance.TimerId = program.TimerId;
parent.querySelector('.seriesRecordingButton .buttonText').innerHTML = globalize.translate('RecordSeries'); instance.Status = program.Status;
instance.SeriesTimerId = program.SeriesTimerId;
loadData(options.parent, program, apiClient);
});
}
function onTimerChangedExternally(e, apiClient, data) {
const options = this.options;
let refresh = false;
if (data.Id) {
if (this.TimerId === data.Id) {
refresh = true;
} }
}
if (program.TimerId && program.Status !== 'Cancelled') { if (data.ProgramId && options) {
parent.querySelector('.btnManageRecording').classList.remove('hide'); if (options.programId === data.ProgramId) {
parent.querySelector('.singleRecordingButton .recordingIcon').classList.add('recordingIcon-active'); refresh = true;
if (program.Status === 'InProgress') {
parent.querySelector('.singleRecordingButton .buttonText').innerHTML = globalize.translate('StopRecording');
} else {
parent.querySelector('.singleRecordingButton .buttonText').innerHTML = globalize.translate('DoNotRecord');
}
} else {
parent.querySelector('.btnManageRecording').classList.add('hide');
parent.querySelector('.singleRecordingButton .recordingIcon').classList.remove('recordingIcon-active');
parent.querySelector('.singleRecordingButton .buttonText').innerHTML = globalize.translate('Record');
} }
} }
function fetchData(instance) { if (refresh) {
var options = instance.options; this.refresh();
var apiClient = connectionManager.getApiClient(options.serverId);
options.parent.querySelector('.recordingFields').classList.remove('hide');
return apiClient.getLiveTvProgram(options.programId, apiClient.getCurrentUserId()).then(function (program) {
instance.TimerId = program.TimerId;
instance.Status = program.Status;
instance.SeriesTimerId = program.SeriesTimerId;
loadData(options.parent, program, apiClient);
});
} }
}
function onTimerChangedExternally(e, apiClient, data) { function onSeriesTimerChangedExternally(e, apiClient, data) {
var options = this.options; const options = this.options;
var refresh = false; let refresh = false;
if (data.Id) { if (data.Id) {
if (this.TimerId === data.Id) { if (this.SeriesTimerId === data.Id) {
refresh = true; refresh = true;
}
} }
if (data.ProgramId && options) { }
if (options.programId === data.ProgramId) { if (data.ProgramId && options) {
refresh = true; if (options.programId === data.ProgramId) {
} refresh = true;
}
if (refresh) {
this.refresh();
} }
} }
function onSeriesTimerChangedExternally(e, apiClient, data) { if (refresh) {
var options = this.options; this.refresh();
var refresh = false;
if (data.Id) {
if (this.SeriesTimerId === data.Id) {
refresh = true;
}
}
if (data.ProgramId && options) {
if (options.programId === data.ProgramId) {
refresh = true;
}
}
if (refresh) {
this.refresh();
}
} }
}
function RecordingEditor(options) { class RecordingEditor {
constructor(options) {
this.options = options; this.options = options;
this.embed(); this.embed();
var timerChangedHandler = onTimerChangedExternally.bind(this); const timerChangedHandler = onTimerChangedExternally.bind(this);
this.timerChangedHandler = timerChangedHandler; this.timerChangedHandler = timerChangedHandler;
events.on(serverNotifications, 'TimerCreated', timerChangedHandler); events.on(serverNotifications, 'TimerCreated', timerChangedHandler);
events.on(serverNotifications, 'TimerCancelled', timerChangedHandler); events.on(serverNotifications, 'TimerCancelled', timerChangedHandler);
var seriesTimerChangedHandler = onSeriesTimerChangedExternally.bind(this); const seriesTimerChangedHandler = onSeriesTimerChangedExternally.bind(this);
this.seriesTimerChangedHandler = seriesTimerChangedHandler; this.seriesTimerChangedHandler = seriesTimerChangedHandler;
events.on(serverNotifications, 'SeriesTimerCreated', seriesTimerChangedHandler); events.on(serverNotifications, 'SeriesTimerCreated', seriesTimerChangedHandler);
events.on(serverNotifications, 'SeriesTimerCancelled', seriesTimerChangedHandler); events.on(serverNotifications, 'SeriesTimerCancelled', seriesTimerChangedHandler);
} }
function onManageRecordingClick(e) { embed() {
var options = this.options; const self = this;
if (!this.TimerId || this.Status === 'Cancelled') {
return;
}
var self = this;
require(['recordingEditor'], function (recordingEditor) {
recordingEditor.show(self.TimerId, options.serverId, {
enableCancel: false
}).then(function () {
self.changed = true;
});
});
}
function onManageSeriesRecordingClick(e) {
var options = this.options;
if (!this.SeriesTimerId) {
return;
}
var self = this;
require(['seriesRecordingEditor'], function (seriesRecordingEditor) {
seriesRecordingEditor.show(self.SeriesTimerId, options.serverId, {
enableCancel: false
}).then(function () {
self.changed = true;
});
});
}
function onRecordChange(e) {
this.changed = true;
var self = this;
var options = this.options;
var apiClient = connectionManager.getApiClient(options.serverId);
var button = dom.parentWithTag(e.target, 'BUTTON');
var isChecked = !button.querySelector('.material-icons').classList.contains('recordingIcon-active');
var hasEnabledTimer = this.TimerId && this.Status !== 'Cancelled';
if (isChecked) {
if (!hasEnabledTimer) {
loading.show();
recordingHelper.createRecording(apiClient, options.programId, false).then(function () {
events.trigger(self, 'recordingchanged');
fetchData(self);
loading.hide();
});
}
} else {
if (hasEnabledTimer) {
loading.show();
recordingHelper.cancelTimer(apiClient, this.TimerId, true).then(function () {
events.trigger(self, 'recordingchanged');
fetchData(self);
loading.hide();
});
}
}
}
function sendToast(msg) {
require(['toast'], function (toast) {
toast(msg);
});
}
function onRecordSeriesChange(e) {
this.changed = true;
var self = this;
var options = this.options;
var apiClient = connectionManager.getApiClient(options.serverId);
var button = dom.parentWithTag(e.target, 'BUTTON');
var isChecked = !button.querySelector('.material-icons').classList.contains('recordingIcon-active');
if (isChecked) {
options.parent.querySelector('.recordSeriesContainer').classList.remove('hide');
if (!this.SeriesTimerId) {
var promise = this.TimerId ?
recordingHelper.changeRecordingToSeries(apiClient, this.TimerId, options.programId) :
recordingHelper.createRecording(apiClient, options.programId, true);
promise.then(function () {
fetchData(self);
});
}
} else {
if (this.SeriesTimerId) {
apiClient.cancelLiveTvSeriesTimer(this.SeriesTimerId).then(function () {
sendToast(globalize.translate('RecordingCancelled'));
fetchData(self);
});
}
}
}
RecordingEditor.prototype.embed = function () {
var self = this;
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
require(['text!./recordingfields.template.html'], function (template) { import('text!./recordingfields.template.html').then(({default: template}) => {
var options = self.options; const options = self.options;
var context = options.parent; const context = options.parent;
context.innerHTML = globalize.translateHtml(template, 'core'); context.innerHTML = globalize.translateHtml(template, 'core');
context.querySelector('.singleRecordingButton').addEventListener('click', onRecordChange.bind(self)); context.querySelector('.singleRecordingButton').addEventListener('click', onRecordChange.bind(self));
@ -228,29 +130,134 @@ define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loa
fetchData(self).then(resolve); fetchData(self).then(resolve);
}); });
}); });
}; }
RecordingEditor.prototype.hasChanged = function () { hasChanged() {
return this.changed; return this.changed;
}; }
RecordingEditor.prototype.refresh = function () { refresh() {
fetchData(this); fetchData(this);
}; }
RecordingEditor.prototype.destroy = function () { destroy() {
var timerChangedHandler = this.timerChangedHandler; const timerChangedHandler = this.timerChangedHandler;
this.timerChangedHandler = null; this.timerChangedHandler = null;
events.off(serverNotifications, 'TimerCreated', timerChangedHandler); events.off(serverNotifications, 'TimerCreated', timerChangedHandler);
events.off(serverNotifications, 'TimerCancelled', timerChangedHandler); events.off(serverNotifications, 'TimerCancelled', timerChangedHandler);
var seriesTimerChangedHandler = this.seriesTimerChangedHandler; const seriesTimerChangedHandler = this.seriesTimerChangedHandler;
this.seriesTimerChangedHandler = null; this.seriesTimerChangedHandler = null;
events.off(serverNotifications, 'SeriesTimerCreated', seriesTimerChangedHandler); events.off(serverNotifications, 'SeriesTimerCreated', seriesTimerChangedHandler);
events.off(serverNotifications, 'SeriesTimerCancelled', seriesTimerChangedHandler); events.off(serverNotifications, 'SeriesTimerCancelled', seriesTimerChangedHandler);
}; }
}
return RecordingEditor; function onManageRecordingClick(e) {
}); const options = this.options;
if (!this.TimerId || this.Status === 'Cancelled') {
return;
}
const self = this;
import('recordingEditor').then(({default: recordingEditor}) => {
recordingEditor.show(self.TimerId, options.serverId, {
enableCancel: false
}).then(function () {
self.changed = true;
});
});
}
function onManageSeriesRecordingClick(e) {
const options = this.options;
if (!this.SeriesTimerId) {
return;
}
const self = this;
import('seriesRecordingEditor').then(({default: seriesRecordingEditor}) => {
seriesRecordingEditor.show(self.SeriesTimerId, options.serverId, {
enableCancel: false
}).then(function () {
self.changed = true;
});
});
}
function onRecordChange(e) {
this.changed = true;
const self = this;
const options = this.options;
const apiClient = window.connectionManager.getApiClient(options.serverId);
const button = dom.parentWithTag(e.target, 'BUTTON');
const isChecked = !button.querySelector('.material-icons').classList.contains('recordingIcon-active');
const hasEnabledTimer = this.TimerId && this.Status !== 'Cancelled';
if (isChecked) {
if (!hasEnabledTimer) {
loading.show();
recordingHelper.createRecording(apiClient, options.programId, false).then(function () {
events.trigger(self, 'recordingchanged');
fetchData(self);
loading.hide();
});
}
} else {
if (hasEnabledTimer) {
loading.show();
recordingHelper.cancelTimer(apiClient, this.TimerId, true).then(function () {
events.trigger(self, 'recordingchanged');
fetchData(self);
loading.hide();
});
}
}
}
function sendToast(msg) {
import('toast').then(({default: toast}) => {
toast(msg);
});
}
function onRecordSeriesChange(e) {
this.changed = true;
const self = this;
const options = this.options;
const apiClient = window.connectionManager.getApiClient(options.serverId);
const button = dom.parentWithTag(e.target, 'BUTTON');
const isChecked = !button.querySelector('.material-icons').classList.contains('recordingIcon-active');
if (isChecked) {
options.parent.querySelector('.recordSeriesContainer').classList.remove('hide');
if (!this.SeriesTimerId) {
const promise = this.TimerId ?
recordingHelper.changeRecordingToSeries(apiClient, this.TimerId, options.programId) :
recordingHelper.createRecording(apiClient, options.programId, true);
promise.then(function () {
fetchData(self);
});
}
} else {
if (this.SeriesTimerId) {
apiClient.cancelLiveTvSeriesTimer(this.SeriesTimerId).then(function () {
sendToast(globalize.translate('RecordingCancelled'));
fetchData(self);
});
}
}
}
export default RecordingEditor;

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';

15
src/components/remotecontrol/remotecontrol.css
View file

@ -222,18 +222,10 @@
margin: 0; margin: 0;
} }
.layout-mobile .nowPlayingSecondaryButtons .btnShuffleQueue {
display: none;
}
.layout-mobile .nowPlayingSecondaryButtons .volumecontrol { .layout-mobile .nowPlayingSecondaryButtons .volumecontrol {
display: none; display: none;
} }
.layout-mobile .nowPlayingSecondaryButtons .btnRepeat {
display: none;
}
.layout-desktop .nowPlayingInfoButtons .btnRepeat, .layout-desktop .nowPlayingInfoButtons .btnRepeat,
.layout-tv .nowPlayingInfoButtons .btnRepeat { .layout-tv .nowPlayingInfoButtons .btnRepeat {
display: none; display: none;
@ -362,7 +354,8 @@
border-radius: 0; border-radius: 0;
} }
.nowPlayingInfoButtons .btnRepeat { .nowPlayingInfoButtons .btnRepeat,
.nowPlayingInfoButtons .btnRewind {
position: absolute; position: absolute;
left: 0; left: 0;
margin-left: 0; margin-left: 0;
@ -370,7 +363,8 @@
font-size: smaller; font-size: smaller;
} }
.nowPlayingInfoButtons .btnShuffleQueue { .nowPlayingInfoButtons .btnShuffleQueue,
.nowPlayingInfoButtons .btnFastForward {
position: absolute; position: absolute;
right: 0; right: 0;
margin-right: 0; margin-right: 0;
@ -468,7 +462,6 @@
} }
@media all and (max-width: 63em) { @media all and (max-width: 63em) {
.nowPlayingSecondaryButtons .repeatToggleButton,
.nowPlayingInfoButtons .playlist .listItemMediaInfo, .nowPlayingInfoButtons .playlist .listItemMediaInfo,
.nowPlayingInfoButtons .btnStop { .nowPlayingInfoButtons .btnStop {
display: none !important; display: none !important;

55
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';
@ -66,7 +65,7 @@ function showSubtitleMenu(context, player, button, item) {
}); });
menuItems.unshift({ menuItems.unshift({
id: -1, id: -1,
name: globalize.translate('ButtonOff'), name: globalize.translate('Off'),
selected: currentIndex == null selected: currentIndex == null
}); });
@ -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;
@ -134,7 +133,7 @@ function imageUrl(item, options) {
function updateNowPlayingInfo(context, state, serverId) { function updateNowPlayingInfo(context, state, serverId) {
const item = state.NowPlayingItem; const item = state.NowPlayingItem;
const displayName = item ? getNowPlayingNameHtml(item).replace('<br/>', ' - ') : ''; const displayName = item ? getNowPlayingNameHtml(item).replace('<br/>', ' - ') : '';
if (typeof item !== 'undefined') { if (item) {
const nowPlayingServerId = (item.ServerId || serverId); const nowPlayingServerId = (item.ServerId || serverId);
if (item.Type == 'Audio' || item.MediaStreams[0].Type == 'Audio') { if (item.Type == 'Audio' || item.MediaStreams[0].Type == 'Audio') {
const songName = item.Name; const songName = item.Name;
@ -192,11 +191,11 @@ function updateNowPlayingInfo(context, state, serverId) {
context.querySelector('.nowPlayingPageTitle').classList.add('hide'); context.querySelector('.nowPlayingPageTitle').classList.add('hide');
} }
const url = item ? seriesImageUrl(item, { const url = seriesImageUrl(item, {
maxHeight: 300 maxHeight: 300
}) || imageUrl(item, { }) || imageUrl(item, {
maxHeight: 300 maxHeight: 300
}) : null; });
let contextButton = context.querySelector('.btnToggleContextMenu'); let contextButton = context.querySelector('.btnToggleContextMenu');
// We remove the previous event listener by replacing the item in each update event // We remove the previous event listener by replacing the item in each update event
@ -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 () {
@ -228,18 +227,16 @@ function updateNowPlayingInfo(context, state, serverId) {
}); });
}); });
setImageUrl(context, state, url); setImageUrl(context, state, url);
if (item) { backdrop.setBackdrops([item]);
backdrop.setBackdrops([item]); apiClient.getItem(apiClient.getCurrentUserId(), item.Id).then(function (fullItem) {
apiClient.getItem(apiClient.getCurrentUserId(), item.Id).then(function (fullItem) { const userData = fullItem.UserData || {};
const userData = fullItem.UserData || {}; const likes = userData.Likes == null ? '' : userData.Likes;
const likes = userData.Likes == null ? '' : userData.Likes; context.querySelector('.nowPlayingPageUserDataButtonsTitle').innerHTML = '<button is="emby-ratingbutton" type="button" class="listItemButton paper-icon-button-light" data-id="' + fullItem.Id + '" data-serverid="' + fullItem.ServerId + '" data-itemtype="' + fullItem.Type + '" data-likes="' + likes + '" data-isfavorite="' + userData.IsFavorite + '"><span class="material-icons favorite"></span></button>';
context.querySelector('.nowPlayingPageUserDataButtonsTitle').innerHTML = '<button is="emby-ratingbutton" type="button" class="listItemButton paper-icon-button-light" data-id="' + fullItem.Id + '" data-serverid="' + fullItem.ServerId + '" data-itemtype="' + fullItem.Type + '" data-likes="' + likes + '" data-isfavorite="' + userData.IsFavorite + '"><span class="material-icons favorite"></span></button>'; context.querySelector('.nowPlayingPageUserDataButtons').innerHTML = '<button is="emby-ratingbutton" type="button" class="listItemButton paper-icon-button-light" data-id="' + fullItem.Id + '" data-serverid="' + fullItem.ServerId + '" data-itemtype="' + fullItem.Type + '" data-likes="' + likes + '" data-isfavorite="' + userData.IsFavorite + '"><span class="material-icons favorite"></span></button>';
context.querySelector('.nowPlayingPageUserDataButtons').innerHTML = '<button is="emby-ratingbutton" type="button" class="listItemButton paper-icon-button-light" data-id="' + fullItem.Id + '" data-serverid="' + fullItem.ServerId + '" data-itemtype="' + fullItem.Type + '" data-likes="' + likes + '" data-isfavorite="' + userData.IsFavorite + '"><span class="material-icons favorite"></span></button>'; });
}); } else {
} else { backdrop.clearBackdrop();
backdrop.clearBackdrop(); context.querySelector('.nowPlayingPageUserDataButtons').innerHTML = '';
context.querySelector('.nowPlayingPageUserDataButtons').innerHTML = '';
}
} }
} }
@ -332,8 +329,14 @@ export default function () {
buttonVisible(context.querySelector('.btnNextTrack'), item != null); buttonVisible(context.querySelector('.btnNextTrack'), item != null);
buttonVisible(context.querySelector('.btnPreviousTrack'), item != null); buttonVisible(context.querySelector('.btnPreviousTrack'), item != null);
if (layoutManager.mobile) { if (layoutManager.mobile) {
buttonVisible(context.querySelector('.btnRewind'), false); const playingVideo = playbackManager.isPlayingVideo() && item !== null;
buttonVisible(context.querySelector('.btnFastForward'), false); const playingAudio = !playbackManager.isPlayingVideo() && item !== null;
buttonVisible(context.querySelector('.btnRepeat'), playingAudio);
buttonVisible(context.querySelector('.btnShuffleQueue'), playingAudio);
buttonVisible(context.querySelector('.btnRewind'), playingVideo);
buttonVisible(context.querySelector('.btnFastForward'), playingVideo);
buttonVisible(context.querySelector('.nowPlayingSecondaryButtons .btnShuffleQueue'), playingVideo);
buttonVisible(context.querySelector('.nowPlayingSecondaryButtons .btnRepeat'), playingVideo);
} else { } else {
buttonVisible(context.querySelector('.btnRewind'), item != null); buttonVisible(context.querySelector('.btnRewind'), item != null);
buttonVisible(context.querySelector('.btnFastForward'), item != null); buttonVisible(context.querySelector('.btnFastForward'), item != null);
@ -615,7 +618,7 @@ export default function () {
lastUpdateTime = now; lastUpdateTime = now;
const player = this; const player = this;
currentRuntimeTicks = playbackManager.duration(player); currentRuntimeTicks = playbackManager.duration(player);
updateTimeDisplay(playbackManager.currentTime(player), currentRuntimeTicks); updateTimeDisplay(playbackManager.currentTime(player) * 10000, currentRuntimeTicks);
} }
} }

2
src/components/require/requiretext.js
View file

@ -2,7 +2,7 @@ define(function () {
'use strict'; 'use strict';
// hack to work around the server's auto-redirection feature // hack to work around the server's auto-redirection feature
var addRedirectPrevention = self.dashboardVersion != null && self.Dashboard && !self.AppInfo.isNativeApp; var addRedirectPrevention = window.dashboardVersion != null && window.Dashboard && !window.AppInfo.isNativeApp;
return { return {

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);
} }

1
src/components/serviceworker/notifications.js
View file

@ -26,6 +26,7 @@
}); });
} }
/* eslint-disable-next-line no-restricted-globals -- self is valid in a serviceworker environment */
self.addEventListener('notificationclick', function (event) { self.addEventListener('notificationclick', function (event) {
var notification = event.notification; var notification = event.notification;
notification.close(); notification.close();

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;

5
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) {
@ -256,7 +255,7 @@ export default function (options) {
/** /**
* Handles zoom changes. * Handles zoom changes.
*/ */
function onZoomChange(scale, imageEl, slideEl) { function onZoomChange(swiper, scale, imageEl, slideEl) {
const zoomImage = slideEl.querySelector('.swiper-zoom-fakeimg'); const zoomImage = slideEl.querySelector('.swiper-zoom-fakeimg');
if (zoomImage) { if (zoomImage) {

9
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';
@ -21,7 +20,7 @@ let hasChanges;
function downloadRemoteSubtitles(context, id) { function downloadRemoteSubtitles(context, id) {
let url = 'Items/' + currentItem.Id + '/RemoteSearch/Subtitles/' + id; let url = 'Items/' + currentItem.Id + '/RemoteSearch/Subtitles/' + id;
let apiClient = connectionManager.getApiClient(currentItem.ServerId); let apiClient = window.connectionManager.getApiClient(currentItem.ServerId);
apiClient.ajax({ apiClient.ajax({
type: 'POST', type: 'POST',
@ -55,7 +54,7 @@ function deleteLocalSubtitle(context, index) {
let itemId = currentItem.Id; let itemId = currentItem.Id;
let url = 'Videos/' + itemId + '/Subtitles/' + index; let url = 'Videos/' + itemId + '/Subtitles/' + index;
let apiClient = connectionManager.getApiClient(currentItem.ServerId); let apiClient = window.connectionManager.getApiClient(currentItem.ServerId);
apiClient.ajax({ apiClient.ajax({
@ -243,7 +242,7 @@ function searchForSubtitles(context, language) {
loading.show(); loading.show();
let apiClient = connectionManager.getApiClient(currentItem.ServerId); let apiClient = window.connectionManager.getApiClient(currentItem.ServerId);
let url = apiClient.getUrl('Items/' + currentItem.Id + '/RemoteSearch/Subtitles/' + language); let url = apiClient.getUrl('Items/' + currentItem.Id + '/RemoteSearch/Subtitles/' + language);
apiClient.getJSON(url).then(function (results) { apiClient.getJSON(url).then(function (results) {
@ -356,7 +355,7 @@ function centerFocus(elem, horiz, on) {
function showEditorInternal(itemId, serverId, template) { function showEditorInternal(itemId, serverId, template) {
hasChanges = false; hasChanges = false;
let apiClient = connectionManager.getApiClient(serverId); let 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 = { let dialogOptions = {
removeOnClose: true, removeOnClose: true,

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;

2
src/components/subtitlesettings/subtitlesettings.template.html
View file

@ -14,7 +14,7 @@
<option value="Smart">${Smart}</option> <option value="Smart">${Smart}</option>
<option value="OnlyForced">${OnlyForcedSubtitles}</option> <option value="OnlyForced">${OnlyForcedSubtitles}</option>
<option value="Always">${AlwaysPlaySubtitles}</option> <option value="Always">${AlwaysPlaySubtitles}</option>
<option value="None">${NoSubtitles}</option> <option value="None">${None}</option>
</select> </select>
<div class="fieldDescription subtitlesDefaultHelp subtitlesHelp hide">${DefaultSubtitlesHelp}</div> <div class="fieldDescription subtitlesDefaultHelp subtitlesHelp hide">${DefaultSubtitlesHelp}</div>
<div class="fieldDescription subtitlesSmartHelp subtitlesHelp hide">${SmartSubtitlesHelp}</div> <div class="fieldDescription subtitlesSmartHelp subtitlesHelp hide">${SmartSubtitlesHelp}</div>

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 {

11
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
}); });
@ -741,7 +740,7 @@ class SyncPlayManager {
const playAtTime = this.lastCommand.When; const playAtTime = this.lastCommand.When;
const currentPositionTicks = playbackManager.currentTime(); const currentPositionTicks = playbackManager.currentTime() * 10000;
// Estimate PositionTicks on server // Estimate PositionTicks on server
const serverPositionTicks = this.lastCommand.PositionTicks + ((currentTime - playAtTime) + this.timeOffsetWithServer) * 10000; const serverPositionTicks = this.lastCommand.PositionTicks + ((currentTime - playAtTime) + this.timeOffsetWithServer) * 10000;
// Measure delay that needs to be recovered // Measure delay that needs to be recovered

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) {

13
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);
} }
} }
@ -256,7 +255,7 @@ import 'flexStyles';
const runtimeTicks = playbackManager.duration(options.player); const runtimeTicks = playbackManager.duration(options.player);
if (runtimeTicks) { if (runtimeTicks) {
const timeRemainingTicks = runtimeTicks - playbackManager.currentTime(options.player); const timeRemainingTicks = runtimeTicks - playbackManager.currentTime(options.player) * 10000;
return Math.round(timeRemainingTicks / 10000); return Math.round(timeRemainingTicks / 10000);
} }

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) => { let 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>

21
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');
@ -737,7 +736,7 @@ import 'emby-itemscontainer';
shutdown: function (btn) { shutdown: function (btn) {
import('confirm').then(({default: confirm}) => { import('confirm').then(({default: confirm}) => {
confirm({ confirm({
title: globalize.translate('HeaderShutdown'), title: globalize.translate('ButtonShutdown'),
text: globalize.translate('MessageConfirmShutdown'), text: globalize.translate('MessageConfirmShutdown'),
confirmText: globalize.translate('ButtonShutdown'), confirmText: globalize.translate('ButtonShutdown'),
primary: 'delete' primary: 'delete'

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

@ -9,7 +9,7 @@
</div> </div>
<div class="inputContainer"> <div class="inputContainer">
<input is="emby-input" type="text" id="txtCustomName" label="${LabelCustomDeviceDisplayName}" /> <input is="emby-input" type="text" id="txtCustomName" label="${LabelDisplayName}" />
<div class="fieldDescription">${LabelCustomDeviceDisplayNameHelp}</div> <div class="fieldDescription">${LabelCustomDeviceDisplayNameHelp}</div>
</div> </div>
</div> </div>

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

@ -3,7 +3,7 @@
<div class="content-primary"> <div class="content-primary">
<div class="verticalSection verticalSection"> <div class="verticalSection verticalSection">
<div class="sectionTitleContainer sectionTitleContainer-cards flex align-items-center"> <div class="sectionTitleContainer sectionTitleContainer-cards flex align-items-center">
<h2 class="sectionTitle sectionTitle-cards">${TabDevices}</h2> <h2 class="sectionTitle sectionTitle-cards">${HeaderDevices}</h2>
<a is="emby-linkbutton" rel="noopener noreferrer" class="raised button-alt headerHelpButton" target="_blank" href="https://docs.jellyfin.org/general/server/devices.html">${Help}</a> <a is="emby-linkbutton" rel="noopener noreferrer" class="raised button-alt headerHelpButton" target="_blank" href="https://docs.jellyfin.org/general/server/devices.html">${Help}</a>
</div> </div>
</div> </div>

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

@ -21,7 +21,7 @@ import 'cardStyle';
confirm({ confirm({
text: msg, text: msg,
title: globalize.translate('HeaderDeleteDevice'), title: globalize.translate('HeaderDeleteDevice'),
confirmText: globalize.translate('ButtonDelete'), confirmText: globalize.translate('Delete'),
primary: 'delete' primary: 'delete'
}).then(function () { }).then(function () {
loading.show(); loading.show();

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

@ -8,7 +8,7 @@
</div> </div>
</div> </div>
<div data-role="controlgroup" data-type="horizontal" data-mini="true"> <div data-role="controlgroup" data-type="horizontal" data-mini="true">
<a href="#" is="emby-linkbutton" data-role="button" class="radioTabButton" id="radioInfo" data-value="tabInfo">${TabInfo}</a> <a href="#" is="emby-linkbutton" data-role="button" class="radioTabButton" id="radioInfo" data-value="tabInfo">${ButtonInfo}</a>
<a href="#" is="emby-linkbutton" data-role="button" class="radioTabButton" id="radioDirectPlay" data-value="tabDirectPlayProfiles">${TabDirectPlay}</a> <a href="#" is="emby-linkbutton" data-role="button" class="radioTabButton" id="radioDirectPlay" data-value="tabDirectPlayProfiles">${TabDirectPlay}</a>
<a href="#" is="emby-linkbutton" data-role="button" class="radioTabButton" id="radioTranscoding" data-value="tabTranscodingProfiles">${Transcoding}</a> <a href="#" is="emby-linkbutton" data-role="button" class="radioTabButton" id="radioTranscoding" data-value="tabTranscodingProfiles">${Transcoding}</a>
<a href="#" is="emby-linkbutton" data-role="button" class="radioTabButton" id="radioContainers" data-value="tabContainerProfiles">${TabContainers}</a> <a href="#" is="emby-linkbutton" data-role="button" class="radioTabButton" id="radioContainers" data-value="tabContainerProfiles">${TabContainers}</a>
@ -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>
@ -231,31 +231,31 @@
</div> </div>
<div class="tabContent tabDirectPlayProfiles"> <div class="tabContent tabDirectPlayProfiles">
<p>${HeaderDirectPlayProfileHelp}</p> <p>${HeaderDirectPlayProfileHelp}</p>
<button is="emby-button" class="raised submit block btnAddDirectPlayProfile" type="button" data-mini="true" data-icon="plus">${ButtonNew}</button> <button is="emby-button" class="raised submit block btnAddDirectPlayProfile" type="button" data-mini="true" data-icon="plus">${New}</button>
<br /> <br />
<div class="directPlayProfiles"></div> <div class="directPlayProfiles"></div>
</div> </div>
<div class="tabContent tabTranscodingProfiles"> <div class="tabContent tabTranscodingProfiles">
<p>${HeaderTranscodingProfileHelp}</p> <p>${HeaderTranscodingProfileHelp}</p>
<button is="emby-button" class="raised submit block btnAddTranscodingProfile" type="button" data-mini="true" data-icon="plus">${ButtonNew}</button> <button is="emby-button" class="raised submit block btnAddTranscodingProfile" type="button" data-mini="true" data-icon="plus">${New}</button>
<br /> <br />
<div class="transcodingProfiles"></div> <div class="transcodingProfiles"></div>
</div> </div>
<div class="tabContent tabContainerProfiles"> <div class="tabContent tabContainerProfiles">
<p>${HeaderContainerProfileHelp}</p> <p>${HeaderContainerProfileHelp}</p>
<button is="emby-button" class="raised submit block btnAddContainerProfile" type="button" data-mini="true" data-icon="plus">${ButtonNew}</button> <button is="emby-button" class="raised submit block btnAddContainerProfile" type="button" data-mini="true" data-icon="plus">${New}</button>
<br /> <br />
<div class="containerProfiles"></div> <div class="containerProfiles"></div>
</div> </div>
<div class="tabContent tabCodecProfiles"> <div class="tabContent tabCodecProfiles">
<p>${HeaderCodecProfileHelp}</p> <p>${HeaderCodecProfileHelp}</p>
<button is="emby-button" class="raised submit block btnAddCodecProfile" type="button" data-icon="plus">${ButtonNew}</button> <button is="emby-button" class="raised submit block btnAddCodecProfile" type="button" data-icon="plus">${New}</button>
<br /> <br />
<div class="codecProfiles"></div> <div class="codecProfiles"></div>
</div> </div>
<div class="tabContent tabMediaProfiles"> <div class="tabContent tabMediaProfiles">
<p>${HeaderResponseProfileHelp}</p> <p>${HeaderResponseProfileHelp}</p>
<button is="emby-button" class="raised submit block btnAddResponseProfile" type="button" data-mini="true" data-icon="plus">${ButtonNew}</button> <button is="emby-button" class="raised submit block btnAddResponseProfile" type="button" data-mini="true" data-icon="plus">${New}</button>
<br /> <br />
<div class="mediaProfiles"></div> <div class="mediaProfiles"></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">
@ -319,7 +319,7 @@
<div data-role="content"> <div data-role="content">
<div data-role="controlgroup" data-type="horizontal" data-mini="true"> <div data-role="controlgroup" data-type="horizontal" data-mini="true">
<input type="radio" name="radioTranscodingTab" class="radioTabButton" id="radioTranscodingBasics" value="tabTranscodingBasics"> <input type="radio" name="radioTranscodingTab" class="radioTabButton" id="radioTranscodingBasics" value="tabTranscodingBasics">
<label for="radioTranscodingBasics">${TabInfo}</label> <label for="radioTranscodingBasics">${ButtonInfo}</label>
<input type="radio" name="radioTranscodingTab" class="radioTabButton" id="radioTranscodingAdvanced" value="tabTranscodingAdvanced"> <input type="radio" name="radioTranscodingTab" class="radioTabButton" id="radioTranscodingAdvanced" value="tabTranscodingAdvanced">
<label for="radioTranscodingAdvanced">${TabAdvanced}</label> <label for="radioTranscodingAdvanced">${TabAdvanced}</label>
</div> </div>
@ -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;">
@ -341,16 +341,16 @@
</div> </div>
</div> </div>
<div class="inputContainer"> <div class="inputContainer">
<input is="emby-input" type="text" id="txtTranscodingContainer" label="${LabelTranscodingContainer}"; required="required" /> <input is="emby-input" type="text" id="txtTranscodingContainer" label="${LabelProfileContainer}"; required="required" />
</div> </div>
<div id="fldTranscodingVideoCodec" style="margin: 1em 0;"> <div id="fldTranscodingVideoCodec" style="margin: 1em 0;">
<div class="inputContainer"> <div class="inputContainer">
<input is="emby-input" type="text" id="txtTranscodingVideoCodec" label="${LabelTranscodingVideoCodec}" /> <input is="emby-input" type="text" id="txtTranscodingVideoCodec" label="${LabelVideoCodec}" />
</div> </div>
</div> </div>
<div id="fldTranscodingAudioCodec" style="margin: 1em 0;"> <div id="fldTranscodingAudioCodec" style="margin: 1em 0;">
<div class="inputContainer"> <div class="inputContainer">
<input is="emby-input" type="text" id="txtTranscodingAudioCodec" label="${LabelTranscodingAudioCodec}" /> <input is="emby-input" type="text" id="txtTranscodingAudioCodec" label="${LabelAudioCodec}" />
</div> </div>
</div> </div>
</div> </div>
@ -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">

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

@ -46,7 +46,7 @@ import 'emby-button';
html += '</div>'; html += '</div>';
if (profile.Type == 'User') { if (profile.Type == 'User') {
html += '<button type="button" is="paper-icon-button-light" class="btnDeleteProfile" data-profileid="' + profile.Id + '" title="' + globalize.translate('ButtonDelete') + '"><span class="material-icons delete"></span></button>'; html += '<button type="button" is="paper-icon-button-light" class="btnDeleteProfile" data-profileid="' + profile.Id + '" title="' + globalize.translate('Delete') + '"><span class="material-icons delete"></span></button>';
} }
html += '</div>'; html += '</div>';
@ -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')

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