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 hadicharara/added-support-for-rtl-layouts

Browse source
This commit is contained in:
Hadi Charara 2022-10-12 08:29:53 -04:00
commit 104ad71ea7
128 changed files with 1242 additions and 1454 deletions
Download patch file Download diff file Expand all files Collapse all files

27
.eslintrc.js
View file

@ -34,7 +34,7 @@ module.exports = {
'plugin:sonarjs/recommended' 'plugin:sonarjs/recommended'
], ],
rules: { rules: {
'array-callback-return': ['error'], 'array-callback-return': ['error', { 'checkForEach': true }],
'block-spacing': ['error'], 'block-spacing': ['error'],
'brace-style': ['error', '1tbs', { 'allowSingleLine': true }], 'brace-style': ['error', '1tbs', { 'allowSingleLine': true }],
'comma-dangle': ['error', 'never'], 'comma-dangle': ['error', 'never'],
@ -51,19 +51,22 @@ 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-nested-ternary': ['error'],
'no-restricted-globals': ['error'].concat(restrictedGlobals), 'no-restricted-globals': ['error'].concat(restrictedGlobals),
'no-return-assign': ['error'],
'no-return-await': ['error'], 'no-return-await': ['error'],
'no-sequences': ['error', { 'allowInParentheses': false }], 'no-sequences': ['error', { 'allowInParentheses': false }],
'no-trailing-spaces': ['error'], 'no-trailing-spaces': ['error'],
'@babel/no-unused-expressions': ['error', { 'allowShortCircuit': true, 'allowTernary': true, 'allowTaggedTemplates': true }], '@babel/no-unused-expressions': ['error', { 'allowShortCircuit': true, 'allowTernary': true, 'allowTaggedTemplates': true }],
'no-useless-constructor': ['error'],
'no-var': ['error'],
'no-void': ['error', { 'allowAsStatement': true }], 'no-void': ['error', { 'allowAsStatement': true }],
'no-nested-ternary': ['error'], 'no-warning-comments': ['warn', { 'terms': ['fixme', 'hack', 'xxx'] }],
'one-var': ['error', 'never'], 'one-var': ['error', 'never'],
'padded-blocks': ['error', 'never'], 'padded-blocks': ['error', 'never'],
'prefer-const': ['error', { 'destructuring': 'all' }], 'prefer-const': ['error', { 'destructuring': 'all' }],
'quotes': ['error', 'single', { 'avoidEscape': true, 'allowTemplateLiterals': false }], 'quotes': ['error', 'single', { 'avoidEscape': true, 'allowTemplateLiterals': false }],
'@babel/semi': ['error'], '@babel/semi': ['error'],
'no-var': ['error'],
'space-before-blocks': ['error'], 'space-before-blocks': ['error'],
'space-infix-ops': 'error', 'space-infix-ops': 'error',
'yoda': 'error', 'yoda': 'error',
@ -72,18 +75,8 @@ module.exports = {
'sonarjs/cognitive-complexity': ['warn'], 'sonarjs/cognitive-complexity': ['warn'],
// TODO: Enable the following rules and fix issues // TODO: Enable the following rules and fix issues
'sonarjs/max-switch-cases': ['off'],
'sonarjs/no-collapsible-if': ['off'],
'sonarjs/no-duplicate-string': ['off'], 'sonarjs/no-duplicate-string': ['off'],
'sonarjs/no-duplicated-branches': ['off'], 'sonarjs/prefer-object-literal': ['off']
'sonarjs/no-gratuitous-expressions': ['off'],
'sonarjs/no-identical-functions': ['off'],
'sonarjs/no-nested-switch': ['off'],
'sonarjs/no-redundant-jump': ['off'],
'sonarjs/no-small-switch': ['off'],
'sonarjs/no-unused-collection': ['off'],
'sonarjs/prefer-object-literal': ['off'],
'sonarjs/prefer-single-boolean-return': ['off']
}, },
settings: { settings: {
react: { react: {
@ -261,7 +254,11 @@ module.exports = {
'plugin:react/recommended', 'plugin:react/recommended',
'plugin:react-hooks/recommended', 'plugin:react-hooks/recommended',
'plugin:jsx-a11y/recommended' 'plugin:jsx-a11y/recommended'
] ],
rules: {
'no-useless-constructor': ['off'],
'@typescript-eslint/no-useless-constructor': ['error']
}
} }
] ]
}; };

6
.github/workflows/codeql-analysis.yml vendored
View file

@ -21,11 +21,11 @@ jobs:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3 uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3
- name: Initialize CodeQL - name: Initialize CodeQL
uses: github/codeql-action/init@e0e5ded33cabb451ae0a9768fc7b0410bad9ad44 # tag=v2 uses: github/codeql-action/init@807578363a7869ca324a79039e6db9c843e0e100 # tag=v2
with: with:
languages: ${{ matrix.language }} languages: ${{ matrix.language }}
queries: +security-extended queries: +security-extended
- name: Autobuild - name: Autobuild
uses: github/codeql-action/autobuild@e0e5ded33cabb451ae0a9768fc7b0410bad9ad44 # tag=v2 uses: github/codeql-action/autobuild@807578363a7869ca324a79039e6db9c843e0e100 # tag=v2
- name: Perform CodeQL Analysis - name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@e0e5ded33cabb451ae0a9768fc7b0410bad9ad44 # tag=v2 uses: github/codeql-action/analyze@807578363a7869ca324a79039e6db9c843e0e100 # tag=v2

2
.github/workflows/commands.yml vendored
View file

@ -18,7 +18,7 @@ jobs:
comment-id: ${{ github.event.comment.id }} comment-id: ${{ github.event.comment.id }}
reactions: '+1' reactions: '+1'
- name: Checkout the latest code - name: Checkout the latest code
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3.0.2 uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3.1.0
with: with:
token: ${{ secrets.JF_BOT_TOKEN }} token: ${{ secrets.JF_BOT_TOKEN }}
fetch-depth: 0 fetch-depth: 0

42
.github/workflows/lint.yml vendored
View file

@ -20,19 +20,7 @@ jobs:
with: with:
node-version: 16 node-version: 16
check-latest: true check-latest: true
cache: npm
- name: Get npm cache directory path
id: npm-cache-dir-path
run: echo "::set-output name=dir::$(npm config get cache)"
- name: Cache node_modules
uses: actions/cache@56461b9eb0f8438fd15c7a9968e3c9ebb18ceff1 # tag=v3.0.10
id: npm-cache
with:
path: ${{ steps.npm-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-npm-
- name: Install Node.js dependencies - name: Install Node.js dependencies
run: npm ci --no-audit run: npm ci --no-audit
@ -55,19 +43,7 @@ jobs:
with: with:
node-version: 16 node-version: 16
check-latest: true check-latest: true
cache: npm
- name: Get npm cache directory path
id: npm-cache-dir-path
run: echo "::set-output name=dir::$(npm config get cache)"
- name: Cache node_modules
uses: actions/cache@56461b9eb0f8438fd15c7a9968e3c9ebb18ceff1 # tag=v3.0.10
id: npm-cache
with:
path: ${{ steps.npm-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-npm-
- name: Set up stylelint matcher - name: Set up stylelint matcher
uses: xt0rted/stylelint-problem-matcher@34db1b874c0452909f0696aedef70b723870a583 # tag=v1 uses: xt0rted/stylelint-problem-matcher@34db1b874c0452909f0696aedef70b723870a583 # tag=v1
@ -93,19 +69,7 @@ jobs:
with: with:
node-version: 16 node-version: 16
check-latest: true check-latest: true
cache: npm
- name: Get npm cache directory path
id: npm-cache-dir-path
run: echo "::set-output name=dir::$(npm config get cache)"
- name: Cache node_modules
uses: actions/cache@56461b9eb0f8438fd15c7a9968e3c9ebb18ceff1 # tag=v3.0.10
id: npm-cache
with:
path: ${{ steps.npm-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-npm-
- name: Set up stylelint matcher - name: Set up stylelint matcher
uses: xt0rted/stylelint-problem-matcher@34db1b874c0452909f0696aedef70b723870a583 # tag=v1 uses: xt0rted/stylelint-problem-matcher@34db1b874c0452909f0696aedef70b723870a583 # tag=v1

2
.github/workflows/repo-stale.yaml vendored
View file

@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ contains(github.repository, 'jellyfin/') }} if: ${{ contains(github.repository, 'jellyfin/') }}
steps: steps:
- uses: actions/stale@3de2653986ebd134983c79fe2be5d45cc3d9f4e1 # tag=v6.0.0 - uses: actions/stale@5ebf00ea0e4c1561e9b43a292ed34424fb1d4578 # tag=v6.0.1
with: with:
repo-token: ${{ secrets.JF_BOT_TOKEN }} repo-token: ${{ secrets.JF_BOT_TOKEN }}
days-before-stale: 120 days-before-stale: 120

1
CONTRIBUTORS.md
View file

@ -52,6 +52,7 @@
- [MinecraftPlaye](https://github.com/MinecraftPlaye) - [MinecraftPlaye](https://github.com/MinecraftPlaye)
- [Matthew Jones](https://github.com/matthew-jones-uk) - [Matthew Jones](https://github.com/matthew-jones-uk)
- [taku0](https://github.com/taku0) - [taku0](https://github.com/taku0)
- [Viperinius](https://github.com/Viperinius)
- [is343](https://github.com/is343) - [is343](https://github.com/is343)
- [Meet Pandya](https://github.com/meet-k-pandya) - [Meet Pandya](https://github.com/meet-k-pandya)

10
cssnano.config.js Normal file
View file

@ -0,0 +1,10 @@
module.exports = {
preset: [
'default',
// Turn off `mergeLonghand` because it combines `padding-*` and `margin-*`,
// breaking fallback styles.
// https://github.com/cssnano/cssnano/issues/1163
// https://github.com/cssnano/cssnano/issues/1192
{ mergeLonghand: false }
]
};

576
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

34
package.json
View file

@ -5,21 +5,21 @@
"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.19.1", "@babel/core": "7.19.3",
"@babel/eslint-parser": "7.19.1", "@babel/eslint-parser": "7.19.1",
"@babel/eslint-plugin": "7.19.1", "@babel/eslint-plugin": "7.19.1",
"@babel/plugin-proposal-class-properties": "7.18.6", "@babel/plugin-proposal-class-properties": "7.18.6",
"@babel/plugin-proposal-private-methods": "7.18.6", "@babel/plugin-proposal-private-methods": "7.18.6",
"@babel/plugin-transform-modules-umd": "7.18.6", "@babel/plugin-transform-modules-umd": "7.18.6",
"@babel/preset-env": "7.19.1", "@babel/preset-env": "7.19.3",
"@babel/preset-react": "7.18.6", "@babel/preset-react": "7.18.6",
"@babel/preset-typescript": "7.18.6", "@babel/preset-typescript": "7.18.6",
"@types/escape-html": "1.0.2", "@types/escape-html": "1.0.2",
"@types/lodash-es": "4.17.6", "@types/lodash-es": "4.17.6",
"@types/react": "17.0.50", "@types/react": "17.0.50",
"@types/react-dom": "17.0.17", "@types/react-dom": "17.0.17",
"@typescript-eslint/eslint-plugin": "5.38.0", "@typescript-eslint/eslint-plugin": "5.39.0",
"@typescript-eslint/parser": "5.38.0", "@typescript-eslint/parser": "5.39.0",
"@uupaa/dynamic-import-polyfill": "1.0.2", "@uupaa/dynamic-import-polyfill": "1.0.2",
"autoprefixer": "10.4.12", "autoprefixer": "10.4.12",
"babel-loader": "8.2.5", "babel-loader": "8.2.5",
@ -42,21 +42,21 @@
"html-loader": "4.2.0", "html-loader": "4.2.0",
"html-webpack-plugin": "5.5.0", "html-webpack-plugin": "5.5.0",
"mini-css-extract-plugin": "2.6.1", "mini-css-extract-plugin": "2.6.1",
"postcss": "8.4.16", "postcss": "8.4.17",
"postcss-loader": "7.0.1", "postcss-loader": "7.0.1",
"postcss-preset-env": "7.8.2", "postcss-preset-env": "7.8.2",
"postcss-scss": "4.0.5", "postcss-scss": "4.0.5",
"sass": "1.55.0", "sass": "1.55.0",
"sass-loader": "13.0.2", "sass-loader": "13.0.2",
"source-map-loader": "3.0.1", "source-map-loader": "4.0.0",
"style-loader": "3.3.1", "style-loader": "3.3.1",
"stylelint": "14.12.1", "stylelint": "14.13.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": "5.0.0", "stylelint-order": "5.0.0",
"stylelint-scss": "4.3.0", "stylelint-scss": "4.3.0",
"ts-loader": "9.4.1", "ts-loader": "9.4.1",
"typescript": "4.8.3", "typescript": "4.8.4",
"webpack": "5.74.0", "webpack": "5.74.0",
"webpack-cli": "4.10.0", "webpack-cli": "4.10.0",
"webpack-dev-server": "4.11.1", "webpack-dev-server": "4.11.1",
@ -66,20 +66,20 @@
}, },
"dependencies": { "dependencies": {
"@fontsource/noto-sans": "4.5.11", "@fontsource/noto-sans": "4.5.11",
"@fontsource/noto-sans-hk": "4.5.11", "@fontsource/noto-sans-hk": "4.5.12",
"@fontsource/noto-sans-jp": "4.5.11", "@fontsource/noto-sans-jp": "4.5.12",
"@fontsource/noto-sans-kr": "4.5.11", "@fontsource/noto-sans-kr": "4.5.12",
"@fontsource/noto-sans-sc": "4.5.11", "@fontsource/noto-sans-sc": "4.5.12",
"@fontsource/noto-sans-tc": "4.5.11", "@fontsource/noto-sans-tc": "4.5.12",
"@jellyfin/libass-wasm": "4.1.1", "@jellyfin/libass-wasm": "4.1.1",
"@jellyfin/sdk": "0.7.0", "@jellyfin/sdk": "0.7.0",
"blurhash": "2.0.0", "blurhash": "2.0.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",
"classnames": "2.3.2", "classnames": "2.3.2",
"core-js": "3.25.3", "core-js": "3.25.5",
"date-fns": "2.29.3", "date-fns": "2.29.3",
"dompurify": "2.4.0", "dompurify": "2.4.0",
"epubjs": "0.3.93", "epubjs": "0.4.2",
"escape-html": "1.0.3", "escape-html": "1.0.3",
"fast-text-encoding": "1.0.6", "fast-text-encoding": "1.0.6",
"flv.js": "1.6.2", "flv.js": "1.6.2",
@ -92,7 +92,7 @@
"jstree": "3.3.12", "jstree": "3.3.12",
"libarchive.js": "1.3.0", "libarchive.js": "1.3.0",
"lodash-es": "4.17.21", "lodash-es": "4.17.21",
"marked": "4.1.0", "marked": "4.1.1",
"material-design-icons-iconfont": "6.7.0", "material-design-icons-iconfont": "6.7.0",
"native-promise-only": "0.8.1", "native-promise-only": "0.8.1",
"pdfjs-dist": "2.16.105", "pdfjs-dist": "2.16.105",

1
src/assets/img/devices/home-assistant.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 5 KiB

8
src/components/appRouter.js
View file

@ -87,13 +87,11 @@ class AppRouter {
path = path.replace(this.baseUrl(), ''); path = path.replace(this.baseUrl(), '');
if (this.currentRouteInfo && this.currentRouteInfo.path === path) {
// can't use this with home right now due to the back menu // can't use this with home right now due to the back menu
if (this.currentRouteInfo.route.type !== 'home') { if (this.currentRouteInfo?.path === path && this.currentRouteInfo.route.type !== 'home') {
loading.hide(); loading.hide();
return Promise.resolve(); return Promise.resolve();
} }
}
this.promiseShow = new Promise((resolve) => { this.promiseShow = new Promise((resolve) => {
this.resolveOnNextShow = resolve; this.resolveOnNextShow = resolve;
@ -351,8 +349,7 @@ class AppRouter {
onRequestFail(_e, data) { onRequestFail(_e, data) {
const apiClient = this; const apiClient = this;
if (data.status === 403) { if (data.status === 403 && data.errorCode === 'ParentalControl') {
if (data.errorCode === 'ParentalControl') {
const isCurrentAllowed = appRouter.currentRouteInfo ? (appRouter.currentRouteInfo.route.anonymous || appRouter.currentRouteInfo.route.startup) : true; const isCurrentAllowed = appRouter.currentRouteInfo ? (appRouter.currentRouteInfo.route.anonymous || appRouter.currentRouteInfo.route.startup) : true;
// Bounce to the login screen, but not if a password entry fails, obviously // Bounce to the login screen, but not if a password entry fails, obviously
@ -362,7 +359,6 @@ class AppRouter {
} }
} }
} }
}
#authenticate(ctx, route, callback) { #authenticate(ctx, route, callback) {
const firstResult = this.firstConnectionResult; const firstResult = this.firstConnectionResult;

6
src/components/apphost.js
View file

@ -166,11 +166,7 @@ function supportsHtmlMediaAutoplay() {
return true; return true;
} }
if (browser.mobile) { return !browser.mobile;
return false;
}
return true;
} }
function supportsCue() { function supportsCue() {

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

@ -10,24 +10,13 @@ import './backdrop.scss';
/* eslint-disable indent */ /* eslint-disable indent */
function enableAnimation() { function enableAnimation() {
if (browser.slow) { return !browser.slow;
return false;
}
return true;
} }
function enableRotation() { function enableRotation() {
if (browser.tv) { return !browser.tv
return false;
}
// Causes high cpu usage // Causes high cpu usage
if (browser.firefox) { && !browser.firefox;
return false;
}
return true;
} }
class Backdrop { class Backdrop {

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

@ -390,7 +390,8 @@ import { appRouter } from '../appRouter';
} else if (options.indexBy === 'ProductionYear') { } else if (options.indexBy === 'ProductionYear') {
newIndexValue = item.ProductionYear; newIndexValue = item.ProductionYear;
} else if (options.indexBy === 'CommunityRating') { } else if (options.indexBy === 'CommunityRating') {
newIndexValue = item.CommunityRating ? (Math.floor(item.CommunityRating) + (item.CommunityRating % 1 >= 0.5 ? 0.5 : 0)) + '+' : null; const roundedRatingDecimal = item.CommunityRating % 1 >= 0.5 ? 0.5 : 0;
newIndexValue = item.CommunityRating ? (Math.floor(item.CommunityRating) + roundedRatingDecimal) + '+' : null;
} }
if (newIndexValue !== currentIndexValue) { if (newIndexValue !== currentIndexValue) {
@ -512,6 +513,7 @@ import { appRouter } from '../appRouter';
let imgType = null; let imgType = null;
let itemId = null; let itemId = null;
/* eslint-disable sonarjs/no-duplicated-branches */
if (options.preferThumb && item.ImageTags && item.ImageTags.Thumb) { if (options.preferThumb && item.ImageTags && item.ImageTags.Thumb) {
imgType = 'Thumb'; imgType = 'Thumb';
imgTag = item.ImageTags.Thumb; imgTag = item.ImageTags.Thumb;
@ -608,6 +610,7 @@ import { appRouter } from '../appRouter';
imgTag = item.ParentBackdropImageTags[0]; imgTag = item.ParentBackdropImageTags[0];
itemId = item.ParentBackdropItemId; itemId = item.ParentBackdropItemId;
} }
/* eslint-enable sonarjs/no-duplicated-branches */
if (!itemId) { if (!itemId) {
itemId = item.Id; itemId = item.Id;
@ -790,11 +793,9 @@ import { appRouter } from '../appRouter';
const showOtherText = isOuterFooter ? !overlayText : overlayText; const showOtherText = isOuterFooter ? !overlayText : overlayText;
if (isOuterFooter && options.cardLayout && layoutManager.mobile) { if (isOuterFooter && options.cardLayout && layoutManager.mobile && options.cardFooterAside !== 'none') {
if (options.cardFooterAside !== 'none') {
html += `<button is="paper-icon-button-light" class="itemAction btnCardOptions cardText-secondary" data-action="menu" title="${globalize.translate('ButtonMore')}"><span class="material-icons more_vert" aria-hidden="true"></span></button>`; html += `<button is="paper-icon-button-light" class="itemAction btnCardOptions cardText-secondary" data-action="menu" title="${globalize.translate('ButtonMore')}"><span class="material-icons more_vert" aria-hidden="true"></span></button>`;
} }
}
const cssClass = options.centerText ? 'cardText cardTextCentered' : 'cardText'; const cssClass = options.centerText ? 'cardText cardTextCentered' : 'cardText';
const serverId = item.ServerId || options.serverId; const serverId = item.ServerId || options.serverId;
@ -803,8 +804,7 @@ import { appRouter } from '../appRouter';
const parentTitleUnderneath = item.Type === 'MusicAlbum' || item.Type === 'Audio' || item.Type === 'MusicVideo'; const parentTitleUnderneath = item.Type === 'MusicAlbum' || item.Type === 'Audio' || item.Type === 'MusicVideo';
let titleAdded; let titleAdded;
if (showOtherText) { if (showOtherText && (options.showParentTitle || options.showParentTitleOrTitle) && !parentTitleUnderneath) {
if ((options.showParentTitle || options.showParentTitleOrTitle) && !parentTitleUnderneath) {
if (isOuterFooter && item.Type === 'Episode' && item.SeriesName) { if (isOuterFooter && item.Type === 'Episode' && item.SeriesName) {
if (item.SeriesId) { if (item.SeriesId) {
lines.push(getTextActionButton({ lines.push(getTextActionButton({
@ -833,7 +833,6 @@ import { appRouter } from '../appRouter';
} }
} }
} }
}
let showMediaTitle = (showTitle && !titleAdded) || (options.showParentTitleOrTitle && !lines.length); let showMediaTitle = (showTitle && !titleAdded) || (options.showParentTitleOrTitle && !lines.length);
if (!showMediaTitle && !titleAdded && (showTitle || forceName)) { if (!showMediaTitle && !titleAdded && (showTitle || forceName)) {
@ -987,12 +986,10 @@ import { appRouter } from '../appRouter';
} }
} }
if (options.showPersonRoleOrType) { if (options.showPersonRoleOrType && item.Role) {
if (item.Role) {
lines.push(globalize.translate('PersonRole', escapeHtml(item.Role))); lines.push(globalize.translate('PersonRole', escapeHtml(item.Role)));
} }
} }
}
if ((showTitle || !imgUrl) && forceName && overlayText && lines.length === 1) { if ((showTitle || !imgUrl) && forceName && overlayText && lines.length === 1) {
lines = []; lines = [];
@ -1010,14 +1007,12 @@ import { appRouter } from '../appRouter';
html += progressHtml; html += progressHtml;
} }
if (html) { if (html && (!isOuterFooter || logoUrl || options.cardLayout)) {
if (!isOuterFooter || logoUrl || options.cardLayout) {
html = '<div class="' + footerClass + '">' + html; html = '<div class="' + footerClass + '">' + html;
//cardFooter //cardFooter
html += '</div>'; html += '</div>';
} }
}
return html; return html;
} }

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

@ -34,11 +34,9 @@ import ServerConnections from '../ServerConnections';
let shape = (options.backdropShape || 'backdrop'); let shape = (options.backdropShape || 'backdrop');
if (videoStream.Width && videoStream.Height) { if (videoStream.Width && videoStream.Height && (videoStream.Width / videoStream.Height) <= 1.2) {
if ((videoStream.Width / videoStream.Height) <= 1.2) {
shape = (options.squareShape || 'square'); shape = (options.squareShape || 'square');
} }
}
className += ` ${shape}Card`; className += ` ${shape}Card`;

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

@ -87,7 +87,8 @@ export default class channelMapper {
html += '</div>'; html += '</div>';
html += '</div>'; html += '</div>';
html += `<button class="btnMap autoSize" is="paper-icon-button-light" type="button" data-id="${channel.Id}" data-providerid="${channel.ProviderChannelId}"><span class="material-icons mode_edit" aria-hidden="true"></span></button>`; html += `<button class="btnMap autoSize" is="paper-icon-button-light" type="button" data-id="${channel.Id}" data-providerid="${channel.ProviderChannelId}"><span class="material-icons mode_edit" aria-hidden="true"></span></button>`;
return html += '</div>'; html += '</div>';
return html;
} }
function getEditorHtml() { function getEditorHtml() {
@ -100,7 +101,8 @@ export default class channelMapper {
html += '</div>'; html += '</div>';
html += '</form>'; html += '</form>';
html += '</div>'; html += '</div>';
return html += '</div>'; html += '</div>';
return html;
} }
function initEditor(dlg, options) { function initEditor(dlg, options) {

4
src/components/dashboard/users/UserCardBox.tsx
View file

@ -1,7 +1,7 @@
import type { UserDto } from '@jellyfin/sdk/lib/generated-client'; import type { UserDto } from '@jellyfin/sdk/lib/generated-client';
import React, { FunctionComponent } from 'react'; import React, { FunctionComponent } from 'react';
import { formatDistanceToNow } from 'date-fns'; import { formatDistanceToNow } from 'date-fns';
import { localeWithSuffix } from '../../../scripts/dfnshelper'; import { getLocaleWithSuffix } from '../../../scripts/dfnshelper';
import globalize from '../../../scripts/globalize'; import globalize from '../../../scripts/globalize';
import cardBuilder from '../../cardbuilder/cardBuilder'; import cardBuilder from '../../cardbuilder/cardBuilder';
import IconButtonElement from '../../../elements/IconButtonElement'; import IconButtonElement from '../../../elements/IconButtonElement';
@ -23,7 +23,7 @@ type IProps = {
const getLastSeenText = (lastActivityDate?: string | null) => { const getLastSeenText = (lastActivityDate?: string | null) => {
if (lastActivityDate) { if (lastActivityDate) {
return globalize.translate('LastSeen', formatDistanceToNow(Date.parse(lastActivityDate), localeWithSuffix)); return globalize.translate('LastSeen', formatDistanceToNow(Date.parse(lastActivityDate), getLocaleWithSuffix()));
} }
return ''; return '';

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

@ -57,6 +57,7 @@ import '../../assets/css/scrollstyles.scss';
if ((shouldClose || !isOpened(dlg)) && unlisten) { if ((shouldClose || !isOpened(dlg)) && unlisten) {
unlisten(); unlisten();
unlisten = null;
} }
if (shouldClose) { if (shouldClose) {
@ -64,6 +65,22 @@ import '../../assets/css/scrollstyles.scss';
} }
} }
function finishClose() {
if (unlisten) {
unlisten();
unlisten = null;
}
dlg.dispatchEvent(new CustomEvent('close', {
bubbles: false,
cancelable: false
}));
resolve({
element: dlg
});
}
function onBackCommand(e) { function onBackCommand(e) {
if (e.detail.command === 'back') { if (e.detail.command === 'back') {
e.preventDefault(); e.preventDefault();
@ -79,6 +96,7 @@ import '../../assets/css/scrollstyles.scss';
if (unlisten) { if (unlisten) {
unlisten(); unlisten();
unlisten = null;
} }
removeBackdrop(dlg); removeBackdrop(dlg);
@ -92,9 +110,13 @@ import '../../assets/css/scrollstyles.scss';
const state = history.location.state || {}; const state = history.location.state || {};
if (state.dialogs?.length > 0) { if (state.dialogs?.length > 0) {
if (state.dialogs[state.dialogs.length - 1] === hash) { if (state.dialogs[state.dialogs.length - 1] === hash) {
unlisten = history.listen(finishClose);
history.back(); history.back();
} else if (state.dialogs.includes(hash)) { } else if (state.dialogs.includes(hash)) {
console.warn('[dialogHelper] dialog "%s" was closed, but is not the last dialog opened', hash); console.warn('[dialogHelper] dialog "%s" was closed, but is not the last dialog opened', hash);
unlisten = history.listen(finishClose);
// Remove the closed dialog hash from the history state // Remove the closed dialog hash from the history state
history.replace( history.replace(
`${history.location.pathname}${history.location.search}`, `${history.location.pathname}${history.location.search}`,
@ -123,18 +145,9 @@ import '../../assets/css/scrollstyles.scss';
} }
} }
//resolve(); if (!unlisten) {
// if we just called history.back(), then use a timeout to allow the history events to fire first finishClose();
setTimeout(() => { }
dlg.dispatchEvent(new CustomEvent('close', {
bubbles: false,
cancelable: false
}));
resolve({
element: dlg
});
}, 1);
} }
dlg.addEventListener('_close', onDialogClosed); dlg.addEventListener('_close', onDialogClosed);
@ -262,6 +275,11 @@ import '../../assets/css/scrollstyles.scss';
} }
} }
const getAnimationEndHandler = (dlg, callback) => function handler() {
dom.removeEventListener(dlg, dom.whichAnimationEvent(), handler, { once: true });
callback();
};
function animateDialogOpen(dlg) { function animateDialogOpen(dlg) {
const onAnimationFinish = () => { const onAnimationFinish = () => {
focusManager.pushScope(dlg); focusManager.pushScope(dlg);
@ -277,15 +295,11 @@ import '../../assets/css/scrollstyles.scss';
}; };
if (enableAnimation()) { if (enableAnimation()) {
const onFinish = () => { dom.addEventListener(
dom.removeEventListener(dlg, dom.whichAnimationEvent(), onFinish, { dlg,
once: true dom.whichAnimationEvent(),
}); getAnimationEndHandler(dlg, onAnimationFinish),
onAnimationFinish(); { once: true });
};
dom.addEventListener(dlg, dom.whichAnimationEvent(), onFinish, {
once: true
});
return; return;
} }
@ -311,15 +325,12 @@ import '../../assets/css/scrollstyles.scss';
animated = false; animated = false;
break; break;
} }
const onFinish = () => {
dom.removeEventListener(dlg, dom.whichAnimationEvent(), onFinish, { dom.addEventListener(
once: true dlg,
}); dom.whichAnimationEvent(),
onAnimationFinish(); getAnimationEndHandler(dlg, onAnimationFinish),
}; { once: true });
dom.addEventListener(dlg, dom.whichAnimationEvent(), onFinish, {
once: true
});
if (animated) { if (animated) {
return; return;

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

@ -26,6 +26,7 @@
<option value="es_DO">Español (Dominicana)</option> <option value="es_DO">Español (Dominicana)</option>
<option value="es-MX">Español (México)</option> <option value="es-MX">Español (México)</option>
<option value="et">Eesti</option> <option value="et">Eesti</option>
<option value="eu">Basque</option>
<option value="fa">فارسی</option> <option value="fa">فارسی</option>
<option value="fi">Suomi</option> <option value="fi">Suomi</option>
<option value="fil">Filipino</option> <option value="fil">Filipino</option>

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

@ -132,6 +132,7 @@ function saveValues(context, settings, settingsKey) {
seriesStatuses.push(elems[i].getAttribute('data-filter')); seriesStatuses.push(elems[i].getAttribute('data-filter'));
} }
} }
userSettings.setFilter(`${settingsKey}-filter-SeriesStatus`, seriesStatuses.join(','));
// Genres // Genres
const genres = []; const genres = [];

24
src/components/focusManager.js
View file

@ -56,15 +56,8 @@ import scrollManager from './scrollManager';
}).join(',') + ',.focusable'; }).join(',') + ',.focusable';
function isFocusable(elem) { function isFocusable(elem) {
if (focusableTagNames.indexOf(elem.tagName) !== -1) { return focusableTagNames.indexOf(elem.tagName) !== -1
return true; || (elem.classList?.contains('focusable'));
}
if (elem.classList && elem.classList.contains('focusable')) {
return true;
}
return false;
} }
function normalizeFocusable(elem, originalElement) { function normalizeFocusable(elem, originalElement) {
@ -97,11 +90,7 @@ import scrollManager from './scrollManager';
// Determines if a focusable element can be focused at a given point in time // Determines if a focusable element can be focused at a given point in time
function isCurrentlyFocusableInternal(elem) { function isCurrentlyFocusableInternal(elem) {
// http://stackoverflow.com/questions/19669786/check-if-element-is-visible-in-dom // http://stackoverflow.com/questions/19669786/check-if-element-is-visible-in-dom
if (elem.offsetParent === null) { return elem.offsetParent !== null;
return false;
}
return true;
} }
// Determines if a focusable element can be focused at a given point in time // Determines if a focusable element can be focused at a given point in time
@ -384,12 +373,13 @@ import scrollManager from './scrollManager';
// See if there's a focusable container, and if so, send the focus command to that // See if there's a focusable container, and if so, send the focus command to that
if (activeElement) { if (activeElement) {
const nearestElementFocusableParent = dom.parentWithClass(nearestElement, 'focusable'); const nearestElementFocusableParent = dom.parentWithClass(nearestElement, 'focusable');
if (nearestElementFocusableParent && nearestElementFocusableParent !== nearestElement) { if (nearestElementFocusableParent
if (focusableContainer !== nearestElementFocusableParent) { && nearestElementFocusableParent !== nearestElement
&& focusableContainer !== nearestElementFocusableParent
) {
nearestElement = nearestElementFocusableParent; nearestElement = nearestElementFocusableParent;
} }
} }
}
focus(nearestElement); focus(nearestElement);
} }
} }

36
src/components/htmlMediaHelper.js
View file

@ -26,12 +26,8 @@ import { Events } from 'jellyfin-apiclient';
function canPlayNativeHls() { function canPlayNativeHls() {
const media = document.createElement('video'); const media = document.createElement('video');
if (media.canPlayType('application/x-mpegURL').replace(/no/, '') || return !!(media.canPlayType('application/x-mpegURL').replace(/no/, '') ||
media.canPlayType('application/vnd.apple.mpegURL').replace(/no/, '')) { media.canPlayType('application/vnd.apple.mpegURL').replace(/no/, ''));
return true;
}
return false;
} }
export function enableHlsJsPlayer(runTimeTicks, mediaType) { export function enableHlsJsPlayer(runTimeTicks, mediaType) {
@ -123,11 +119,10 @@ import { Events } from 'jellyfin-apiclient';
} }
export function isValidDuration(duration) { export function isValidDuration(duration) {
if (duration && !isNaN(duration) && duration !== Number.POSITIVE_INFINITY && duration !== Number.NEGATIVE_INFINITY) { return duration
return true; && !isNaN(duration)
} && duration !== Number.POSITIVE_INFINITY
&& duration !== Number.NEGATIVE_INFINITY;
return false;
} }
function setCurrentTimeIfNeeded(element, seconds) { function setCurrentTimeIfNeeded(element, seconds) {
@ -159,11 +154,15 @@ import { Events } from 'jellyfin-apiclient';
// (but rewinding cannot happen as the first event with media of non-empty duration) // (but rewinding cannot happen as the first event with media of non-empty duration)
console.debug(`seeking to ${seconds} on ${e.type} event`); console.debug(`seeking to ${seconds} on ${e.type} event`);
setCurrentTimeIfNeeded(element, seconds); setCurrentTimeIfNeeded(element, seconds);
events.forEach(name => element.removeEventListener(name, onMediaChange)); events.forEach(name => {
element.removeEventListener(name, onMediaChange);
});
if (onMediaReady) onMediaReady(); if (onMediaReady) onMediaReady();
} }
}; };
events.forEach(name => element.addEventListener(name, onMediaChange)); events.forEach(name => {
element.addEventListener(name, onMediaChange);
});
} }
} }
} }
@ -273,10 +272,10 @@ import { Events } from 'jellyfin-apiclient';
hls.on(Hls.Events.ERROR, function (event, data) { hls.on(Hls.Events.ERROR, function (event, data) {
console.error('HLS Error: Type: ' + data.type + ' Details: ' + (data.details || '') + ' Fatal: ' + (data.fatal || false)); console.error('HLS Error: Type: ' + data.type + ' Details: ' + (data.details || '') + ' Fatal: ' + (data.fatal || false));
switch (data.type) {
case Hls.ErrorTypes.NETWORK_ERROR:
// try to recover network error // try to recover network error
if (data.response && data.response.code && data.response.code >= 400) { if (data.type === Hls.ErrorTypes.NETWORK_ERROR
&& data.response?.code && data.response.code >= 400
) {
console.debug('hls.js response error code: ' + data.response.code); console.debug('hls.js response error code: ' + data.response.code);
// Trigger failure differently depending on whether this is prior to start of playback, or after // Trigger failure differently depending on whether this is prior to start of playback, or after
@ -292,11 +291,6 @@ import { Events } from 'jellyfin-apiclient';
return; return;
} }
break;
default:
break;
}
if (data.fatal) { if (data.fatal) {
switch (data.type) { switch (data.type) {
case Hls.ErrorTypes.NETWORK_ERROR: case Hls.ErrorTypes.NETWORK_ERROR:

12
src/components/indicators/indicators.js
View file

@ -5,15 +5,9 @@ import './indicators.scss';
import 'material-design-icons-iconfont'; import 'material-design-icons-iconfont';
export function enableProgressIndicator(item) { export function enableProgressIndicator(item) {
if (item.MediaType === 'Video' && item.Type !== 'TvChannel') { return (item.MediaType === 'Video' && item.Type !== 'TvChannel')
return true; || item.Type === 'AudioBook'
} || item.Type === 'AudioPodcast';
if (item.Type === 'AudioBook' || item.Type === 'AudioPodcast') {
return true;
}
return false;
} }
export function getProgressHtml(pct, options) { export function getProgressHtml(pct, options) {

57
src/components/itemContextMenu.js
View file

@ -72,27 +72,26 @@ import toast from './toast/toast';
} }
} }
if (item.IsFolder || item.Type === 'MusicArtist' || item.Type === 'MusicGenre') { if ((item.IsFolder || item.Type === 'MusicArtist' || item.Type === 'MusicGenre')
if (item.CollectionType !== 'livetv') { && item.CollectionType !== 'livetv'
if (options.shuffle !== false) { && options.shuffle !== false
) {
commands.push({ commands.push({
name: globalize.translate('Shuffle'), name: globalize.translate('Shuffle'),
id: 'shuffle', id: 'shuffle',
icon: 'shuffle' icon: 'shuffle'
}); });
} }
}
}
if (item.MediaType === 'Audio' || item.Type === 'MusicAlbum' || item.Type === 'MusicArtist' || item.Type === 'MusicGenre') { if ((item.MediaType === 'Audio' || item.Type === 'MusicAlbum' || item.Type === 'MusicArtist' || item.Type === 'MusicGenre')
if (options.instantMix !== false && !itemHelper.isLocalItem(item)) { && options.instantMix !== false && !itemHelper.isLocalItem(item)
) {
commands.push({ commands.push({
name: globalize.translate('InstantMix'), name: globalize.translate('InstantMix'),
id: 'instantmix', id: 'instantmix',
icon: 'explore' icon: 'explore'
}); });
} }
}
if (commands.length) { if (commands.length) {
commands.push({ commands.push({
@ -180,8 +179,7 @@ import toast from './toast/toast';
} }
const canEdit = itemHelper.canEdit(user, item); const canEdit = itemHelper.canEdit(user, item);
if (canEdit) { if (canEdit && options.edit !== false && item.Type !== 'SeriesTimer') {
if (options.edit !== false && item.Type !== 'SeriesTimer') {
const text = (item.Type === 'Timer' || item.Type === 'SeriesTimer') ? globalize.translate('Edit') : globalize.translate('EditMetadata'); const text = (item.Type === 'Timer' || item.Type === 'SeriesTimer') ? globalize.translate('Edit') : globalize.translate('EditMetadata');
commands.push({ commands.push({
name: text, name: text,
@ -189,49 +187,42 @@ import toast from './toast/toast';
icon: 'edit' icon: 'edit'
}); });
} }
}
if (itemHelper.canEditImages(user, item)) { if (itemHelper.canEditImages(user, item) && options.editImages !== false) {
if (options.editImages !== false) {
commands.push({ commands.push({
name: globalize.translate('EditImages'), name: globalize.translate('EditImages'),
id: 'editimages', id: 'editimages',
icon: 'image' icon: 'image'
}); });
} }
}
if (canEdit) { if (canEdit && item.MediaType === 'Video' && item.Type !== 'TvChannel' && item.Type !== 'Program'
if (item.MediaType === 'Video' && item.Type !== 'TvChannel' && item.Type !== 'Program' && item.LocationType !== 'Virtual' && !(item.Type === 'Recording' && item.Status !== 'Completed')) { && item.LocationType !== 'Virtual'
if (options.editSubtitles !== false) { && !(item.Type === 'Recording' && item.Status !== 'Completed')
&& options.editSubtitles !== false
) {
commands.push({ commands.push({
name: globalize.translate('EditSubtitles'), name: globalize.translate('EditSubtitles'),
id: 'editsubtitles', id: 'editsubtitles',
icon: 'closed_caption' icon: 'closed_caption'
}); });
} }
}
}
if (options.identify !== false) { if (options.identify !== false && itemHelper.canIdentify(user, item)) {
if (itemHelper.canIdentify(user, item)) {
commands.push({ commands.push({
name: globalize.translate('Identify'), name: globalize.translate('Identify'),
id: 'identify', id: 'identify',
icon: 'edit' icon: 'edit'
}); });
} }
}
if (item.MediaSources) { if (item.MediaSources && options.moremediainfo !== false) {
if (options.moremediainfo !== false) {
commands.push({ commands.push({
name: globalize.translate('MoreMediaInfo'), name: globalize.translate('MoreMediaInfo'),
id: 'moremediainfo', id: 'moremediainfo',
icon: 'info' icon: 'info'
}); });
} }
}
if (item.Type === 'Program' && options.record !== false) { if (item.Type === 'Program' && options.record !== false) {
if (item.TimerId) { if (item.TimerId) {
@ -240,11 +231,7 @@ import toast from './toast/toast';
id: 'record', id: 'record',
icon: 'fiber_manual_record' icon: 'fiber_manual_record'
}); });
} } else {
}
if (item.Type === 'Program' && options.record !== false) {
if (!item.TimerId) {
commands.push({ commands.push({
name: globalize.translate('Record'), name: globalize.translate('Record'),
id: 'record', id: 'record',
@ -277,27 +264,21 @@ import toast from './toast/toast';
}); });
} }
if (!restrictOptions) { if (!restrictOptions && options.share === true && itemHelper.canShare(item, user)) {
if (options.share === true) {
if (itemHelper.canShare(item, user)) {
commands.push({ commands.push({
name: globalize.translate('Share'), name: globalize.translate('Share'),
id: 'share', id: 'share',
icon: 'share' icon: 'share'
}); });
} }
}
}
if (options.sync !== false) { if (options.sync !== false && itemHelper.canSync(user, item)) {
if (itemHelper.canSync(user, item)) {
commands.push({ commands.push({
name: globalize.translate('Sync'), name: globalize.translate('Sync'),
id: 'sync', id: 'sync',
icon: 'sync' icon: 'sync'
}); });
} }
}
if (options.openAlbum !== false && item.AlbumId && item.MediaType !== 'Photo') { if (options.openAlbum !== false && item.AlbumId && item.MediaType !== 'Photo') {
commands.push({ commands.push({

117
src/components/itemHelper.js
View file

@ -48,11 +48,9 @@ export function getDisplayName(item, options = {}) {
export function supportsAddingToCollection(item) { export function supportsAddingToCollection(item) {
const invalidTypes = ['Genre', 'MusicGenre', 'Studio', 'UserView', 'CollectionFolder', 'Audio', 'Program', 'Timer', 'SeriesTimer']; const invalidTypes = ['Genre', 'MusicGenre', 'Studio', 'UserView', 'CollectionFolder', 'Audio', 'Program', 'Timer', 'SeriesTimer'];
if (item.Type === 'Recording') { if (item.Type === 'Recording' && item.Status !== 'Completed') {
if (item.Status !== 'Completed') {
return false; return false;
} }
}
return !item.CollectionType && invalidTypes.indexOf(item.Type) === -1 && item.MediaType !== 'Photo' && !isLocalItem(item); return !item.CollectionType && invalidTypes.indexOf(item.Type) === -1 && item.MediaType !== 'Photo' && !isLocalItem(item);
} }
@ -74,11 +72,9 @@ export function supportsAddingToPlaylist(item) {
return false; return false;
} }
if (item.Type === 'Recording') { if (item.Type === 'Recording' && item.Status !== 'Completed') {
if (item.Status !== 'Completed') {
return false; return false;
} }
}
if (isLocalItem(item)) { if (isLocalItem(item)) {
return false; return false;
@ -109,11 +105,9 @@ export function canEdit(user, item) {
return false; return false;
} }
if (item.Type === 'Recording') { if (item.Type === 'Recording' && item.Status !== 'Completed') {
if (item.Status !== 'Completed') {
return false; return false;
} }
}
if (isLocalItem(item)) { if (isLocalItem(item)) {
return false; return false;
@ -123,33 +117,23 @@ export function canEdit(user, item) {
} }
export function isLocalItem(item) { export function isLocalItem(item) {
if (item && item.Id && typeof item.Id === 'string' && item.Id.indexOf('local') === 0) { return item && item.Id && typeof item.Id === 'string' && item.Id.indexOf('local') === 0;
return true;
}
return false;
} }
export function canIdentify (user, item) { export function canIdentify (user, item) {
const itemType = item.Type; const itemType = item.Type;
if (itemType === 'Movie' || return (itemType === 'Movie'
itemType === 'Trailer' || || itemType === 'Trailer'
itemType === 'Series' || || itemType === 'Series'
itemType === 'BoxSet' || || itemType === 'BoxSet'
itemType === 'Person' || || itemType === 'Person'
itemType === 'Book' || || itemType === 'Book'
itemType === 'MusicAlbum' || || itemType === 'MusicAlbum'
itemType === 'MusicArtist' || || itemType === 'MusicArtist'
itemType === 'MusicVideo') { || itemType === 'MusicVideo')
if (user.Policy.IsAdministrator) { && user.Policy.IsAdministrator
if (!isLocalItem(item)) { && !isLocalItem(item);
return true;
}
}
}
return false;
} }
export function canEditImages (user, item) { export function canEditImages (user, item) {
@ -160,19 +144,13 @@ export function canEditImages (user, item) {
} }
if (itemType === 'UserView') { if (itemType === 'UserView') {
if (user.Policy.IsAdministrator) { return !!user.Policy.IsAdministrator;
return true;
} }
if (item.Type === 'Recording' && item.Status !== 'Completed') {
return false; return false;
} }
if (item.Type === 'Recording') {
if (item.Status !== 'Completed') {
return false;
}
}
return itemType !== 'Timer' && itemType !== 'SeriesTimer' && canEdit(user, item) && !isLocalItem(item); return itemType !== 'Timer' && itemType !== 'SeriesTimer' && canEdit(user, item) && !isLocalItem(item);
} }
@ -201,11 +179,9 @@ export function canShare (item, user) {
if (item.Type === 'SeriesTimer') { if (item.Type === 'SeriesTimer') {
return false; return false;
} }
if (item.Type === 'Recording') { if (item.Type === 'Recording' && item.Status !== 'Completed') {
if (item.Status !== 'Completed') {
return false; return false;
} }
}
if (isLocalItem(item)) { if (isLocalItem(item)) {
return false; return false;
} }
@ -234,29 +210,21 @@ export function canMarkPlayed (item) {
} }
} }
if (item.Type === 'Series' || return item.Type === 'Series'
item.Type === 'Season' || || item.Type === 'Season'
item.Type === 'BoxSet' || || item.Type === 'BoxSet'
item.MediaType === 'Book' || || item.MediaType === 'Book'
item.MediaType === 'Recording') { || item.MediaType === 'Recording';
return true;
}
return false;
} }
export function canRate (item) { export function canRate (item) {
if (item.Type === 'Program' return item.Type !== 'Program'
|| item.Type === 'Timer' && item.Type !== 'Timer'
|| item.Type === 'SeriesTimer' && item.Type !== 'SeriesTimer'
|| item.Type === 'CollectionFolder' && item.Type !== 'CollectionFolder'
|| item.Type === 'UserView' && item.Type !== 'UserView'
|| item.Type === 'Channel' && item.Type !== 'Channel'
|| !item.UserData) { && item.UserData;
return false;
}
return true;
} }
export function canConvert (item, user) { export function canConvert (item, user) {
@ -287,11 +255,7 @@ export function canConvert (item, user) {
return false; return false;
} }
if (item.IsPlaceHolder) { return !item.IsPlaceHolder;
return false;
}
return true;
} }
export function canRefreshMetadata (item, user) { export function canRefreshMetadata (item, user) {
@ -301,11 +265,10 @@ export function canRefreshMetadata (item, user) {
return false; return false;
} }
if (item.Type !== 'Timer' && item.Type !== 'SeriesTimer' && item.Type !== 'Program' && item.Type !== 'TvChannel' && !(item.Type === 'Recording' && item.Status !== 'Completed')) { return item.Type !== 'Timer' && item.Type !== 'SeriesTimer' && item.Type !== 'Program'
if (!isLocalItem(item)) { && item.Type !== 'TvChannel'
return true; && !(item.Type === 'Recording' && item.Status !== 'Completed')
} && !isLocalItem(item);
}
} }
return false; return false;
@ -321,14 +284,12 @@ export function supportsMediaSourceSelection (item) {
if (!item.MediaSources || (item.MediaSources.length === 1 && item.MediaSources[0].Type === 'Placeholder')) { if (!item.MediaSources || (item.MediaSources.length === 1 && item.MediaSources[0].Type === 'Placeholder')) {
return false; return false;
} }
if (item.EnableMediaSourceDisplay === false) {
return false; if (item.EnableMediaSourceDisplay != null) {
} return !!item.EnableMediaSourceDisplay;
if (item.EnableMediaSourceDisplay == null && item.SourceType && item.SourceType !== 'Library') {
return false;
} }
return true; return !item.SourceType || item.SourceType === 'Library';
} }
export function sortTracks (trackA, trackB) { export function sortTracks (trackA, trackB) {

44
src/components/itemsrefresher.js
View file

@ -4,13 +4,12 @@ import { Events } from 'jellyfin-apiclient';
function onUserDataChanged() { function onUserDataChanged() {
const instance = this; const instance = this;
const eventsToMonitor = getEventsToMonitor(instance); const eventsToMonitor = getEventsToMonitor(instance);
// TODO: Check user data change reason? // TODO: Check user data change reason?
if (eventsToMonitor.indexOf('markfavorite') !== -1) { if (eventsToMonitor.indexOf('markfavorite') !== -1
instance.notifyRefreshNeeded(); || eventsToMonitor.indexOf('markplayed') !== -1
} else if (eventsToMonitor.indexOf('markplayed') !== -1) { ) {
instance.notifyRefreshNeeded(); instance.notifyRefreshNeeded();
} }
} }
@ -25,37 +24,18 @@ function getEventsToMonitor(instance) {
return []; return [];
} }
function onTimerCreated() { function notifyTimerRefresh() {
const instance = this; const instance = this;
if (getEventsToMonitor(instance).indexOf('timers') !== -1) { if (getEventsToMonitor(instance).indexOf('timers') !== -1) {
instance.notifyRefreshNeeded(); instance.notifyRefreshNeeded();
return;
} }
} }
function onSeriesTimerCreated() { function notifySeriesTimerRefresh() {
const instance = this; const instance = this;
if (getEventsToMonitor(instance).indexOf('seriestimers') !== -1) { if (getEventsToMonitor(instance).indexOf('seriestimers') !== -1) {
instance.notifyRefreshNeeded(); instance.notifyRefreshNeeded();
return;
}
}
function onTimerCancelled() {
const instance = this;
if (getEventsToMonitor(instance).indexOf('timers') !== -1) {
instance.notifyRefreshNeeded();
return;
}
}
function onSeriesTimerCancelled() {
const instance = this;
if (getEventsToMonitor(instance).indexOf('seriestimers') !== -1) {
instance.notifyRefreshNeeded();
return;
} }
} }
@ -94,17 +74,15 @@ function onPlaybackStopped(e, stopInfo) {
const state = stopInfo.state; const state = stopInfo.state;
const eventsToMonitor = getEventsToMonitor(instance); const eventsToMonitor = getEventsToMonitor(instance);
if (state.NowPlayingItem && state.NowPlayingItem.MediaType === 'Video') { if (state.NowPlayingItem?.MediaType === 'Video') {
if (eventsToMonitor.indexOf('videoplayback') !== -1) { if (eventsToMonitor.indexOf('videoplayback') !== -1) {
instance.notifyRefreshNeeded(true); instance.notifyRefreshNeeded(true);
return; return;
} }
} else if (state.NowPlayingItem && state.NowPlayingItem.MediaType === 'Audio') { } else if (state.NowPlayingItem?.MediaType === 'Audio' && eventsToMonitor.indexOf('audioplayback') !== -1) {
if (eventsToMonitor.indexOf('audioplayback') !== -1) {
instance.notifyRefreshNeeded(true); instance.notifyRefreshNeeded(true);
return; return;
} }
}
} }
function addNotificationEvent(instance, name, handler, owner) { function addNotificationEvent(instance, name, handler, owner) {
@ -128,10 +106,10 @@ class ItemsRefresher {
this.options = options || {}; this.options = options || {};
addNotificationEvent(this, 'UserDataChanged', onUserDataChanged); addNotificationEvent(this, 'UserDataChanged', onUserDataChanged);
addNotificationEvent(this, 'TimerCreated', onTimerCreated); addNotificationEvent(this, 'TimerCreated', notifyTimerRefresh);
addNotificationEvent(this, 'SeriesTimerCreated', onSeriesTimerCreated); addNotificationEvent(this, 'SeriesTimerCreated', notifySeriesTimerRefresh);
addNotificationEvent(this, 'TimerCancelled', onTimerCancelled); addNotificationEvent(this, 'TimerCancelled', notifyTimerRefresh);
addNotificationEvent(this, 'SeriesTimerCancelled', onSeriesTimerCancelled); addNotificationEvent(this, 'SeriesTimerCancelled', notifySeriesTimerRefresh);
addNotificationEvent(this, 'LibraryChanged', onLibraryChanged); addNotificationEvent(this, 'LibraryChanged', onLibraryChanged);
addNotificationEvent(this, 'playbackstop', onPlaybackStopped, playbackManager); addNotificationEvent(this, 'playbackstop', onPlaybackStopped, playbackManager);
} }

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

@ -383,7 +383,6 @@ import template from './libraryoptionseditor.template.html';
return setContentType(parent, contentType).then(function() { return setContentType(parent, contentType).then(function() {
libraryOptions && setLibraryOptions(parent, libraryOptions); libraryOptions && setLibraryOptions(parent, libraryOptions);
bindEvents(parent); bindEvents(parent);
return;
}); });
}); });
} }

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

@ -328,11 +328,9 @@ import ServerConnections from '../ServerConnections';
textlines.push(datetime.getDisplayTime(datetime.parseISO8601Date(item.StartDate))); textlines.push(datetime.getDisplayTime(datetime.parseISO8601Date(item.StartDate)));
} }
if (options.showChannel) { if (options.showChannel && item.ChannelName) {
if (item.ChannelName) {
textlines.push(item.ChannelName); textlines.push(item.ChannelName);
} }
}
let parentTitle = null; let parentTitle = null;
@ -370,11 +368,9 @@ import ServerConnections from '../ServerConnections';
} }
if (item.IsFolder) { if (item.IsFolder) {
if (options.artist !== false) { if (options.artist !== false && item.AlbumArtist && item.Type === 'MusicAlbum') {
if (item.AlbumArtist && item.Type === 'MusicAlbum') {
textlines.push(item.AlbumArtist); textlines.push(item.AlbumArtist);
} }
}
} else { } else {
if (options.artist) { if (options.artist) {
const artistItems = item.ArtistItems; const artistItems = item.ArtistItems;
@ -386,11 +382,9 @@ import ServerConnections from '../ServerConnections';
} }
} }
if (item.Type === 'TvChannel') { if (item.Type === 'TvChannel' && item.CurrentProgram) {
if (item.CurrentProgram) {
textlines.push(itemHelper.getDisplayName(item.CurrentProgram)); textlines.push(itemHelper.getDisplayName(item.CurrentProgram));
} }
}
cssClass = 'listItemBody'; cssClass = 'listItemBody';
if (!clickEntireItem) { if (!clickEntireItem) {
@ -405,8 +399,7 @@ import ServerConnections from '../ServerConnections';
html += getTextLinesHtml(textlines, isLargeStyle); html += getTextLinesHtml(textlines, isLargeStyle);
if (options.mediaInfo !== false) { if (options.mediaInfo !== false && !enableSideMediaInfo) {
if (!enableSideMediaInfo) {
const mediaInfoClass = 'secondary listItemMediaInfo listItemBodyText'; const mediaInfoClass = 'secondary listItemMediaInfo listItemBodyText';
html += `<div class="${mediaInfoClass}">`; html += `<div class="${mediaInfoClass}">`;
@ -418,7 +411,6 @@ import ServerConnections from '../ServerConnections';
}); });
html += '</div>'; html += '</div>';
} }
}
if (enableOverview && item.Overview) { if (enableOverview && item.Overview) {
html += '<div class="secondary listItem-overview listItemBodyText">'; html += '<div class="secondary listItem-overview listItemBodyText">';
@ -428,8 +420,7 @@ import ServerConnections from '../ServerConnections';
html += '</div>'; html += '</div>';
if (options.mediaInfo !== false) { if (options.mediaInfo !== false && enableSideMediaInfo) {
if (enableSideMediaInfo) {
html += '<div class="secondary listItemMediaInfo">'; html += '<div class="secondary listItemMediaInfo">';
html += mediaInfo.getPrimaryMediaInfoHtml(item, { html += mediaInfo.getPrimaryMediaInfoHtml(item, {
@ -442,7 +433,6 @@ import ServerConnections from '../ServerConnections';
}); });
html += '</div>'; html += '</div>';
} }
}
if (!options.recordButton && (item.Type === 'Timer' || item.Type === 'Program')) { if (!options.recordButton && (item.Type === 'Timer' || item.Type === 'Program')) {
html += indicators.getTimerIndicator(item).replace('indicatorIcon', 'indicatorIcon listItemAside'); html += indicators.getTimerIndicator(item).replace('indicatorIcon', 'indicatorIcon listItemAside');

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

@ -129,8 +129,10 @@ import '../../elements/emby-button/emby-button';
} }
} }
if ((item.Type === 'Episode' || item.MediaType === 'Photo') && options.originalAirDate !== false) { if ((item.Type === 'Episode' || item.MediaType === 'Photo')
if (item.PremiereDate) { && options.originalAirDate !== false
&& item.PremiereDate
) {
try { try {
//don't modify date to locale if episode. Only Dates (not times) are stored, or editable in the edit metadata dialog //don't modify date to locale if episode. Only Dates (not times) are stored, or editable in the edit metadata dialog
date = datetime.parseISO8601Date(item.PremiereDate, item.Type !== 'Episode'); date = datetime.parseISO8601Date(item.PremiereDate, item.Type !== 'Episode');
@ -141,7 +143,6 @@ import '../../elements/emby-button/emby-button';
console.error('error parsing date:', item.PremiereDate); console.error('error parsing date:', item.PremiereDate);
} }
} }
}
if (item.Type === 'SeriesTimer') { if (item.Type === 'SeriesTimer') {
if (item.RecordAnyTime) { if (item.RecordAnyTime) {
@ -239,8 +240,9 @@ import '../../elements/emby-button/emby-button';
} }
} }
if (options.year !== false) { if (options.year !== false && item.Type !== 'Series' && item.Type !== 'Episode' && item.Type !== 'Person'
if (item.Type !== 'Series' && item.Type !== 'Episode' && item.Type !== 'Person' && item.MediaType !== 'Photo' && item.Type !== 'Program' && item.Type !== 'Season') { && item.MediaType !== 'Photo' && item.Type !== 'Program' && item.Type !== 'Season'
) {
if (item.ProductionYear) { if (item.ProductionYear) {
miscInfo.push(item.ProductionYear); miscInfo.push(item.ProductionYear);
} else if (item.PremiereDate) { } else if (item.PremiereDate) {
@ -252,7 +254,6 @@ import '../../elements/emby-button/emby-button';
} }
} }
} }
}
if (item.RunTimeTicks && item.Type !== 'Series' && item.Type !== 'Program' && item.Type !== 'Book' && !showFolderRuntime && options.runtime !== false) { if (item.RunTimeTicks && item.Type !== 'Series' && item.Type !== 'Program' && item.Type !== 'Book' && !showFolderRuntime && options.runtime !== false) {
if (item.Type === 'Audio') { if (item.Type === 'Audio') {
@ -314,15 +315,13 @@ import '../../elements/emby-button/emby-button';
} }
export function getEndsAt(item) { export function getEndsAt(item) {
if (item.MediaType === 'Video' && item.RunTimeTicks) { if (item.MediaType === 'Video' && item.RunTimeTicks && !item.StartDate) {
if (!item.StartDate) {
let endDate = new Date().getTime() + (item.RunTimeTicks / 10000); let endDate = new Date().getTime() + (item.RunTimeTicks / 10000);
endDate = new Date(endDate); endDate = new Date(endDate);
const displayTime = datetime.getDisplayTime(endDate); const displayTime = datetime.getDisplayTime(endDate);
return globalize.translate('EndsAtValue', displayTime); return globalize.translate('EndsAtValue', displayTime);
} }
}
return null; return null;
} }

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

@ -444,13 +444,11 @@ import { appRouter } from '../appRouter';
options = options || {}; options = options || {};
options.type = options.type || 'Primary'; options.type = options.type || 'Primary';
if (options.type === 'Primary') { if (options.type === 'Primary' && item.SeriesPrimaryImageTag) {
if (item.SeriesPrimaryImageTag) {
options.tag = item.SeriesPrimaryImageTag; options.tag = item.SeriesPrimaryImageTag;
return ServerConnections.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options); return ServerConnections.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
} }
}
if (options.type === 'Thumb') { if (options.type === 'Thumb') {
if (item.SeriesThumbImageTag) { if (item.SeriesThumbImageTag) {

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

@ -19,11 +19,7 @@ function enableLocalPlaylistManagement(player) {
return false; return false;
} }
if (player.isLocalPlayer) { return player.isLocalPlayer;
return true;
}
return false;
} }
function bindToFullscreenChange(player) { function bindToFullscreenChange(player) {
@ -44,11 +40,9 @@ function triggerPlayerChange(playbackManagerInstance, newPlayer, newTarget, prev
return; return;
} }
if (newTarget && previousTargetInfo) { if (newTarget && previousTargetInfo && newTarget.id === previousTargetInfo.id) {
if (newTarget.id === previousTargetInfo.id) {
return; return;
} }
}
Events.trigger(playbackManagerInstance, 'playerchange', [newPlayer, newTarget, previousPlayer]); Events.trigger(playbackManagerInstance, 'playerchange', [newPlayer, newTarget, previousPlayer]);
} }
@ -227,11 +221,7 @@ function getParam(name, url) {
} }
function isAutomaticPlayer(player) { function isAutomaticPlayer(player) {
if (player.isLocalPlayer) { return player.isLocalPlayer;
return true;
}
return false;
} }
function getAutomaticPlayers(instance, forceLocalPlayer) { function getAutomaticPlayers(instance, forceLocalPlayer) {
@ -246,10 +236,7 @@ function getAutomaticPlayers(instance, forceLocalPlayer) {
} }
function isServerItem(item) { function isServerItem(item) {
if (!item.Id) { return !!item.Id;
return false;
}
return true;
} }
function enableIntros(item) { function enableIntros(item) {
@ -501,11 +488,11 @@ function getPlaybackInfo(player,
} }
// lastly, enforce player overrides for special situations // lastly, enforce player overrides for special situations
if (query.EnableDirectStream !== false) { if (query.EnableDirectStream !== false
if (player.supportsPlayMethod && !player.supportsPlayMethod('DirectStream', item)) { && player.supportsPlayMethod && !player.supportsPlayMethod('DirectStream', item)
) {
query.EnableDirectStream = false; query.EnableDirectStream = false;
} }
}
if (player.getDirectPlayProtocols) { if (player.getDirectPlayProtocols) {
query.DirectPlayProtocols = player.getDirectPlayProtocols(); query.DirectPlayProtocols = player.getDirectPlayProtocols();
@ -569,11 +556,11 @@ function getLiveStream(player, apiClient, item, playSessionId, deviceProfile, ma
} }
// lastly, enforce player overrides for special situations // lastly, enforce player overrides for special situations
if (query.EnableDirectStream !== false) { if (query.EnableDirectStream !== false
if (player.supportsPlayMethod && !player.supportsPlayMethod('DirectStream', item)) { && player.supportsPlayMethod && !player.supportsPlayMethod('DirectStream', item)
) {
query.EnableDirectStream = false; query.EnableDirectStream = false;
} }
}
return apiClient.ajax({ return apiClient.ajax({
url: apiClient.getUrl('LiveStreams/Open', query), url: apiClient.getUrl('LiveStreams/Open', query),
@ -963,11 +950,9 @@ class PlaybackManager {
self.isPlaying = function (player) { self.isPlaying = function (player) {
player = player || self._currentPlayer; player = player || self._currentPlayer;
if (player) { if (player?.isPlaying) {
if (player.isPlaying) {
return player.isPlaying(); return player.isPlaying();
} }
}
return player != null && player.currentSrc() != null; return player != null && player.currentSrc() != null;
}; };
@ -975,11 +960,9 @@ class PlaybackManager {
self.isPlayingMediaType = function (mediaType, player) { self.isPlayingMediaType = function (mediaType, player) {
player = player || self._currentPlayer; player = player || self._currentPlayer;
if (player) { if (player?.isPlaying) {
if (player.isPlaying) {
return player.isPlaying(mediaType); return player.isPlaying(mediaType);
} }
}
if (self.isPlaying(player)) { if (self.isPlaying(player)) {
const playerData = getPlayerData(player); const playerData = getPlayerData(player);
@ -1027,11 +1010,9 @@ class PlaybackManager {
return true; return true;
} }
if (item.LocationType === 'Virtual') { if (item.LocationType === 'Virtual' && itemType !== 'Program') {
if (itemType !== 'Program') {
return false; return false;
} }
}
if (itemType === 'Program') { if (itemType === 'Program') {
if (!item.EndDate || !item.StartDate) { if (!item.EndDate || !item.StartDate) {
@ -2486,8 +2467,8 @@ class PlaybackManager {
playMethod = 'DirectPlay'; playMethod = 'DirectPlay';
} else if (mediaSource.StreamUrl) { } else if (mediaSource.StreamUrl) {
// Only used for audio // Only used for audio
playMethod = 'Transcode';
mediaUrl = mediaSource.StreamUrl; mediaUrl = mediaSource.StreamUrl;
// Use the default playMethod value of Transcode
} else if (mediaSource.SupportsDirectPlay || mediaSource.SupportsDirectStream) { } else if (mediaSource.SupportsDirectPlay || mediaSource.SupportsDirectStream) {
directOptions = { directOptions = {
Static: true, Static: true,
@ -3015,11 +2996,8 @@ class PlaybackManager {
function enablePlaybackRetryWithTranscoding(streamInfo, errorType, currentlyPreventsVideoStreamCopy, currentlyPreventsAudioStreamCopy) { function enablePlaybackRetryWithTranscoding(streamInfo, errorType, currentlyPreventsVideoStreamCopy, currentlyPreventsAudioStreamCopy) {
// mediadecodeerror, medianotsupported, network, servererror // mediadecodeerror, medianotsupported, network, servererror
if (streamInfo.mediaSource.SupportsTranscoding && (!currentlyPreventsVideoStreamCopy || !currentlyPreventsAudioStreamCopy)) { return streamInfo.mediaSource.SupportsTranscoding
return true; && (!currentlyPreventsVideoStreamCopy || !currentlyPreventsAudioStreamCopy);
}
return false;
} }
function onPlaybackError(e, error) { function onPlaybackError(e, error) {
@ -3300,13 +3278,13 @@ class PlaybackManager {
reportPlayback(self, state, player, reportPlaylist, serverId, 'reportPlaybackProgress', progressEventName); reportPlayback(self, state, player, reportPlaylist, serverId, 'reportPlaybackProgress', progressEventName);
} }
if (streamInfo && streamInfo.liveStreamId) { if (streamInfo?.liveStreamId
if (new Date().getTime() - (streamInfo.lastMediaInfoQuery || 0) >= 600000) { && (new Date().getTime() - (streamInfo.lastMediaInfoQuery || 0) >= 600000)
) {
getLiveStreamMediaInfo(player, streamInfo, self.currentMediaSource(player), streamInfo.liveStreamId, serverId); getLiveStreamMediaInfo(player, streamInfo, self.currentMediaSource(player), streamInfo.liveStreamId, serverId);
} }
} }
} }
}
function getLiveStreamMediaInfo(player, streamInfo, mediaSource, liveStreamId, serverId) { function getLiveStreamMediaInfo(player, streamInfo, mediaSource, liveStreamId, serverId) {
console.debug('getLiveStreamMediaInfo'); console.debug('getLiveStreamMediaInfo');
@ -3568,11 +3546,9 @@ class PlaybackManager {
} }
getBufferedRanges(player = this._currentPlayer) { getBufferedRanges(player = this._currentPlayer) {
if (player) { if (player?.getBufferedRanges) {
if (player.getBufferedRanges) {
return player.getBufferedRanges(); return player.getBufferedRanges();
} }
}
return []; return [];
} }
@ -3842,21 +3818,17 @@ class PlaybackManager {
removeActivePlayer(name) { removeActivePlayer(name) {
const playerInfo = this.getPlayerInfo(); const playerInfo = this.getPlayerInfo();
if (playerInfo) { if (playerInfo?.name === name) {
if (playerInfo.name === name) {
this.setDefaultPlayerActive(); this.setDefaultPlayerActive();
} }
} }
}
removeActiveTarget(id) { removeActiveTarget(id) {
const playerInfo = this.getPlayerInfo(); const playerInfo = this.getPlayerInfo();
if (playerInfo) { if (playerInfo?.id === id) {
if (playerInfo.id === id) {
this.setDefaultPlayerActive(); this.setDefaultPlayerActive();
} }
} }
}
sendCommand(cmd, player) { sendCommand(cmd, player) {
console.debug('MediaController received command: ' + cmd.Name); console.debug('MediaController received command: ' + cmd.Name);

9
src/components/playback/playerSelectionMenu.js
View file

@ -29,12 +29,10 @@ function mirrorIfEnabled(info) {
if (info && playbackManager.enableDisplayMirroring()) { if (info && playbackManager.enableDisplayMirroring()) {
const getPlayerInfo = playbackManager.getPlayerInfo(); const getPlayerInfo = playbackManager.getPlayerInfo();
if (getPlayerInfo) { if (getPlayerInfo && !getPlayerInfo.isLocalPlayer && getPlayerInfo.supportedCommands.indexOf('DisplayContent') !== -1) {
if (!getPlayerInfo.isLocalPlayer && getPlayerInfo.supportedCommands.indexOf('DisplayContent') !== -1) {
mirrorItem(info, playbackManager.getCurrentPlayer()); mirrorItem(info, playbackManager.getCurrentPlayer());
} }
} }
}
} }
function emptyCallback() { function emptyCallback() {
@ -85,12 +83,10 @@ function getIcon(target) {
export function show(button) { export function show(button) {
const currentPlayerInfo = playbackManager.getPlayerInfo(); const currentPlayerInfo = playbackManager.getPlayerInfo();
if (currentPlayerInfo) { if (currentPlayerInfo && !currentPlayerInfo.isLocalPlayer) {
if (!currentPlayerInfo.isLocalPlayer) {
showActivePlayerMenu(currentPlayerInfo); showActivePlayerMenu(currentPlayerInfo);
return; return;
} }
}
const currentPlayerId = currentPlayerInfo ? currentPlayerInfo.id : null; const currentPlayerId = currentPlayerInfo ? currentPlayerInfo.id : null;
@ -299,7 +295,6 @@ document.addEventListener('viewshow', function (e) {
mirrorIfEnabled({ mirrorIfEnabled({
item: item item: item
}); });
return;
} }
}); });

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

@ -238,7 +238,6 @@ function showWithUser(options, player, user) {
return actionsheet.show({ return actionsheet.show({
items: menuItems, items: menuItems,
resolveOnClick: true,
positionTo: options.positionTo positionTo: options.positionTo
}).then(function (id) { }).then(function (id) {
return handleSelectedOption(id, options, player); return handleSelectedOption(id, options, player);

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

@ -4,7 +4,7 @@ import globalize from '../../scripts/globalize';
import layoutManager from '../layoutManager'; import layoutManager from '../layoutManager';
import { playbackManager } from '../playback/playbackmanager'; import { playbackManager } from '../playback/playbackmanager';
import playMethodHelper from '../playback/playmethodhelper'; import playMethodHelper from '../playback/playmethodhelper';
import SyncPlay from '../../components/syncPlay/core'; import SyncPlay from '../../plugins/syncPlay/core';
import './playerstats.scss'; import './playerstats.scss';
import ServerConnections from '../ServerConnections'; import ServerConnections from '../ServerConnections';

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

@ -4,7 +4,7 @@ import dialogHelper from '../dialogHelper/dialogHelper';
import loading from '../loading/loading'; import loading from '../loading/loading';
import layoutManager from '../layoutManager'; import layoutManager from '../layoutManager';
import { playbackManager } from '../playback/playbackmanager'; import { playbackManager } from '../playback/playbackmanager';
import SyncPlay from '../../components/syncPlay/core'; import SyncPlay from '../../plugins/syncPlay/core';
import * as userSettings from '../../scripts/settings/userSettings'; import * as userSettings from '../../scripts/settings/userSettings';
import { appRouter } from '../appRouter'; import { appRouter } from '../appRouter';
import globalize from '../../scripts/globalize'; import globalize from '../../scripts/globalize';

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

@ -106,11 +106,9 @@ function getIndicatorIcon(item) {
return 'fiber_manual_record'; return 'fiber_manual_record';
} }
if (item.SeriesTimerId) { if (item.SeriesTimerId && status !== 'Cancelled') {
if (status !== 'Cancelled') {
return 'fiber_smart_record'; return 'fiber_smart_record';
} }
}
return 'fiber_manual_record'; return 'fiber_manual_record';
} }

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

@ -129,7 +129,6 @@ function executeCloseAction(action, programId, serverId) {
serverId: serverId serverId: serverId
}); });
}); });
return;
} }
} }

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

@ -61,40 +61,20 @@ function fetchData(instance) {
function onTimerChangedExternally(e, apiClient, data) { function onTimerChangedExternally(e, apiClient, data) {
const options = this.options; const options = this.options;
let refresh = false;
if (data.Id) { if ((data.Id && this.TimerId === data.Id)
if (this.TimerId === data.Id) { || (data.ProgramId && options && options.programId === data.ProgramId)
refresh = true; ) {
}
}
if (data.ProgramId && options) {
if (options.programId === data.ProgramId) {
refresh = true;
}
}
if (refresh) {
this.refresh(); this.refresh();
} }
} }
function onSeriesTimerChangedExternally(e, apiClient, data) { function onSeriesTimerChangedExternally(e, apiClient, data) {
const options = this.options; const options = this.options;
let refresh = false;
if (data.Id) { if ((data.Id && this.SeriesTimerId === data.Id)
if (this.SeriesTimerId === data.Id) { || (data.ProgramId && options && options.programId === data.ProgramId)
refresh = true; ) {
}
}
if (data.ProgramId && options) {
if (options.programId === data.ProgramId) {
refresh = true;
}
}
if (refresh) {
this.refresh(); this.refresh();
} }
} }

6
src/components/scrollManager.js
View file

@ -479,11 +479,7 @@ import layoutManager from './layoutManager';
* Returns true if smooth scroll must be used. * Returns true if smooth scroll must be used.
*/ */
function useSmoothScroll() { function useSmoothScroll() {
if (browser.tizen) { return !!browser.tizen;
return true;
}
return false;
} }
/** /**

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

@ -46,12 +46,10 @@ function getImageUrl(item, options, apiClient) {
return apiClient.getScaledImageUrl(item.Id, options); return apiClient.getScaledImageUrl(item.Id, options);
} }
if (options.type === 'Primary') { if (options.type === 'Primary' && item.AlbumId && item.AlbumPrimaryImageTag) {
if (item.AlbumId && item.AlbumPrimaryImageTag) {
options.tag = item.AlbumPrimaryImageTag; options.tag = item.AlbumPrimaryImageTag;
return apiClient.getScaledImageUrl(item.AlbumId, options); return apiClient.getScaledImageUrl(item.AlbumId, options);
} }
}
return null; return null;
} }

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

@ -114,11 +114,9 @@ function fillSubtitleList(context, item) {
itemHtml += '</a>'; itemHtml += '</a>';
itemHtml += '</div>'; itemHtml += '</div>';
if (!layoutManager.tv) { if (!layoutManager.tv && s.Path) {
if (s.Path) {
itemHtml += '<button is="paper-icon-button-light" data-index="' + s.Index + '" title="' + globalize.translate('Delete') + '" class="btnDelete listItemButton"><span class="material-icons delete" aria-hidden="true"></span></button>'; itemHtml += '<button is="paper-icon-button-light" data-index="' + s.Index + '" title="' + globalize.translate('Delete') + '" class="btnDelete listItemButton"><span class="material-icons delete" aria-hidden="true"></span></button>';
} }
}
itemHtml += '</' + tagName + '>'; itemHtml += '</' + tagName + '>';
@ -336,12 +334,8 @@ function showDownloadOptions(button, context, subtitleId) {
positionTo: button positionTo: button
}).then(function (id) { }).then(function (id) {
switch (id) { if (id === 'download') {
case 'download':
downloadRemoteSubtitles(context, subtitleId); downloadRemoteSubtitles(context, subtitleId);
break;
default:
break;
} }
}); });
}); });

25
src/components/subtitlesync/subtitlesync.js
View file

@ -144,10 +144,13 @@ class SubtitleSync {
} }
toggle(action) { toggle(action) {
if (action && !['hide', 'forceToHide'].includes(action)) {
console.warn('SubtitleSync.toggle called with invalid action', action);
return;
}
if (player && playbackManager.supportSubtitleOffset(player)) { if (player && playbackManager.supportSubtitleOffset(player)) {
/* eslint-disable no-fallthrough */ if (!action) {
switch (action) {
case undefined:
// if showing subtitle sync is enabled and if there is an external subtitle stream enabled // if showing subtitle sync is enabled and if there is an external subtitle stream enabled
if (playbackManager.isShowingSubtitleOffsetEnabled(player) && playbackManager.canHandleOffsetOnCurrentSubtitle(player)) { if (playbackManager.isShowingSubtitleOffsetEnabled(player) && playbackManager.canHandleOffsetOnCurrentSubtitle(player)) {
// if no subtitle offset is defined or element has focus (offset being defined) // if no subtitle offset is defined or element has focus (offset being defined)
@ -159,18 +162,14 @@ class SubtitleSync {
} }
// show subtitle sync // show subtitle sync
subtitleSyncContainer.classList.remove('hide'); subtitleSyncContainer.classList.remove('hide');
break; // stop here return;
} // else continue and hide
case 'hide':
// only break if element has focus
if (subtitleSyncTextField.hasFocus) {
break;
} }
case 'forceToHide': } else if (action === 'hide' && subtitleSyncTextField.hasFocus) {
// do not hide if element has focus
return;
}
subtitleSyncContainer.classList.add('hide'); subtitleSyncContainer.classList.add('hide');
break;
}
/* eslint-enable no-fallthrough */
} }
} }
} }

8
src/components/tunerPicker.js
View file

@ -26,7 +26,8 @@ function getEditorHtml() {
html += '<div is="emby-itemscontainer" class="results vertical-wrap">'; html += '<div is="emby-itemscontainer" class="results vertical-wrap">';
html += '</div>'; html += '</div>';
html += '</div>'; html += '</div>';
return html += '</div>'; html += '</div>';
return html;
} }
function getDeviceHtml(device) { function getDeviceHtml(device) {
@ -61,11 +62,12 @@ function getDeviceHtml(device) {
html += '</div>'; html += '</div>';
html += '</div>'; html += '</div>';
html += '</div>'; html += '</div>';
return html += '</button>'; html += '</button>';
return html;
} }
function getTunerName(providerId) { function getTunerName(providerId) {
switch (providerId = providerId.toLowerCase()) { switch (providerId.toLowerCase()) {
case 'm3u': case 'm3u':
return 'M3U'; return 'M3U';

2
src/components/tvproviders/schedulesdirect.js
View file

@ -203,7 +203,7 @@ export default function (page, providerId, options) {
} }
function getTunerName(providerId) { function getTunerName(providerId) {
switch (providerId = providerId.toLowerCase()) { switch (providerId.toLowerCase()) {
case 'm3u': case 'm3u':
return 'M3U Playlist'; return 'M3U Playlist';
case 'hdhomerun': case 'hdhomerun':

2
src/components/tvproviders/xmltv.js
View file

@ -106,7 +106,7 @@ export default function (page, providerId, options) {
} }
function getTunerName(providerId) { function getTunerName(providerId) {
switch (providerId = providerId.toLowerCase()) { switch (providerId.toLowerCase()) {
case 'm3u': case 'm3u':
return 'M3U Playlist'; return 'M3U Playlist';
case 'hdhomerun': case 'hdhomerun':

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

@ -103,9 +103,9 @@ function getViewEventDetail(view, {state, url, options = {}}, isRestored) {
const searchParams = new URLSearchParams(url.substring(index + 1)); const searchParams = new URLSearchParams(url.substring(index + 1));
const params = {}; const params = {};
searchParams.forEach((value, key) => searchParams.forEach((value, key) => {
params[key] = value params[key] = value;
); });
return { return {
detail: { detail: {

3
src/config.json
View file

@ -44,6 +44,7 @@
"pdfPlayer/plugin", "pdfPlayer/plugin",
"logoScreensaver/plugin", "logoScreensaver/plugin",
"sessionPlayer/plugin", "sessionPlayer/plugin",
"chromecastPlayer/plugin" "chromecastPlayer/plugin",
"syncPlay/plugin"
] ]
} }

3
src/controllers/dashboard/apikeys.js
View file

@ -37,7 +37,8 @@ import { pageIdOn } from '../../utils/dashboard';
const date = datetime.parseISO8601Date(item.DateCreated, true); const date = datetime.parseISO8601Date(item.DateCreated, true);
html += datetime.toLocaleDateString(date) + ' ' + datetime.getDisplayTime(date); html += datetime.toLocaleDateString(date) + ' ' + datetime.getDisplayTime(date);
html += '</td>'; html += '</td>';
return html += '</tr>'; html += '</tr>';
return html;
}).join(''); }).join('');
page.querySelector('.resultBody').innerHTML = rows; page.querySelector('.resultBody').innerHTML = rows;
loading.hide(); loading.hide();

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

@ -6,7 +6,7 @@ import serverNotifications from '../../scripts/serverNotifications';
import dom from '../../scripts/dom'; import dom from '../../scripts/dom';
import globalize from '../../scripts/globalize'; import globalize from '../../scripts/globalize';
import { formatDistanceToNow } from 'date-fns'; import { formatDistanceToNow } from 'date-fns';
import { localeWithSuffix } from '../../scripts/dfnshelper'; import { getLocaleWithSuffix } from '../../scripts/dfnshelper';
import loading from '../../components/loading/loading'; import loading from '../../components/loading/loading';
import playMethodHelper from '../../components/playback/playmethodhelper'; import playMethodHelper from '../../components/playback/playmethodhelper';
import cardBuilder from '../../components/cardbuilder/cardBuilder'; import cardBuilder from '../../components/cardbuilder/cardBuilder';
@ -458,7 +458,7 @@ import confirm from '../../components/confirm/confirm';
html += ' / '; html += ' / ';
if (nowPlayingItem && nowPlayingItem.RunTimeTicks) { if (nowPlayingItem.RunTimeTicks) {
html += datetime.getDisplayRunningTime(nowPlayingItem.RunTimeTicks); html += datetime.getDisplayRunningTime(nowPlayingItem.RunTimeTicks);
} else { } else {
html += '0:00'; html += '0:00';
@ -477,7 +477,7 @@ import confirm from '../../components/confirm/confirm';
// how dates are returned by the server when the session is active and show something like 'Active now', instead of past/future sentences // how dates are returned by the server when the session is active and show something like 'Active now', instead of past/future sentences
if (!nowPlayingItem) { if (!nowPlayingItem) {
return { return {
html: globalize.translate('LastSeen', formatDistanceToNow(Date.parse(session.LastActivityDate), localeWithSuffix)), html: globalize.translate('LastSeen', formatDistanceToNow(Date.parse(session.LastActivityDate), getLocaleWithSuffix())),
image: imgUrl image: imgUrl
}; };
} }
@ -747,14 +747,7 @@ import confirm from '../../components/confirm/confirm';
console.debug('onServerRestarting not implemented', evt, apiClient); console.debug('onServerRestarting not implemented', evt, apiClient);
} }
function onPackageInstalling(evt, apiClient) { function onPackageInstall(_, apiClient) {
if (apiClient.serverId() === serverId) {
pollForInfo(view, apiClient);
reloadSystemInfo(view, apiClient);
}
}
function onPackageInstallationCompleted(evt, apiClient) {
if (apiClient.serverId() === serverId) { if (apiClient.serverId() === serverId) {
pollForInfo(view, apiClient); pollForInfo(view, apiClient);
reloadSystemInfo(view, apiClient); reloadSystemInfo(view, apiClient);
@ -786,8 +779,8 @@ import confirm from '../../components/confirm/confirm';
Events.on(serverNotifications, 'RestartRequired', onRestartRequired); Events.on(serverNotifications, 'RestartRequired', onRestartRequired);
Events.on(serverNotifications, 'ServerShuttingDown', onServerShuttingDown); Events.on(serverNotifications, 'ServerShuttingDown', onServerShuttingDown);
Events.on(serverNotifications, 'ServerRestarting', onServerRestarting); Events.on(serverNotifications, 'ServerRestarting', onServerRestarting);
Events.on(serverNotifications, 'PackageInstalling', onPackageInstalling); Events.on(serverNotifications, 'PackageInstalling', onPackageInstall);
Events.on(serverNotifications, 'PackageInstallationCompleted', onPackageInstallationCompleted); Events.on(serverNotifications, 'PackageInstallationCompleted', onPackageInstall);
Events.on(serverNotifications, 'Sessions', onSessionsUpdate); Events.on(serverNotifications, 'Sessions', onSessionsUpdate);
Events.on(serverNotifications, 'ScheduledTasksInfo', onScheduledTasksUpdate); Events.on(serverNotifications, 'ScheduledTasksInfo', onScheduledTasksUpdate);
DashboardPage.lastAppUpdateCheck = null; DashboardPage.lastAppUpdateCheck = null;
@ -800,14 +793,12 @@ import confirm from '../../components/confirm/confirm';
}); });
} }
if (ApiClient.isMinServerVersion('3.4.1.25')) {
if (!page.serverActivityLog) { if (!page.serverActivityLog) {
page.serverActivityLog = new ActivityLog({ page.serverActivityLog = new ActivityLog({
serverId: ApiClient.serverId(), serverId: ApiClient.serverId(),
element: page.querySelector('.serverActivityItems') element: page.querySelector('.serverActivityItems')
}); });
} }
}
refreshActiveRecordings(view, apiClient); refreshActiveRecordings(view, apiClient);
loading.hide(); loading.hide();
@ -826,8 +817,8 @@ import confirm from '../../components/confirm/confirm';
Events.off(serverNotifications, 'RestartRequired', onRestartRequired); Events.off(serverNotifications, 'RestartRequired', onRestartRequired);
Events.off(serverNotifications, 'ServerShuttingDown', onServerShuttingDown); Events.off(serverNotifications, 'ServerShuttingDown', onServerShuttingDown);
Events.off(serverNotifications, 'ServerRestarting', onServerRestarting); Events.off(serverNotifications, 'ServerRestarting', onServerRestarting);
Events.off(serverNotifications, 'PackageInstalling', onPackageInstalling); Events.off(serverNotifications, 'PackageInstalling', onPackageInstall);
Events.off(serverNotifications, 'PackageInstallationCompleted', onPackageInstallationCompleted); Events.off(serverNotifications, 'PackageInstallationCompleted', onPackageInstall);
Events.off(serverNotifications, 'Sessions', onSessionsUpdate); Events.off(serverNotifications, 'Sessions', onSessionsUpdate);
Events.off(serverNotifications, 'ScheduledTasksInfo', onScheduledTasksUpdate); Events.off(serverNotifications, 'ScheduledTasksInfo', onScheduledTasksUpdate);

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

@ -5,7 +5,7 @@ import dom from '../../../scripts/dom';
import globalize from '../../../scripts/globalize'; import globalize from '../../../scripts/globalize';
import imageHelper from '../../../scripts/imagehelper'; import imageHelper from '../../../scripts/imagehelper';
import { formatDistanceToNow } from 'date-fns'; import { formatDistanceToNow } from 'date-fns';
import { localeWithSuffix } from '../../../scripts/dfnshelper'; import { getLocaleWithSuffix } from '../../../scripts/dfnshelper';
import '../../../elements/emby-button/emby-button'; import '../../../elements/emby-button/emby-button';
import '../../../elements/emby-itemscontainer/emby-itemscontainer'; import '../../../elements/emby-itemscontainer/emby-itemscontainer';
import '../../../components/cardbuilder/card.scss'; import '../../../components/cardbuilder/card.scss';
@ -91,6 +91,8 @@ import confirm from '../../../components/confirm/confirm';
} }
function load(page, devices) { function load(page, devices) {
const localeWithSuffix = getLocaleWithSuffix();
let html = ''; let html = '';
html += devices.map(function (device) { html += devices.map(function (device) {
let deviceHtml = ''; let deviceHtml = '';

3
src/controllers/dashboard/dlna/profile.js
View file

@ -149,7 +149,8 @@ import { getParameterByName } from '../../../utils/url.ts';
li += '<h3 class="listItemBodyText">' + escapeHtml(h.Name + ' = ' + (h.Value || '')) + '</h3>'; li += '<h3 class="listItemBodyText">' + escapeHtml(h.Name + ' = ' + (h.Value || '')) + '</h3>';
li += '</div>'; li += '</div>';
li += '<button type="button" is="paper-icon-button-light" class="btnDeleteXmlAttribute listItemButton" data-index="0"><span class="material-icons delete" aria-hidden="true"></span></button>'; li += '<button type="button" is="paper-icon-button-light" class="btnDeleteXmlAttribute listItemButton" data-index="0"><span class="material-icons delete" aria-hidden="true"></span></button>';
return li += '</div>'; li += '</div>';
return li;
}).join('') + '</div>'; }).join('') + '</div>';
const elem = $('.xmlDocumentAttributeList', page).html(html).trigger('create'); const elem = $('.xmlDocumentAttributeList', page).html(html).trigger('create');
$('.btnDeleteXmlAttribute', elem).on('click', function () { $('.btnDeleteXmlAttribute', elem).on('click', function () {

3
src/controllers/dashboard/plugins/available/index.js
View file

@ -129,7 +129,8 @@ function getPluginHtml(plugin, options, installedPlugins) {
html += '</div>'; html += '</div>';
html += '</div>'; html += '</div>';
html += '</div>'; html += '</div>';
return html += '</div>'; html += '</div>';
return html;
} }
function getTabs() { function getTabs() {

4
src/controllers/dashboard/scheduledtasks/scheduledtasks.js
View file

@ -4,7 +4,7 @@ import { Events } from 'jellyfin-apiclient';
import globalize from '../../../scripts/globalize'; import globalize from '../../../scripts/globalize';
import serverNotifications from '../../../scripts/serverNotifications'; import serverNotifications from '../../../scripts/serverNotifications';
import { formatDistance, formatDistanceToNow } from 'date-fns'; import { formatDistance, formatDistanceToNow } from 'date-fns';
import { getLocale, localeWithSuffix } from '../../../scripts/dfnshelper'; import { getLocale, getLocaleWithSuffix } from '../../../scripts/dfnshelper';
import '../../../components/listview/listview.scss'; import '../../../components/listview/listview.scss';
import '../../../elements/emby-button/emby-button'; import '../../../elements/emby-button/emby-button';
@ -86,7 +86,7 @@ import '../../../elements/emby-button/emby-button';
if (task.LastExecutionResult) { if (task.LastExecutionResult) {
const endtime = Date.parse(task.LastExecutionResult.EndTimeUtc); const endtime = Date.parse(task.LastExecutionResult.EndTimeUtc);
const starttime = Date.parse(task.LastExecutionResult.StartTimeUtc); const starttime = Date.parse(task.LastExecutionResult.StartTimeUtc);
html += globalize.translate('LabelScheduledTaskLastRan', formatDistanceToNow(endtime, localeWithSuffix), html += globalize.translate('LabelScheduledTaskLastRan', formatDistanceToNow(endtime, getLocaleWithSuffix()),
formatDistance(starttime, endtime, { locale: getLocale() })); formatDistance(starttime, endtime, { locale: getLocale() }));
if (task.LastExecutionResult.Status === 'Failed') { if (task.LastExecutionResult.Status === 'Failed') {
html += " <span style='color:#FF0000;'>(" + globalize.translate('LabelFailed') + ')</span>'; html += " <span style='color:#FF0000;'>(" + globalize.translate('LabelFailed') + ')</span>';

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

@ -170,7 +170,6 @@ function renderSeriesTimerEditor(page, item, apiClient, user) {
page.querySelector('.seriesTimerScheduleSection').classList.add('hide'); page.querySelector('.seriesTimerScheduleSection').classList.add('hide');
hideAll(page, 'btnCancelSeriesTimer'); hideAll(page, 'btnCancelSeriesTimer');
return;
} }
function renderTrackSelections(page, instance, item, forceReload) { function renderTrackSelections(page, instance, item, forceReload) {
@ -206,8 +205,12 @@ function renderTrackSelections(page, instance, item, forceReload) {
}); });
mediaSources = []; mediaSources = [];
resolutionNames.forEach(v => mediaSources.push(v)); resolutionNames.forEach(v => {
sourceNames.forEach(v => mediaSources.push(v)); mediaSources.push(v);
});
sourceNames.forEach(v => {
mediaSources.push(v);
});
instance._currentPlaybackMediaSources = mediaSources; instance._currentPlaybackMediaSources = mediaSources;

2
src/controllers/list.js
View file

@ -720,8 +720,6 @@ class ItemsView {
if (params.type === 'Video') { if (params.type === 'Video') {
return globalize.translate('Videos'); return globalize.translate('Videos');
} }
return;
} }
function play() { function play() {

6
src/controllers/livetv/livetvrecordings.js
View file

@ -66,11 +66,9 @@ function renderRecordingFolders(context, promise) {
function onMoreClick() { function onMoreClick() {
const type = this.getAttribute('data-type'); const type = this.getAttribute('data-type');
const serverId = ApiClient.serverId();
switch (type) { if (type === 'latest') {
case 'latest': Dashboard.navigate('list.html?type=Recordings&serverId=' + ApiClient.serverId());
Dashboard.navigate('list.html?type=Recordings&serverId=' + serverId);
} }
} }

9
src/controllers/livetvstatus.js
View file

@ -49,7 +49,8 @@ function getDeviceHtml(device) {
html += '</div>'; html += '</div>';
html += '</div>'; html += '</div>';
html += '</div>'; html += '</div>';
return html += '</div>'; html += '</div>';
return html;
} }
function renderDevices(page, devices) { function renderDevices(page, devices) {
@ -191,7 +192,7 @@ function deleteProvider(page, id) {
} }
function getTunerName(providerId) { function getTunerName(providerId) {
switch (providerId = providerId.toLowerCase()) { switch (providerId.toLowerCase()) {
case 'm3u': case 'm3u':
return 'M3U'; return 'M3U';
case 'hdhomerun': case 'hdhomerun':
@ -206,7 +207,7 @@ function getTunerName(providerId) {
} }
function getProviderName(providerId) { function getProviderName(providerId) {
switch (providerId = providerId.toLowerCase()) { switch (providerId.toLowerCase()) {
case 'schedulesdirect': case 'schedulesdirect':
return 'Schedules Direct'; return 'Schedules Direct';
case 'xmltv': case 'xmltv':
@ -217,7 +218,7 @@ function getProviderName(providerId) {
} }
function getProviderConfigurationUrl(providerId) { function getProviderConfigurationUrl(providerId) {
switch (providerId = providerId.toLowerCase()) { switch (providerId.toLowerCase()) {
case 'xmltv': case 'xmltv':
return '#/livetvguideprovider.html?type=xmltv'; return '#/livetvguideprovider.html?type=xmltv';
case 'schedulesdirect': case 'schedulesdirect':

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

@ -374,8 +374,7 @@ import Dashboard from '../../utils/dashboard';
} }
function onInputCommand(e) { function onInputCommand(e) {
switch (e.detail.command) { if (e.detail.command === 'search') {
case 'search':
e.preventDefault(); e.preventDefault();
Dashboard.navigate('search.html?collectionType=movies&parentId=' + params.topParentId); Dashboard.navigate('search.html?collectionType=movies&parentId=' + params.topParentId);
} }

3
src/controllers/music/musicrecommended.js
View file

@ -348,8 +348,7 @@ import Dashboard from '../../utils/dashboard';
} }
function onInputCommand(e) { function onInputCommand(e) {
switch (e.detail.command) { if (e.detail.command === 'search') {
case 'search':
e.preventDefault(); e.preventDefault();
Dashboard.navigate('search.html?collectionType=music&parentId=' + params.topParentId); Dashboard.navigate('search.html?collectionType=music&parentId=' + params.topParentId);
} }

1
src/controllers/playback/video/index.html
View file

@ -21,6 +21,7 @@
<div class="flex flex-direction-row align-items-center" dir="ltr"> <div class="flex flex-direction-row align-items-center" dir="ltr">
<div class="osdTextContainer startTimeText osdPositionText" style="margin: 0 .25em 0 0;"></div> <div class="osdTextContainer startTimeText osdPositionText" style="margin: 0 .25em 0 0;"></div>
<div class="sliderContainer flex-grow" style="margin: .5em 0 .25em;"> <div class="sliderContainer flex-grow" style="margin: .5em 0 .25em;">
<div class="sliderMarkerContainer"></div>
<input type="range" step=".01" min="0" max="100" value="0" is="emby-slider" class="osdPositionSlider" data-slider-keep-progress="true" /> <input type="range" step=".01" min="0" max="100" value="0" is="emby-slider" class="osdPositionSlider" data-slider-keep-progress="true" />
</div> </div>
<div class="osdTextContainer endTimeText osdDurationText" style="margin: 0 0 0 .25em;"></div> <div class="osdTextContainer endTimeText osdDurationText" style="margin: 0 0 0 .25em;"></div>

40
src/controllers/playback/video/index.js
View file

@ -1,6 +1,6 @@
import escapeHtml from 'escape-html'; import escapeHtml from 'escape-html';
import { playbackManager } from '../../../components/playback/playbackmanager'; import { playbackManager } from '../../../components/playback/playbackmanager';
import SyncPlay from '../../../components/syncPlay/core'; import SyncPlay from '../../../plugins/syncPlay/core';
import browser from '../../../scripts/browser'; import browser from '../../../scripts/browser';
import dom from '../../../scripts/dom'; import dom from '../../../scripts/dom';
import inputManager from '../../../scripts/inputManager'; import inputManager from '../../../scripts/inputManager';
@ -1204,17 +1204,6 @@ import { setBackdropTransparency, TRANSPARENCY_LEVEL } from '../../../components
resetIdle(); resetIdle();
} }
function onWindowTouchStart(e) {
clickedElement = e.target;
mouseIsDown = true;
resetIdle();
}
function onWindowTouchEnd() {
mouseIsDown = false;
resetIdle();
}
function onWindowDragEnd() { function onWindowDragEnd() {
// mousedown -> dragstart -> dragend !!! no mouseup :( // mousedown -> dragstart -> dragend !!! no mouseup :(
mouseIsDown = false; mouseIsDown = false;
@ -1370,12 +1359,12 @@ import { setBackdropTransparency, TRANSPARENCY_LEVEL } from '../../../components
capture: true, capture: true,
passive: true passive: true
}); });
dom.addEventListener(window, 'touchstart', onWindowTouchStart, { dom.addEventListener(window, 'touchstart', onWindowMouseDown, {
capture: true, capture: true,
passive: true passive: true
}); });
['touchend', 'touchcancel'].forEach((event) => { ['touchend', 'touchcancel'].forEach((event) => {
dom.addEventListener(window, event, onWindowTouchEnd, { dom.addEventListener(window, event, onWindowMouseUp, {
capture: true, capture: true,
passive: true passive: true
}); });
@ -1411,12 +1400,12 @@ import { setBackdropTransparency, TRANSPARENCY_LEVEL } from '../../../components
capture: true, capture: true,
passive: true passive: true
}); });
dom.removeEventListener(window, 'touchstart', onWindowTouchStart, { dom.removeEventListener(window, 'touchstart', onWindowMouseDown, {
capture: true, capture: true,
passive: true passive: true
}); });
['touchend', 'touchcancel'].forEach((event) => { ['touchend', 'touchcancel'].forEach((event) => {
dom.removeEventListener(window, event, onWindowTouchEnd, { dom.removeEventListener(window, event, onWindowMouseUp, {
capture: true, capture: true,
passive: true passive: true
}); });
@ -1574,6 +1563,25 @@ import { setBackdropTransparency, TRANSPARENCY_LEVEL } from '../../../components
return '<h1 class="sliderBubbleText">' + datetime.getDisplayRunningTime(ticks) + '</h1>'; return '<h1 class="sliderBubbleText">' + datetime.getDisplayRunningTime(ticks) + '</h1>';
}; };
nowPlayingPositionSlider.getMarkerInfo = function () {
const markers = [];
const item = currentItem;
// use markers based on chapters
if (item?.Chapters?.length) {
item.Chapters.forEach(currentChapter => {
markers.push({
className: 'chapterMarker',
name: currentChapter.Name,
progress: currentChapter.StartPositionTicks / item.RunTimeTicks
});
});
}
return markers;
};
view.querySelector('.btnPreviousTrack').addEventListener('click', function () { view.querySelector('.btnPreviousTrack').addEventListener('click', function () {
playbackManager.previousTrack(currentPlayer); playbackManager.previousTrack(currentPlayer);
}); });

1
src/controllers/session/forgotPassword/index.js
View file

@ -35,7 +35,6 @@ import Dashboard from '../../../utils/dashboard';
Dashboard.navigate('forgotpasswordpin.html'); Dashboard.navigate('forgotpasswordpin.html');
} }
}); });
return;
} }
} }

3
src/controllers/shows/tvrecommended.js
View file

@ -333,8 +333,7 @@ import autoFocuser from '../../components/autoFocuser';
} }
function onInputCommand(e) { function onInputCommand(e) {
switch (e.detail.command) { if (e.detail.command === 'search') {
case 'search':
e.preventDefault(); e.preventDefault();
Dashboard.navigate('search.html?collectionType=tv&parentId=' + params.topParentId); Dashboard.navigate('search.html?collectionType=tv&parentId=' + params.topParentId);
} }

6
src/elements/emby-input/emby-input.js
View file

@ -85,14 +85,10 @@ import 'webcomponents.js/webcomponents-lite';
passive: true passive: true
}); });
if (browser.orsay) {
if (this === document.activeElement) {
//Make sure the IME pops up if this is the first/default element on the page //Make sure the IME pops up if this is the first/default element on the page
if (document.attachIME) { if (browser.orsay && this === document.activeElement && document.attachIME) {
document.attachIME(this); document.attachIME(this);
} }
}
}
}; };
function onChange() { function onChange() {

19
src/elements/emby-itemscontainer/emby-itemscontainer.js
View file

@ -21,11 +21,9 @@ import Sortable from 'sortablejs';
const itemsContainer = this; const itemsContainer = this;
const multiSelect = itemsContainer.multiSelect; const multiSelect = itemsContainer.multiSelect;
if (multiSelect) { if (multiSelect?.onContainerClick.call(itemsContainer, e) === false) {
if (multiSelect.onContainerClick.call(itemsContainer, e) === false) {
return; return;
} }
}
itemShortcuts.onClick.call(itemsContainer, e); itemShortcuts.onClick.call(itemsContainer, e);
} }
@ -155,9 +153,9 @@ import Sortable from 'sortablejs';
const eventsToMonitor = getEventsToMonitor(itemsContainer); const eventsToMonitor = getEventsToMonitor(itemsContainer);
// TODO: Check user data change reason? // TODO: Check user data change reason?
if (eventsToMonitor.indexOf('markfavorite') !== -1) { if (eventsToMonitor.indexOf('markfavorite') !== -1
itemsContainer.notifyRefreshNeeded(); || eventsToMonitor.indexOf('markplayed') !== -1
} else if (eventsToMonitor.indexOf('markplayed') !== -1) { ) {
itemsContainer.notifyRefreshNeeded(); itemsContainer.notifyRefreshNeeded();
} }
} }
@ -192,7 +190,6 @@ import Sortable from 'sortablejs';
const itemsContainer = this; const itemsContainer = this;
if (getEventsToMonitor(itemsContainer).indexOf('seriestimers') !== -1) { if (getEventsToMonitor(itemsContainer).indexOf('seriestimers') !== -1) {
itemsContainer.notifyRefreshNeeded(); itemsContainer.notifyRefreshNeeded();
return;
} }
} }
@ -259,13 +256,11 @@ import Sortable from 'sortablejs';
itemsContainer.notifyRefreshNeeded(true); itemsContainer.notifyRefreshNeeded(true);
return; return;
} }
} else if (state.NowPlayingItem && state.NowPlayingItem.MediaType === 'Audio') { } else if (state.NowPlayingItem?.MediaType === 'Audio' && eventsToMonitor.indexOf('audioplayback') !== -1) {
if (eventsToMonitor.indexOf('audioplayback') !== -1) {
itemsContainer.notifyRefreshNeeded(true); itemsContainer.notifyRefreshNeeded(true);
return; return;
} }
} }
}
function addNotificationEvent(instance, name, handler, owner) { function addNotificationEvent(instance, name, handler, owner) {
const localHandler = handler.bind(instance); const localHandler = handler.bind(instance);
@ -298,11 +293,9 @@ import Sortable from 'sortablejs';
} }
} }
if (layoutManager.desktop || layoutManager.mobile) { if (layoutManager.desktop || layoutManager.mobile && this.getAttribute('data-multiselect') !== 'false') {
if (this.getAttribute('data-multiselect') !== 'false') {
this.enableMultiSelect(true); this.enableMultiSelect(true);
} }
}
if (layoutManager.tv) { if (layoutManager.tv) {
this.classList.add('itemsContainer-tv'); this.classList.add('itemsContainer-tv');

12
src/elements/emby-ratingbutton/emby-ratingbutton.js
View file

@ -63,18 +63,6 @@ import ServerConnections from '../../components/ServerConnections';
} }
button.classList.add('ratingbutton-withrating'); button.classList.add('ratingbutton-withrating');
} else if (likes) {
if (icon) {
icon.classList.add('favorite');
icon.classList.remove('ratingbutton-icon-withrating');
}
button.classList.remove('ratingbutton-withrating');
} else if (likes === false) {
if (icon) {
icon.classList.add('favorite');
icon.classList.remove('ratingbutton-icon-withrating');
}
button.classList.remove('ratingbutton-withrating');
} else { } else {
if (icon) { if (icon) {
icon.classList.add('favorite'); icon.classList.add('favorite');

6
src/elements/emby-select/emby-select.js
View file

@ -23,11 +23,7 @@ import 'webcomponents.js/webcomponents-lite';
return true; return true;
} }
if (layoutManager.tv) { return !layoutManager.tv;
return false;
}
return true;
} }
function triggerChange(select) { function triggerChange(select) {

91
src/elements/emby-slider/emby-slider.js
View file

@ -105,6 +105,13 @@ import globalize from '../../scripts/globalize';
fraction *= 100; fraction *= 100;
backgroundLower.style.width = fraction + '%'; backgroundLower.style.width = fraction + '%';
} }
if (range.markerContainerElement) {
if (!range.triedAddingMarkers) {
addMarkers(range);
}
updateMarkers(range, value);
}
}); });
} }
@ -136,6 +143,70 @@ import globalize from '../../scripts/globalize';
}); });
} }
function setMarker(range, valueMarker, marker, valueProgress) {
requestAnimationFrame(function () {
const bubbleTrackRect = range.sliderBubbleTrack.getBoundingClientRect();
const markerRect = marker.getBoundingClientRect();
if (!bubbleTrackRect.width || !markerRect.width) {
// width is not set, most probably because the OSD is currently hidden
return;
}
let markerPos = (bubbleTrackRect.width * valueMarker / 100) - markerRect.width / 2;
markerPos = Math.min(Math.max(markerPos, - markerRect.width / 2), bubbleTrackRect.width - markerRect.width / 2);
marker.style.left = markerPos + 'px';
if (valueProgress >= valueMarker) {
marker.classList.remove('unwatched');
marker.classList.add('watched');
} else {
marker.classList.add('unwatched');
marker.classList.remove('watched');
}
});
}
function updateMarkers(range, currentValue) {
if (range.markerInfo && range.markerInfo.length && range.markerElements && range.markerElements.length) {
for (let i = 0, length = range.markerElements.length; i < length; i++) {
if (range.markerInfo.length > i) {
setMarker(range, mapFractionToValue(range, range.markerInfo[i].progress), range.markerElements[i], currentValue);
}
}
}
}
function addMarkers(range) {
range.markerInfo = [];
if (range.getMarkerInfo) {
range.markerInfo = range.getMarkerInfo();
}
function getMarkerHtml(markerInfo) {
let markerTypeSpecificClasses = '';
if (markerInfo.className === 'chapterMarker') {
markerTypeSpecificClasses = markerInfo.className;
if (typeof markerInfo.name === 'string' && markerInfo.name.length) {
// limit the class length in case the name contains half a novel
markerTypeSpecificClasses = `${markerInfo.className} marker-${markerInfo.name.substring(0, 100).toLowerCase().replace(' ', '-')}`;
}
}
return `<span class="material-icons sliderMarker ${markerTypeSpecificClasses}" aria-hidden="true"></span>`;
}
range.markerInfo.forEach(info => {
range.markerContainerElement.insertAdjacentHTML('beforeend', getMarkerHtml(info));
});
range.markerElements = range.markerContainerElement.querySelectorAll('.sliderMarker');
range.triedAddingMarkers = true;
}
EmbySliderPrototype.attachedCallback = function () { EmbySliderPrototype.attachedCallback = function () {
if (this.getAttribute('data-embyslider') === 'true') { if (this.getAttribute('data-embyslider') === 'true') {
return; return;
@ -193,7 +264,9 @@ import globalize from '../../scripts/globalize';
this.backgroundUpper = containerElement.querySelector('.mdl-slider-background-upper'); this.backgroundUpper = containerElement.querySelector('.mdl-slider-background-upper');
const sliderBubble = containerElement.querySelector('.sliderBubble'); const sliderBubble = containerElement.querySelector('.sliderBubble');
let hasHideClass = sliderBubble.classList.contains('hide'); let hasHideBubbleClass = sliderBubble.classList.contains('hide');
this.markerContainerElement = containerElement.querySelector('.sliderMarkerContainer');
dom.addEventListener(this, 'input', function () { dom.addEventListener(this, 'input', function () {
this.dragging = true; this.dragging = true;
@ -205,9 +278,9 @@ import globalize from '../../scripts/globalize';
const bubbleValue = mapValueToFraction(this, this.value) * 100; const bubbleValue = mapValueToFraction(this, this.value) * 100;
updateBubble(this, bubbleValue, sliderBubble); updateBubble(this, bubbleValue, sliderBubble);
if (hasHideClass) { if (hasHideBubbleClass) {
sliderBubble.classList.remove('hide'); sliderBubble.classList.remove('hide');
hasHideClass = false; hasHideBubbleClass = false;
} }
}, { }, {
passive: true passive: true
@ -221,7 +294,7 @@ import globalize from '../../scripts/globalize';
} }
sliderBubble.classList.add('hide'); sliderBubble.classList.add('hide');
hasHideClass = true; hasHideBubbleClass = true;
}, { }, {
passive: true passive: true
}); });
@ -233,9 +306,9 @@ import globalize from '../../scripts/globalize';
updateBubble(this, bubbleValue, sliderBubble); updateBubble(this, bubbleValue, sliderBubble);
if (hasHideClass) { if (hasHideBubbleClass) {
sliderBubble.classList.remove('hide'); sliderBubble.classList.remove('hide');
hasHideClass = false; hasHideBubbleClass = false;
} }
} }
}, { }, {
@ -245,7 +318,7 @@ import globalize from '../../scripts/globalize';
/* eslint-disable-next-line compat/compat */ /* eslint-disable-next-line compat/compat */
dom.addEventListener(this, (window.PointerEvent ? 'pointerleave' : 'mouseleave'), function () { dom.addEventListener(this, (window.PointerEvent ? 'pointerleave' : 'mouseleave'), function () {
sliderBubble.classList.add('hide'); sliderBubble.classList.add('hide');
hasHideClass = true; hasHideBubbleClass = true;
}, { }, {
passive: true passive: true
}); });
@ -452,11 +525,9 @@ import globalize from '../../scripts/globalize';
} }
for (const range of ranges) { for (const range of ranges) {
if (position != null) { if (position != null && position >= range.end) {
if (position >= range.end) {
continue; continue;
} }
}
setRange(elem, range.start, range.end); setRange(elem, range.start, range.end);
return; return;

22
src/elements/emby-slider/emby-slider.scss
View file

@ -266,3 +266,25 @@
display: block; display: block;
margin-bottom: 0.25em; margin-bottom: 0.25em;
} }
.sliderMarkerContainer {
position: absolute;
left: 0;
right: 0;
margin: 0 0.54em; /* half of slider thumb size */
}
.sliderMarker {
position: absolute;
width: 2px;
height: 0.5em;
transform: translate3d(0, 25%, 0);
}
.sliderMarker.unwatched {
background-color: rgba(255, 255, 255, 0.3);
}
.sliderMarker.watched {
background-color: #00a4dc;
}

4
src/elements/emby-tabs/emby-tabs.js
View file

@ -272,11 +272,9 @@ import '../../assets/css/scrollstyles.scss';
let sibling = elem[method]; let sibling = elem[method];
while (sibling) { while (sibling) {
if (sibling.classList.contains(buttonClass)) { if (sibling.classList.contains(buttonClass) && !sibling.classList.contains('hide')) {
if (!sibling.classList.contains('hide')) {
return sibling; return sibling;
} }
}
sibling = sibling[method]; sibling = sibling[method];
} }

39
src/index.jsx
View file

@ -35,18 +35,13 @@ import './legacy/domParserTextHtml';
import './legacy/focusPreventScroll'; import './legacy/focusPreventScroll';
import './legacy/htmlMediaElement'; import './legacy/htmlMediaElement';
import './legacy/vendorStyles'; import './legacy/vendorStyles';
import SyncPlay from './components/syncPlay/core';
import { playbackManager } from './components/playback/playbackmanager';
import SyncPlayNoActivePlayer from './components/syncPlay/ui/players/NoActivePlayer';
import SyncPlayHtmlVideoPlayer from './components/syncPlay/ui/players/HtmlVideoPlayer';
import SyncPlayHtmlAudioPlayer from './components/syncPlay/ui/players/HtmlAudioPlayer';
import { currentSettings } from './scripts/settings/userSettings'; import { currentSettings } from './scripts/settings/userSettings';
import taskButton from './scripts/taskbutton'; import taskButton from './scripts/taskbutton';
import { HistoryRouter } from './components/HistoryRouter.tsx'; import { HistoryRouter } from './components/HistoryRouter.tsx';
import AppRoutes from './routes/index.tsx'; import AppRoutes from './routes/index.tsx';
function loadCoreDictionary() { function loadCoreDictionary() {
const languages = ['af', 'ar', 'be-by', 'bg-bg', 'bn_bd', 'ca', 'cs', 'cy', 'da', 'de', 'el', 'en-gb', 'en-us', 'eo', 'es', 'es-419', 'es-ar', 'es_do', 'es-mx', 'et', 'fa', 'fi', 'fil', 'fr', 'fr-ca', 'gl', 'gsw', 'he', 'hi-in', 'hr', 'hu', 'id', 'it', 'ja', 'kk', 'ko', 'lt-lt', 'lv', 'mr', 'ms', 'nb', 'nl', 'nn', 'pl', 'pr', 'pt', 'pt-br', 'pt-pt', 'ro', 'ru', 'sk', 'sl-si', 'sq', 'sv', 'ta', 'th', 'tr', 'uk', 'ur_pk', 'vi', 'zh-cn', 'zh-hk', 'zh-tw']; const languages = ['af', 'ar', 'be-by', 'bg-bg', 'bn_bd', 'ca', 'cs', 'cy', 'da', 'de', 'el', 'en-gb', 'en-us', 'eo', 'es', 'es-419', 'es-ar', 'es_do', 'es-mx', 'et', 'eu', 'fa', 'fi', 'fil', 'fr', 'fr-ca', 'gl', 'gsw', 'he', 'hi-in', 'hr', 'hu', 'id', 'it', 'ja', 'kk', 'ko', 'lt-lt', 'lv', 'mr', 'ms', 'nb', 'nl', 'nn', 'pl', 'pr', 'pt', 'pt-br', 'pt-pt', 'ro', 'ru', 'sk', 'sl-si', 'sq', 'sv', 'ta', 'th', 'tr', 'uk', 'ur_pk', 'vi', 'zh-cn', 'zh-hk', 'zh-tw'];
const translations = languages.map(function (language) { const translations = languages.map(function (language) {
return { return {
lang: language, lang: language,
@ -84,11 +79,11 @@ function init() {
} }
function onGlobalizeInit() { function onGlobalizeInit() {
if (window.appMode === 'android') { if (window.appMode === 'android'
if (window.location.href.toString().toLowerCase().indexOf('start=backgroundsync') !== -1) { && window.location.href.toString().toLowerCase().indexOf('start=backgroundsync') !== -1
) {
return onAppReady(); return onAppReady();
} }
}
document.title = globalize.translateHtml(document.title, 'core'); document.title = globalize.translateHtml(document.title, 'core');
@ -102,10 +97,7 @@ function onGlobalizeInit() {
import('./assets/css/librarybrowser.scss'); import('./assets/css/librarybrowser.scss');
loadPlugins().then(function () { loadPlugins().then(onAppReady);
initSyncPlay();
onAppReady();
});
} }
function loadPlugins() { function loadPlugins() {
@ -137,27 +129,6 @@ function loadPlugins() {
}); });
} }
function initSyncPlay() {
// Register player wrappers.
SyncPlay.PlayerFactory.setDefaultWrapper(SyncPlayNoActivePlayer);
SyncPlay.PlayerFactory.registerWrapper(SyncPlayHtmlVideoPlayer);
SyncPlay.PlayerFactory.registerWrapper(SyncPlayHtmlAudioPlayer);
// Listen for player changes.
Events.on(playbackManager, 'playerchange', (event, newPlayer, newTarget, oldPlayer) => {
SyncPlay.Manager.onPlayerChange(newPlayer, newTarget, oldPlayer);
});
// Start SyncPlay.
const apiClient = ServerConnections.currentApiClient();
if (apiClient) SyncPlay.Manager.init(apiClient);
// FIXME: Multiple apiClients?
Events.on(ServerConnections, 'apiclientcreated', (e, newApiClient) => SyncPlay.Manager.init(newApiClient));
Events.on(ServerConnections, 'localusersignedin', () => SyncPlay.Manager.updateApiClient(ServerConnections.currentApiClient()));
Events.on(ServerConnections, 'localusersignedout', () => SyncPlay.Manager.updateApiClient(ServerConnections.currentApiClient()));
}
async function onAppReady() { async function onAppReady() {
console.debug('begin onAppReady'); console.debug('begin onAppReady');

4
src/libraries/navdrawer/navdrawer.js
View file

@ -303,8 +303,7 @@ class NavDrawer {
setEdgeSwipeEnabled(enabled) { setEdgeSwipeEnabled(enabled) {
const options = this.options; const options = this.options;
if (!options.disableEdgeSwipe) { if (!options.disableEdgeSwipe && browser.touch) {
if (browser.touch) {
if (enabled) { if (enabled) {
if (!this._edgeSwipeEnabled) { if (!this._edgeSwipeEnabled) {
this._edgeSwipeEnabled = true; this._edgeSwipeEnabled = true;
@ -334,7 +333,6 @@ class NavDrawer {
} }
} }
} }
}
initialize() { initialize() {
const options = Object.assign({}, this.defaults, this.options || {}); const options = Object.assign({}, this.defaults, this.options || {});

11
src/libraries/scroller.js
View file

@ -291,11 +291,9 @@ const scrollerFactory = function (frame, options) {
const now = new Date().getTime(); const now = new Date().getTime();
if (o.autoImmediate) { if (o.autoImmediate && !immediate && (now - (lastAnimate || 0)) <= 50) {
if (!immediate && (now - (lastAnimate || 0)) <= 50) {
immediate = true; immediate = true;
} }
}
if (!immediate && o.skipSlideToWhenVisible && fullItemPos && fullItemPos.isVisible) { if (!immediate && o.skipSlideToWhenVisible && fullItemPos && fullItemPos.isVisible) {
return; return;
@ -482,7 +480,8 @@ const scrollerFactory = function (frame, options) {
*/ */
function dragHandler(event) { function dragHandler(event) {
dragging.released = event.type === 'mouseup' || event.type === 'touchend'; dragging.released = event.type === 'mouseup' || event.type === 'touchend';
const pointer = dragging.touch ? event[dragging.released ? 'changedTouches' : 'touches'][0] : event; const eventName = dragging.released ? 'changedTouches' : 'touches';
const pointer = dragging.touch ? event[eventName][0] : event;
dragging.pathX = pointer.pageX - dragging.initX; dragging.pathX = pointer.pageX - dragging.initX;
dragging.pathY = pointer.pageY - dragging.initY; dragging.pathY = pointer.pageY - dragging.initY;
dragging.path = Math.sqrt(Math.pow(dragging.pathX, 2) + Math.pow(dragging.pathY, 2)); dragging.path = Math.sqrt(Math.pow(dragging.pathX, 2) + Math.pow(dragging.pathY, 2));
@ -808,16 +807,14 @@ const scrollerFactory = function (frame, options) {
passive: true passive: true
}); });
} }
} else if (o.horizontal) { } else if (o.horizontal && o.mouseWheel) {
// Don't bind to mouse events with vertical scroll since the mouse wheel can handle this natively // Don't bind to mouse events with vertical scroll since the mouse wheel can handle this natively
if (o.mouseWheel) {
// Scrolling navigation // Scrolling navigation
dom.addEventListener(scrollSource, wheelEvent, scrollHandler, { dom.addEventListener(scrollSource, wheelEvent, scrollHandler, {
passive: true passive: true
}); });
} }
}
dom.addEventListener(frame, 'click', onFrameClick, { dom.addEventListener(frame, 'click', onFrameClick, {
passive: true, passive: true,

6
src/plugins/bookPlayer/plugin.js
View file

@ -339,11 +339,7 @@ export class BookPlayer {
} }
canPlayItem(item) { canPlayItem(item) {
if (item.Path && item.Path.endsWith('epub')) { return item.Path && item.Path.endsWith('epub');
return true;
}
return false;
} }
} }

4
src/plugins/chromecastPlayer/plugin.js
View file

@ -452,12 +452,10 @@ function normalizeImages(state) {
if (state && state.NowPlayingItem) { if (state && state.NowPlayingItem) {
const item = state.NowPlayingItem; const item = state.NowPlayingItem;
if (!item.ImageTags || !item.ImageTags.Primary) { if ((!item.ImageTags || !item.ImageTags.Primary) && item.PrimaryImageTag) {
if (item.PrimaryImageTag) {
item.ImageTags = item.ImageTags || {}; item.ImageTags = item.ImageTags || {};
item.ImageTags.Primary = item.PrimaryImageTag; item.ImageTags.Primary = item.PrimaryImageTag;
} }
}
if (item.BackdropImageTag && item.BackdropItemId === item.Id) { if (item.BackdropImageTag && item.BackdropItemId === item.Id) {
item.BackdropImageTags = [item.BackdropImageTag]; item.BackdropImageTags = [item.BackdropImageTag];
} }

10
src/plugins/comicsPlayer/plugin.js
View file

@ -172,10 +172,8 @@ export class ComicsPlayer {
onWindowKeyUp(e) { onWindowKeyUp(e) {
const key = keyboardnavigation.getKeyName(e); const key = keyboardnavigation.getKeyName(e);
switch (key) { if (key === 'Escape') {
case 'Escape':
this.stop(); this.stop();
break;
} }
} }
@ -358,11 +356,7 @@ export class ComicsPlayer {
} }
canPlayItem(item) { canPlayItem(item) {
if (item.Path && (item.Path.endsWith('cbz') || item.Path.endsWith('cbr'))) { return item.Path && (item.Path.endsWith('cbz') || item.Path.endsWith('cbr'));
return true;
}
return false;
} }
} }

11
src/plugins/htmlAudioPlayer/plugin.js
View file

@ -41,13 +41,9 @@ function cancelFadeTimeout() {
} }
function supportsFade() { function supportsFade() {
if (browser.tv) {
// Not working on tizen. // Not working on tizen.
// We could possibly enable on other tv's, but all smart tv browsers tend to be pretty primitive // We could possibly enable on other tv's, but all smart tv browsers tend to be pretty primitive
return false; return !browser.tv;
}
return true;
} }
function requireHlsPlayer(callback) { function requireHlsPlayer(callback) {
@ -417,10 +413,7 @@ class HtmlAudioPlayer {
// This is a retry after error // This is a retry after error
resume() { resume() {
const mediaElement = this._mediaElement; this.unpause();
if (mediaElement) {
mediaElement.play();
}
} }
unpause() { unpause() {

42
src/plugins/htmlVideoPlayer/plugin.js
View file

@ -67,17 +67,13 @@ function tryRemoveElement(elem) {
} }
function enableNativeTrackSupport(currentSrc, track) { function enableNativeTrackSupport(currentSrc, track) {
if (track) { if (track?.DeliveryMethod === 'Embed') {
if (track.DeliveryMethod === 'Embed') {
return true; return true;
} }
}
if (browser.firefox) { if (browser.firefox && (currentSrc || '').toLowerCase().includes('.m3u8')) {
if ((currentSrc || '').toLowerCase().includes('.m3u8')) {
return false; return false;
} }
}
if (browser.ps4) { if (browser.ps4) {
return false; return false;
@ -92,12 +88,10 @@ function tryRemoveElement(elem) {
return false; return false;
} }
if (browser.iOS) { if (browser.iOS && (browser.iosVersion || 10) < 10) {
// works in the browser but not the native app // works in the browser but not the native app
if ((browser.iosVersion || 10) < 10) {
return false; return false;
} }
}
if (track) { if (track) {
const format = (track.Codec || '').toLowerCase(); const format = (track.Codec || '').toLowerCase();
@ -279,10 +273,6 @@ function tryRemoveElement(elem) {
* @type {any | undefined} * @type {any | undefined}
*/ */
#lastProfile; #lastProfile;
/**
* @type {MutationObserver | IntersectionObserver | undefined} (Unclear observer typing)
*/
#resizeObserver;
constructor() { constructor() {
if (browser.edgeUwp) { if (browser.edgeUwp) {
@ -969,11 +959,6 @@ function tryRemoveElement(elem) {
* @private * @private
*/ */
destroyCustomTrack(videoElement) { destroyCustomTrack(videoElement) {
if (this.#resizeObserver) {
this.#resizeObserver.disconnect();
this.#resizeObserver = null;
}
if (this.#videoSubtitlesElem) { if (this.#videoSubtitlesElem) {
const subtitlesContainer = this.#videoSubtitlesElem.parentNode; const subtitlesContainer = this.#videoSubtitlesElem.parentNode;
if (subtitlesContainer) { if (subtitlesContainer) {
@ -1497,14 +1482,14 @@ function tryRemoveElement(elem) {
if ( if (
// Check non-standard Safari PiP support // Check non-standard Safari PiP support
typeof video.webkitSupportsPresentationMode === 'function' && video.webkitSupportsPresentationMode('picture-in-picture') && typeof video.webkitSetPresentationMode === 'function' typeof video.webkitSupportsPresentationMode === 'function' && video.webkitSupportsPresentationMode('picture-in-picture') && typeof video.webkitSetPresentationMode === 'function'
// Check non-standard Windows PiP support
|| (window.Windows
&& Windows.UI.ViewManagement.ApplicationView.getForCurrentView()
.isViewModeSupported(Windows.UI.ViewManagement.ApplicationViewMode.compactOverlay))
// Check standard PiP support // Check standard PiP support
|| document.pictureInPictureEnabled || document.pictureInPictureEnabled
) { ) {
list.push('PictureInPicture'); list.push('PictureInPicture');
} else if (window.Windows) {
if (Windows.UI.ViewManagement.ApplicationView.getForCurrentView().isViewModeSupported(Windows.UI.ViewManagement.ApplicationViewMode.compactOverlay)) {
list.push('PictureInPicture');
}
} }
if (browser.safari || browser.iOS || browser.iPad) { if (browser.safari || browser.iOS || browser.iPad) {
@ -1565,13 +1550,7 @@ function tryRemoveElement(elem) {
} }
const video = this.#mediaElement; const video = this.#mediaElement;
if (video) { return !!video?.audioTracks;
if (video.audioTracks) {
return true;
}
}
return false;
} }
static onPictureInPictureError(err) { static onPictureInPictureError(err) {
@ -1703,10 +1682,7 @@ function tryRemoveElement(elem) {
// This is a retry after error // This is a retry after error
resume() { resume() {
const mediaElement = this.#mediaElement; this.unpause();
if (mediaElement) {
mediaElement.play();
}
} }
unpause() { unpause() {

6
src/plugins/pdfPlayer/plugin.js
View file

@ -304,11 +304,7 @@ export class PdfPlayer {
} }
canPlayItem(item) { canPlayItem(item) {
if (item.Path && item.Path.endsWith('pdf')) { return item.Path && item.Path.endsWith('pdf');
return true;
}
return false;
} }
} }

4
src/plugins/sessionPlayer/plugin.js
View file

@ -159,12 +159,10 @@ function normalizeImages(state, apiClient) {
if (state && state.NowPlayingItem) { if (state && state.NowPlayingItem) {
const item = state.NowPlayingItem; const item = state.NowPlayingItem;
if (!item.ImageTags || !item.ImageTags.Primary) { if (!item.ImageTags || !item.ImageTags.Primary && item.PrimaryImageTag) {
if (item.PrimaryImageTag) {
item.ImageTags = item.ImageTags || {}; item.ImageTags = item.ImageTags || {};
item.ImageTags.Primary = item.PrimaryImageTag; item.ImageTags.Primary = item.PrimaryImageTag;
} }
}
if (item.BackdropImageTag && item.BackdropItemId === item.Id) { if (item.BackdropImageTag && item.BackdropItemId === item.Id) {
item.BackdropImageTags = [item.BackdropImageTag]; item.BackdropImageTags = [item.BackdropImageTag];
} }

0
src/components/syncPlay/core/Controller.js → src/plugins/syncPlay/core/Controller.js
View file

0
src/components/syncPlay/core/Helper.js → src/plugins/syncPlay/core/Helper.js
View file

2
src/components/syncPlay/core/Manager.js → src/plugins/syncPlay/core/Manager.js
View file

@ -9,7 +9,7 @@ import TimeSyncCore from './timeSync/TimeSyncCore';
import PlaybackCore from './PlaybackCore'; import PlaybackCore from './PlaybackCore';
import QueueCore from './QueueCore'; import QueueCore from './QueueCore';
import Controller from './Controller'; import Controller from './Controller';
import toast from '../../toast/toast'; import toast from '../../../components/toast/toast';
import globalize from '../../../scripts/globalize'; import globalize from '../../../scripts/globalize';
/** /**

0
src/components/syncPlay/core/PlaybackCore.js → src/plugins/syncPlay/core/PlaybackCore.js
View file

3
src/components/syncPlay/core/QueueCore.js → src/plugins/syncPlay/core/QueueCore.js
View file

@ -4,7 +4,7 @@
*/ */
import globalize from '../../../scripts/globalize'; import globalize from '../../../scripts/globalize';
import toast from '../../toast/toast'; import toast from '../../../components/toast/toast';
import * as Helper from './Helper'; import * as Helper from './Helper';
/** /**
@ -193,7 +193,6 @@ class QueueCore {
} }
this.manager.haltGroupPlayback(apiClient); this.manager.haltGroupPlayback(apiClient);
return;
}); });
} }

0
src/components/syncPlay/core/Settings.js → src/plugins/syncPlay/core/Settings.js
View file

0
src/components/syncPlay/core/index.js → src/plugins/syncPlay/core/index.js
View file

0
src/components/syncPlay/core/players/GenericPlayer.js → src/plugins/syncPlay/core/players/GenericPlayer.js
View file

4
src/components/syncPlay/core/players/PlayerFactory.js → src/plugins/syncPlay/core/players/PlayerFactory.js
View file

@ -16,7 +16,7 @@ class PlayerFactory {
/** /**
* Registers a wrapper to the list of players that can be managed. * Registers a wrapper to the list of players that can be managed.
* @param {GenericPlayer} wrapperClass The wrapper to register. * @param {typeof GenericPlayer} wrapperClass The wrapper to register.
*/ */
registerWrapper(wrapperClass) { registerWrapper(wrapperClass) {
console.debug('SyncPlay WrapperFactory registerWrapper:', wrapperClass.type); console.debug('SyncPlay WrapperFactory registerWrapper:', wrapperClass.type);
@ -25,7 +25,7 @@ class PlayerFactory {
/** /**
* Sets the default player wrapper. * Sets the default player wrapper.
* @param {GenericPlayer} wrapperClass The wrapper. * @param {typeof GenericPlayer} wrapperClass The wrapper.
*/ */
setDefaultWrapper(wrapperClass) { setDefaultWrapper(wrapperClass) {
console.debug('SyncPlay WrapperFactory setDefaultWrapper:', wrapperClass.type); console.debug('SyncPlay WrapperFactory setDefaultWrapper:', wrapperClass.type);

0
src/components/syncPlay/core/timeSync/TimeSync.js → src/plugins/syncPlay/core/timeSync/TimeSync.js
View file

0
src/components/syncPlay/core/timeSync/TimeSyncCore.js → src/plugins/syncPlay/core/timeSync/TimeSyncCore.js
View file

4
src/components/syncPlay/core/timeSync/TimeSyncServer.js → src/plugins/syncPlay/core/timeSync/TimeSyncServer.js
View file

@ -9,10 +9,6 @@ import TimeSync from './TimeSync';
* Class that manages time syncing with server. * Class that manages time syncing with server.
*/ */
class TimeSyncServer extends TimeSync { class TimeSyncServer extends TimeSync {
constructor(syncPlayManager) {
super(syncPlayManager);
}
/** /**
* Makes a ping request to the server. * Makes a ping request to the server.
*/ */

49
src/plugins/syncPlay/plugin.ts Normal file
View file

@ -0,0 +1,49 @@
import { Events } from 'jellyfin-apiclient';
import { playbackManager } from '../../components/playback/playbackmanager';
import ServerConnections from '../../components/ServerConnections';
import SyncPlay from './core';
import SyncPlayNoActivePlayer from './ui/players/NoActivePlayer';
import SyncPlayHtmlVideoPlayer from './ui/players/HtmlVideoPlayer';
import SyncPlayHtmlAudioPlayer from './ui/players/HtmlAudioPlayer';
class SyncPlayPlugin {
name: string;
id: string;
type: string;
priority: number;
constructor() {
this.name = 'SyncPlay Plugin';
this.id = 'syncplay';
// NOTE: This should probably be a "mediaplayer" so the playback manager can handle playback logic, but
// SyncPlay needs refactored so it does not have an independent playback manager.
this.type = 'syncplay';
this.priority = 1;
this.init();
}
init() {
// Register player wrappers.
SyncPlay.PlayerFactory.setDefaultWrapper(SyncPlayNoActivePlayer);
SyncPlay.PlayerFactory.registerWrapper(SyncPlayHtmlVideoPlayer);
SyncPlay.PlayerFactory.registerWrapper(SyncPlayHtmlAudioPlayer);
// Listen for player changes.
Events.on(playbackManager, 'playerchange', (_, newPlayer) => {
SyncPlay.Manager.onPlayerChange(newPlayer);
});
// Start SyncPlay.
const apiClient = ServerConnections.currentApiClient();
if (apiClient) SyncPlay.Manager.init(apiClient);
// FIXME: Multiple apiClients?
Events.on(ServerConnections, 'apiclientcreated', (_, newApiClient) => SyncPlay.Manager.init(newApiClient));
Events.on(ServerConnections, 'localusersignedin', () => SyncPlay.Manager.updateApiClient(ServerConnections.currentApiClient()));
Events.on(ServerConnections, 'localusersignedout', () => SyncPlay.Manager.updateApiClient(ServerConnections.currentApiClient()));
}
}
export default SyncPlayPlugin;

8
src/components/syncPlay/ui/groupSelectionMenu.js → src/plugins/syncPlay/ui/groupSelectionMenu.js
View file

@ -1,12 +1,12 @@
import { Events } from 'jellyfin-apiclient'; import { Events } from 'jellyfin-apiclient';
import SyncPlay from '../core'; import SyncPlay from '../core';
import SyncPlaySettingsEditor from './settings/SettingsEditor'; import SyncPlaySettingsEditor from './settings/SettingsEditor';
import loading from '../../loading/loading'; import loading from '../../../components/loading/loading';
import toast from '../../toast/toast'; import toast from '../../../components/toast/toast';
import actionsheet from '../../actionSheet/actionSheet'; import actionsheet from '../../../components/actionSheet/actionSheet';
import globalize from '../../../scripts/globalize'; import globalize from '../../../scripts/globalize';
import playbackPermissionManager from './playbackPermissionManager'; import playbackPermissionManager from './playbackPermissionManager';
import ServerConnections from '../../ServerConnections'; import ServerConnections from '../../../components/ServerConnections';
import './groupSelectionMenu.scss'; import './groupSelectionMenu.scss';
/** /**

0
src/components/syncPlay/ui/groupSelectionMenu.scss → src/plugins/syncPlay/ui/groupSelectionMenu.scss
View file

2
src/components/syncPlay/ui/playbackPermissionManager.js → src/plugins/syncPlay/ui/playbackPermissionManager.js
View file

@ -1,4 +1,4 @@
import { appHost } from '../../apphost'; import { appHost } from '../../../components/apphost';
/** /**
* Creates an audio element that plays a silent sound. * Creates an audio element that plays a silent sound.

4
src/components/syncPlay/ui/players/HtmlAudioPlayer.js → src/plugins/syncPlay/ui/players/HtmlAudioPlayer.js
View file

@ -10,10 +10,6 @@ import HtmlVideoPlayer from './HtmlVideoPlayer';
*/ */
class HtmlAudioPlayer extends HtmlVideoPlayer { class HtmlAudioPlayer extends HtmlVideoPlayer {
static type = 'htmlaudioplayer'; static type = 'htmlaudioplayer';
constructor(player, syncPlayManager) {
super(player, syncPlayManager);
}
} }
export default HtmlAudioPlayer; export default HtmlAudioPlayer;

0
src/components/syncPlay/ui/players/HtmlVideoPlayer.js → src/plugins/syncPlay/ui/players/HtmlVideoPlayer.js
View file

2
src/components/syncPlay/ui/players/NoActivePlayer.js → src/plugins/syncPlay/ui/players/NoActivePlayer.js
View file

@ -3,7 +3,7 @@
* @module components/syncPlay/ui/players/NoActivePlayer * @module components/syncPlay/ui/players/NoActivePlayer
*/ */
import { playbackManager } from '../../../playback/playbackmanager'; import { playbackManager } from '../../../../components/playback/playbackmanager';
import SyncPlay from '../../core'; import SyncPlay from '../../core';
import QueueManager from './QueueManager'; import QueueManager from './QueueManager';

0
src/components/syncPlay/ui/players/QueueManager.js → src/plugins/syncPlay/ui/players/QueueManager.js
View file

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