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

small fixes to cleanup no-nested-ternary

Browse source
This commit is contained in:
Ryan Hartzell 2022-05-16 12:23:22 -07:00
parent d895a4fc6a
commit f58d7b0beb
3 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -550,13 +550,9 @@ import template from './libraryoptionseditor.template.html';
function getOrderedPlugins(plugins, configuredOrder) { function getOrderedPlugins(plugins, configuredOrder) {
plugins = plugins.slice(0); plugins = plugins.slice(0);
plugins.sort((a, b) => { plugins.sort((a, b) => {
let order = 0; a = configuredOrder.indexOf(a.Name);
if (a < b) { b = configuredOrder.indexOf(b.Name);
order = -1; return a - b;
} else if (a > b) {
order = 1;
}
return a = configuredOrder.indexOf(a.Name), b = configuredOrder.indexOf(b.Name), order;
}); });
return plugins; return plugins;
} }

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

@ -27,6 +27,8 @@ import LibraryMenu from '../../../scripts/libraryMenu';
import { setBackdropTransparency, TRANSPARENCY_LEVEL } from '../../../components/backdrop/backdrop'; import { setBackdropTransparency, TRANSPARENCY_LEVEL } from '../../../components/backdrop/backdrop';
/* eslint-disable indent */ /* eslint-disable indent */
const TICKS_PER_MINUTE = 600000000;
const TICKS_PER_SECOND = 10000000;
function getOpenedDialog() { function getOpenedDialog() {
return document.querySelector('.dialogContainer .dialog.opened'); return document.querySelector('.dialogContainer .dialog.opened');
@ -588,15 +590,15 @@ import { setBackdropTransparency, TRANSPARENCY_LEVEL } from '../../../components
function showComingUpNextIfNeeded(player, currentItem, currentTimeTicks, runtimeTicks) { function showComingUpNextIfNeeded(player, currentItem, currentTimeTicks, runtimeTicks) {
if (runtimeTicks && currentTimeTicks && !comingUpNextDisplayed && !currentVisibleMenu && currentItem.Type === 'Episode' && userSettings.enableNextVideoInfoOverlay()) { if (runtimeTicks && currentTimeTicks && !comingUpNextDisplayed && !currentVisibleMenu && currentItem.Type === 'Episode' && userSettings.enableNextVideoInfoOverlay()) {
let showAtSecondsLeft = 30; let showAtSecondsLeft = 30;
if (runtimeTicks >= 3e10) { if (runtimeTicks >= 50 * TICKS_PER_MINUTE) {
showAtSecondsLeft = 40; showAtSecondsLeft = 40;
} else if (runtimeTicks >= 2.4e10) { } else if (runtimeTicks >= 40 * TICKS_PER_MINUTE) {
showAtSecondsLeft = 35; showAtSecondsLeft = 35;
} }
const showAtTicks = runtimeTicks - 1e3 * showAtSecondsLeft * 1e4; const showAtTicks = runtimeTicks - showAtSecondsLeft * TICKS_PER_SECOND;
const timeRemainingTicks = runtimeTicks - currentTimeTicks; const timeRemainingTicks = runtimeTicks - currentTimeTicks;
if (currentTimeTicks >= showAtTicks && runtimeTicks >= 6e9 && timeRemainingTicks >= 2e8) { if (currentTimeTicks >= showAtTicks && runtimeTicks >= (10 * TICKS_PER_MINUTE) && timeRemainingTicks >= (20 * TICKS_PER_SECOND)) {
showComingUpNext(player); showComingUpNext(player);
} }
} }

2
src/scripts/browserDeviceProfile.js
View file

@ -387,7 +387,7 @@ import browser from './browser';
} }
/* eslint-disable compat/compat */ /* eslint-disable compat/compat */
let maxVideoWidth = (browser.xboxOne && window.screen) ? window.screen.width : null; let maxVideoWidth = browser.xboxOne ? window.screen?.width : null;
/* eslint-enable compat/compat */ /* eslint-enable compat/compat */
if (options.maxVideoWidth) { if (options.maxVideoWidth) {