diff --git a/src/controllers/playback/video/index.js b/src/controllers/playback/video/index.js
index 14f56cbcc6..a0b5da28f3 100644
--- a/src/controllers/playback/video/index.js
+++ b/src/controllers/playback/video/index.js
@@ -1,6 +1,6 @@
import escapeHtml from 'escape-html';
import { playbackManager } from '../../../components/playback/playbackmanager';
-import SyncPlay from '../../../components/syncPlay/core';
+import SyncPlay from '../../../plugins/syncPlay/core';
import browser from '../../../scripts/browser';
import dom from '../../../scripts/dom';
import inputManager from '../../../scripts/inputManager';
@@ -1204,17 +1204,6 @@ import { setBackdropTransparency, TRANSPARENCY_LEVEL } from '../../../components
resetIdle();
}
- function onWindowTouchStart(e) {
- clickedElement = e.target;
- mouseIsDown = true;
- resetIdle();
- }
-
- function onWindowTouchEnd() {
- mouseIsDown = false;
- resetIdle();
- }
-
function onWindowDragEnd() {
// mousedown -> dragstart -> dragend !!! no mouseup :(
mouseIsDown = false;
@@ -1370,12 +1359,12 @@ import { setBackdropTransparency, TRANSPARENCY_LEVEL } from '../../../components
capture: true,
passive: true
});
- dom.addEventListener(window, 'touchstart', onWindowTouchStart, {
+ dom.addEventListener(window, 'touchstart', onWindowMouseDown, {
capture: true,
passive: true
});
['touchend', 'touchcancel'].forEach((event) => {
- dom.addEventListener(window, event, onWindowTouchEnd, {
+ dom.addEventListener(window, event, onWindowMouseUp, {
capture: true,
passive: true
});
@@ -1411,12 +1400,12 @@ import { setBackdropTransparency, TRANSPARENCY_LEVEL } from '../../../components
capture: true,
passive: true
});
- dom.removeEventListener(window, 'touchstart', onWindowTouchStart, {
+ dom.removeEventListener(window, 'touchstart', onWindowMouseDown, {
capture: true,
passive: true
});
['touchend', 'touchcancel'].forEach((event) => {
- dom.removeEventListener(window, event, onWindowTouchEnd, {
+ dom.removeEventListener(window, event, onWindowMouseUp, {
capture: true,
passive: true
});
@@ -1574,6 +1563,25 @@ import { setBackdropTransparency, TRANSPARENCY_LEVEL } from '../../../components
return '
' + datetime.getDisplayRunningTime(ticks) + '
';
};
+ 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 () {
playbackManager.previousTrack(currentPlayer);
});
diff --git a/src/controllers/session/forgotPassword/index.js b/src/controllers/session/forgotPassword/index.js
index 208e54d063..87a0498bf0 100644
--- a/src/controllers/session/forgotPassword/index.js
+++ b/src/controllers/session/forgotPassword/index.js
@@ -35,7 +35,6 @@ import Dashboard from '../../../utils/dashboard';
Dashboard.navigate('forgotpasswordpin.html');
}
});
- return;
}
}
diff --git a/src/controllers/shows/tvrecommended.js b/src/controllers/shows/tvrecommended.js
index 7dd916f6d8..671ddd12bc 100644
--- a/src/controllers/shows/tvrecommended.js
+++ b/src/controllers/shows/tvrecommended.js
@@ -333,10 +333,9 @@ import autoFocuser from '../../components/autoFocuser';
}
function onInputCommand(e) {
- switch (e.detail.command) {
- case 'search':
- e.preventDefault();
- Dashboard.navigate('search.html?collectionType=tv&parentId=' + params.topParentId);
+ if (e.detail.command === 'search') {
+ e.preventDefault();
+ Dashboard.navigate('search.html?collectionType=tv&parentId=' + params.topParentId);
}
}
diff --git a/src/elements/emby-input/emby-input.js b/src/elements/emby-input/emby-input.js
index f9ea23f2ea..f62bcbf345 100644
--- a/src/elements/emby-input/emby-input.js
+++ b/src/elements/emby-input/emby-input.js
@@ -85,13 +85,9 @@ import 'webcomponents.js/webcomponents-lite';
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
- if (document.attachIME) {
- document.attachIME(this);
- }
- }
+ //Make sure the IME pops up if this is the first/default element on the page
+ if (browser.orsay && this === document.activeElement && document.attachIME) {
+ document.attachIME(this);
}
};
diff --git a/src/elements/emby-itemscontainer/emby-itemscontainer.js b/src/elements/emby-itemscontainer/emby-itemscontainer.js
index 37edb8224c..b6d0f147b7 100644
--- a/src/elements/emby-itemscontainer/emby-itemscontainer.js
+++ b/src/elements/emby-itemscontainer/emby-itemscontainer.js
@@ -21,10 +21,8 @@ import Sortable from 'sortablejs';
const itemsContainer = this;
const multiSelect = itemsContainer.multiSelect;
- if (multiSelect) {
- if (multiSelect.onContainerClick.call(itemsContainer, e) === false) {
- return;
- }
+ if (multiSelect?.onContainerClick.call(itemsContainer, e) === false) {
+ return;
}
itemShortcuts.onClick.call(itemsContainer, e);
@@ -155,9 +153,9 @@ import Sortable from 'sortablejs';
const eventsToMonitor = getEventsToMonitor(itemsContainer);
// TODO: Check user data change reason?
- if (eventsToMonitor.indexOf('markfavorite') !== -1) {
- itemsContainer.notifyRefreshNeeded();
- } else if (eventsToMonitor.indexOf('markplayed') !== -1) {
+ if (eventsToMonitor.indexOf('markfavorite') !== -1
+ || eventsToMonitor.indexOf('markplayed') !== -1
+ ) {
itemsContainer.notifyRefreshNeeded();
}
}
@@ -192,7 +190,6 @@ import Sortable from 'sortablejs';
const itemsContainer = this;
if (getEventsToMonitor(itemsContainer).indexOf('seriestimers') !== -1) {
itemsContainer.notifyRefreshNeeded();
- return;
}
}
@@ -259,11 +256,9 @@ import Sortable from 'sortablejs';
itemsContainer.notifyRefreshNeeded(true);
return;
}
- } else if (state.NowPlayingItem && state.NowPlayingItem.MediaType === 'Audio') {
- if (eventsToMonitor.indexOf('audioplayback') !== -1) {
- itemsContainer.notifyRefreshNeeded(true);
- return;
- }
+ } else if (state.NowPlayingItem?.MediaType === 'Audio' && eventsToMonitor.indexOf('audioplayback') !== -1) {
+ itemsContainer.notifyRefreshNeeded(true);
+ return;
}
}
@@ -298,10 +293,8 @@ import Sortable from 'sortablejs';
}
}
- if (layoutManager.desktop || layoutManager.mobile) {
- if (this.getAttribute('data-multiselect') !== 'false') {
- this.enableMultiSelect(true);
- }
+ if (layoutManager.desktop || layoutManager.mobile && this.getAttribute('data-multiselect') !== 'false') {
+ this.enableMultiSelect(true);
}
if (layoutManager.tv) {
diff --git a/src/elements/emby-ratingbutton/emby-ratingbutton.js b/src/elements/emby-ratingbutton/emby-ratingbutton.js
index dea35f36f3..91233cef42 100644
--- a/src/elements/emby-ratingbutton/emby-ratingbutton.js
+++ b/src/elements/emby-ratingbutton/emby-ratingbutton.js
@@ -63,18 +63,6 @@ import ServerConnections from '../../components/ServerConnections';
}
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 {
if (icon) {
icon.classList.add('favorite');
diff --git a/src/elements/emby-select/emby-select.js b/src/elements/emby-select/emby-select.js
index e069687822..b576042821 100644
--- a/src/elements/emby-select/emby-select.js
+++ b/src/elements/emby-select/emby-select.js
@@ -23,11 +23,7 @@ import 'webcomponents.js/webcomponents-lite';
return true;
}
- if (layoutManager.tv) {
- return false;
- }
-
- return true;
+ return !layoutManager.tv;
}
function triggerChange(select) {
diff --git a/src/elements/emby-slider/emby-slider.js b/src/elements/emby-slider/emby-slider.js
index f8c492cefe..d49b1b8ff0 100644
--- a/src/elements/emby-slider/emby-slider.js
+++ b/src/elements/emby-slider/emby-slider.js
@@ -105,6 +105,13 @@ import globalize from '../../scripts/globalize';
fraction *= 100;
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 `
`;
+ }
+
+ range.markerInfo.forEach(info => {
+ range.markerContainerElement.insertAdjacentHTML('beforeend', getMarkerHtml(info));
+ });
+
+ range.markerElements = range.markerContainerElement.querySelectorAll('.sliderMarker');
+ range.triedAddingMarkers = true;
+ }
+
EmbySliderPrototype.attachedCallback = function () {
if (this.getAttribute('data-embyslider') === 'true') {
return;
@@ -193,7 +264,9 @@ import globalize from '../../scripts/globalize';
this.backgroundUpper = containerElement.querySelector('.mdl-slider-background-upper');
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 () {
this.dragging = true;
@@ -205,9 +278,9 @@ import globalize from '../../scripts/globalize';
const bubbleValue = mapValueToFraction(this, this.value) * 100;
updateBubble(this, bubbleValue, sliderBubble);
- if (hasHideClass) {
+ if (hasHideBubbleClass) {
sliderBubble.classList.remove('hide');
- hasHideClass = false;
+ hasHideBubbleClass = false;
}
}, {
passive: true
@@ -221,7 +294,7 @@ import globalize from '../../scripts/globalize';
}
sliderBubble.classList.add('hide');
- hasHideClass = true;
+ hasHideBubbleClass = true;
}, {
passive: true
});
@@ -233,9 +306,9 @@ import globalize from '../../scripts/globalize';
updateBubble(this, bubbleValue, sliderBubble);
- if (hasHideClass) {
+ if (hasHideBubbleClass) {
sliderBubble.classList.remove('hide');
- hasHideClass = false;
+ hasHideBubbleClass = false;
}
}
}, {
@@ -245,7 +318,7 @@ import globalize from '../../scripts/globalize';
/* eslint-disable-next-line compat/compat */
dom.addEventListener(this, (window.PointerEvent ? 'pointerleave' : 'mouseleave'), function () {
sliderBubble.classList.add('hide');
- hasHideClass = true;
+ hasHideBubbleClass = true;
}, {
passive: true
});
@@ -452,10 +525,8 @@ import globalize from '../../scripts/globalize';
}
for (const range of ranges) {
- if (position != null) {
- if (position >= range.end) {
- continue;
- }
+ if (position != null && position >= range.end) {
+ continue;
}
setRange(elem, range.start, range.end);
diff --git a/src/elements/emby-slider/emby-slider.scss b/src/elements/emby-slider/emby-slider.scss
index 9d663f10ab..f40e6329d9 100644
--- a/src/elements/emby-slider/emby-slider.scss
+++ b/src/elements/emby-slider/emby-slider.scss
@@ -266,3 +266,25 @@
display: block;
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;
+}
diff --git a/src/elements/emby-tabs/emby-tabs.js b/src/elements/emby-tabs/emby-tabs.js
index ce1fcee05d..723cb7e8fe 100644
--- a/src/elements/emby-tabs/emby-tabs.js
+++ b/src/elements/emby-tabs/emby-tabs.js
@@ -272,10 +272,8 @@ import '../../assets/css/scrollstyles.scss';
let sibling = elem[method];
while (sibling) {
- if (sibling.classList.contains(buttonClass)) {
- if (!sibling.classList.contains('hide')) {
- return sibling;
- }
+ if (sibling.classList.contains(buttonClass) && !sibling.classList.contains('hide')) {
+ return sibling;
}
sibling = sibling[method];
diff --git a/src/index.jsx b/src/index.jsx
index 7ca4b92a24..c15297288e 100644
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -35,18 +35,13 @@ import './legacy/domParserTextHtml';
import './legacy/focusPreventScroll';
import './legacy/htmlMediaElement';
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 taskButton from './scripts/taskbutton';
import { HistoryRouter } from './components/HistoryRouter.tsx';
import AppRoutes from './routes/index.tsx';
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) {
return {
lang: language,
@@ -84,10 +79,10 @@ function init() {
}
function onGlobalizeInit() {
- if (window.appMode === 'android') {
- if (window.location.href.toString().toLowerCase().indexOf('start=backgroundsync') !== -1) {
- return onAppReady();
- }
+ if (window.appMode === 'android'
+ && window.location.href.toString().toLowerCase().indexOf('start=backgroundsync') !== -1
+ ) {
+ return onAppReady();
}
document.title = globalize.translateHtml(document.title, 'core');
@@ -102,10 +97,7 @@ function onGlobalizeInit() {
import('./assets/css/librarybrowser.scss');
- loadPlugins().then(function () {
- initSyncPlay();
- onAppReady();
- });
+ loadPlugins().then(onAppReady);
}
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() {
console.debug('begin onAppReady');
diff --git a/src/libraries/navdrawer/navdrawer.js b/src/libraries/navdrawer/navdrawer.js
index 64306c2dbb..3f409568f0 100644
--- a/src/libraries/navdrawer/navdrawer.js
+++ b/src/libraries/navdrawer/navdrawer.js
@@ -303,34 +303,32 @@ class NavDrawer {
setEdgeSwipeEnabled(enabled) {
const options = this.options;
- if (!options.disableEdgeSwipe) {
- if (browser.touch) {
- if (enabled) {
- if (!this._edgeSwipeEnabled) {
- this._edgeSwipeEnabled = true;
- dom.addEventListener(this.edgeContainer, 'touchstart', this.onEdgeTouchStart, {
- passive: true
- });
- dom.addEventListener(this.edgeContainer, 'touchend', this.onEdgeTouchEnd, {
- passive: true
- });
- dom.addEventListener(this.edgeContainer, 'touchcancel', this.onEdgeTouchEnd, {
- passive: true
- });
- }
- } else {
- if (this._edgeSwipeEnabled) {
- this._edgeSwipeEnabled = false;
- dom.removeEventListener(this.edgeContainer, 'touchstart', this.onEdgeTouchStart, {
- passive: true
- });
- dom.removeEventListener(this.edgeContainer, 'touchend', this.onEdgeTouchEnd, {
- passive: true
- });
- dom.removeEventListener(this.edgeContainer, 'touchcancel', this.onEdgeTouchEnd, {
- passive: true
- });
- }
+ if (!options.disableEdgeSwipe && browser.touch) {
+ if (enabled) {
+ if (!this._edgeSwipeEnabled) {
+ this._edgeSwipeEnabled = true;
+ dom.addEventListener(this.edgeContainer, 'touchstart', this.onEdgeTouchStart, {
+ passive: true
+ });
+ dom.addEventListener(this.edgeContainer, 'touchend', this.onEdgeTouchEnd, {
+ passive: true
+ });
+ dom.addEventListener(this.edgeContainer, 'touchcancel', this.onEdgeTouchEnd, {
+ passive: true
+ });
+ }
+ } else {
+ if (this._edgeSwipeEnabled) {
+ this._edgeSwipeEnabled = false;
+ dom.removeEventListener(this.edgeContainer, 'touchstart', this.onEdgeTouchStart, {
+ passive: true
+ });
+ dom.removeEventListener(this.edgeContainer, 'touchend', this.onEdgeTouchEnd, {
+ passive: true
+ });
+ dom.removeEventListener(this.edgeContainer, 'touchcancel', this.onEdgeTouchEnd, {
+ passive: true
+ });
}
}
}
diff --git a/src/libraries/scroller.js b/src/libraries/scroller.js
index 2acc4bdc0f..385c4e0915 100644
--- a/src/libraries/scroller.js
+++ b/src/libraries/scroller.js
@@ -291,10 +291,8 @@ const scrollerFactory = function (frame, options) {
const now = new Date().getTime();
- if (o.autoImmediate) {
- if (!immediate && (now - (lastAnimate || 0)) <= 50) {
- immediate = true;
- }
+ if (o.autoImmediate && !immediate && (now - (lastAnimate || 0)) <= 50) {
+ immediate = true;
}
if (!immediate && o.skipSlideToWhenVisible && fullItemPos && fullItemPos.isVisible) {
@@ -482,7 +480,8 @@ const scrollerFactory = function (frame, options) {
*/
function dragHandler(event) {
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.pathY = pointer.pageY - dragging.initY;
dragging.path = Math.sqrt(Math.pow(dragging.pathX, 2) + Math.pow(dragging.pathY, 2));
@@ -808,15 +807,13 @@ const scrollerFactory = function (frame, options) {
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
- if (o.mouseWheel) {
- // Scrolling navigation
- dom.addEventListener(scrollSource, wheelEvent, scrollHandler, {
- passive: true
- });
- }
+ // Scrolling navigation
+ dom.addEventListener(scrollSource, wheelEvent, scrollHandler, {
+ passive: true
+ });
}
dom.addEventListener(frame, 'click', onFrameClick, {
diff --git a/src/plugins/bookPlayer/plugin.js b/src/plugins/bookPlayer/plugin.js
index a4f49b8b6e..d0fcffa48a 100644
--- a/src/plugins/bookPlayer/plugin.js
+++ b/src/plugins/bookPlayer/plugin.js
@@ -339,11 +339,7 @@ export class BookPlayer {
}
canPlayItem(item) {
- if (item.Path && item.Path.endsWith('epub')) {
- return true;
- }
-
- return false;
+ return item.Path && item.Path.endsWith('epub');
}
}
diff --git a/src/plugins/chromecastPlayer/plugin.js b/src/plugins/chromecastPlayer/plugin.js
index 947426ec26..aeced81b8b 100644
--- a/src/plugins/chromecastPlayer/plugin.js
+++ b/src/plugins/chromecastPlayer/plugin.js
@@ -452,11 +452,9 @@ function normalizeImages(state) {
if (state && state.NowPlayingItem) {
const item = state.NowPlayingItem;
- if (!item.ImageTags || !item.ImageTags.Primary) {
- if (item.PrimaryImageTag) {
- item.ImageTags = item.ImageTags || {};
- item.ImageTags.Primary = item.PrimaryImageTag;
- }
+ if ((!item.ImageTags || !item.ImageTags.Primary) && item.PrimaryImageTag) {
+ item.ImageTags = item.ImageTags || {};
+ item.ImageTags.Primary = item.PrimaryImageTag;
}
if (item.BackdropImageTag && item.BackdropItemId === item.Id) {
item.BackdropImageTags = [item.BackdropImageTag];
diff --git a/src/plugins/comicsPlayer/plugin.js b/src/plugins/comicsPlayer/plugin.js
index 57772d8de5..d209069ad3 100644
--- a/src/plugins/comicsPlayer/plugin.js
+++ b/src/plugins/comicsPlayer/plugin.js
@@ -172,10 +172,8 @@ export class ComicsPlayer {
onWindowKeyUp(e) {
const key = keyboardnavigation.getKeyName(e);
- switch (key) {
- case 'Escape':
- this.stop();
- break;
+ if (key === 'Escape') {
+ this.stop();
}
}
@@ -358,11 +356,7 @@ export class ComicsPlayer {
}
canPlayItem(item) {
- if (item.Path && (item.Path.endsWith('cbz') || item.Path.endsWith('cbr'))) {
- return true;
- }
-
- return false;
+ return item.Path && (item.Path.endsWith('cbz') || item.Path.endsWith('cbr'));
}
}
diff --git a/src/plugins/htmlAudioPlayer/plugin.js b/src/plugins/htmlAudioPlayer/plugin.js
index 440bb4c3d0..1873970e1b 100644
--- a/src/plugins/htmlAudioPlayer/plugin.js
+++ b/src/plugins/htmlAudioPlayer/plugin.js
@@ -41,13 +41,9 @@ function cancelFadeTimeout() {
}
function supportsFade() {
- if (browser.tv) {
- // Not working on tizen.
- // We could possibly enable on other tv's, but all smart tv browsers tend to be pretty primitive
- return false;
- }
-
- return true;
+ // Not working on tizen.
+ // We could possibly enable on other tv's, but all smart tv browsers tend to be pretty primitive
+ return !browser.tv;
}
function requireHlsPlayer(callback) {
@@ -417,10 +413,7 @@ class HtmlAudioPlayer {
// This is a retry after error
resume() {
- const mediaElement = this._mediaElement;
- if (mediaElement) {
- mediaElement.play();
- }
+ this.unpause();
}
unpause() {
diff --git a/src/plugins/htmlVideoPlayer/plugin.js b/src/plugins/htmlVideoPlayer/plugin.js
index f1c83961e5..99859d6fd3 100644
--- a/src/plugins/htmlVideoPlayer/plugin.js
+++ b/src/plugins/htmlVideoPlayer/plugin.js
@@ -67,16 +67,12 @@ function tryRemoveElement(elem) {
}
function enableNativeTrackSupport(currentSrc, track) {
- if (track) {
- if (track.DeliveryMethod === 'Embed') {
- return true;
- }
+ if (track?.DeliveryMethod === 'Embed') {
+ return true;
}
- if (browser.firefox) {
- if ((currentSrc || '').toLowerCase().includes('.m3u8')) {
- return false;
- }
+ if (browser.firefox && (currentSrc || '').toLowerCase().includes('.m3u8')) {
+ return false;
}
if (browser.ps4) {
@@ -92,11 +88,9 @@ function tryRemoveElement(elem) {
return false;
}
- if (browser.iOS) {
+ if (browser.iOS && (browser.iosVersion || 10) < 10) {
// works in the browser but not the native app
- if ((browser.iosVersion || 10) < 10) {
- return false;
- }
+ return false;
}
if (track) {
@@ -279,10 +273,6 @@ function tryRemoveElement(elem) {
* @type {any | undefined}
*/
#lastProfile;
- /**
- * @type {MutationObserver | IntersectionObserver | undefined} (Unclear observer typing)
- */
- #resizeObserver;
constructor() {
if (browser.edgeUwp) {
@@ -969,11 +959,6 @@ function tryRemoveElement(elem) {
* @private
*/
destroyCustomTrack(videoElement) {
- if (this.#resizeObserver) {
- this.#resizeObserver.disconnect();
- this.#resizeObserver = null;
- }
-
if (this.#videoSubtitlesElem) {
const subtitlesContainer = this.#videoSubtitlesElem.parentNode;
if (subtitlesContainer) {
@@ -1497,14 +1482,14 @@ function tryRemoveElement(elem) {
if (
// Check non-standard Safari PiP support
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
|| document.pictureInPictureEnabled
) {
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) {
@@ -1565,13 +1550,7 @@ function tryRemoveElement(elem) {
}
const video = this.#mediaElement;
- if (video) {
- if (video.audioTracks) {
- return true;
- }
- }
-
- return false;
+ return !!video?.audioTracks;
}
static onPictureInPictureError(err) {
@@ -1703,10 +1682,7 @@ function tryRemoveElement(elem) {
// This is a retry after error
resume() {
- const mediaElement = this.#mediaElement;
- if (mediaElement) {
- mediaElement.play();
- }
+ this.unpause();
}
unpause() {
diff --git a/src/plugins/pdfPlayer/plugin.js b/src/plugins/pdfPlayer/plugin.js
index 5bdd5e0bdf..e1f59735d7 100644
--- a/src/plugins/pdfPlayer/plugin.js
+++ b/src/plugins/pdfPlayer/plugin.js
@@ -304,11 +304,7 @@ export class PdfPlayer {
}
canPlayItem(item) {
- if (item.Path && item.Path.endsWith('pdf')) {
- return true;
- }
-
- return false;
+ return item.Path && item.Path.endsWith('pdf');
}
}
diff --git a/src/plugins/sessionPlayer/plugin.js b/src/plugins/sessionPlayer/plugin.js
index 6997dc1732..50c6dae8a6 100644
--- a/src/plugins/sessionPlayer/plugin.js
+++ b/src/plugins/sessionPlayer/plugin.js
@@ -159,11 +159,9 @@ function normalizeImages(state, apiClient) {
if (state && state.NowPlayingItem) {
const item = state.NowPlayingItem;
- if (!item.ImageTags || !item.ImageTags.Primary) {
- if (item.PrimaryImageTag) {
- item.ImageTags = item.ImageTags || {};
- item.ImageTags.Primary = item.PrimaryImageTag;
- }
+ if (!item.ImageTags || !item.ImageTags.Primary && item.PrimaryImageTag) {
+ item.ImageTags = item.ImageTags || {};
+ item.ImageTags.Primary = item.PrimaryImageTag;
}
if (item.BackdropImageTag && item.BackdropItemId === item.Id) {
item.BackdropImageTags = [item.BackdropImageTag];
diff --git a/src/components/syncPlay/core/Controller.js b/src/plugins/syncPlay/core/Controller.js
similarity index 100%
rename from src/components/syncPlay/core/Controller.js
rename to src/plugins/syncPlay/core/Controller.js
diff --git a/src/components/syncPlay/core/Helper.js b/src/plugins/syncPlay/core/Helper.js
similarity index 100%
rename from src/components/syncPlay/core/Helper.js
rename to src/plugins/syncPlay/core/Helper.js
diff --git a/src/components/syncPlay/core/Manager.js b/src/plugins/syncPlay/core/Manager.js
similarity index 99%
rename from src/components/syncPlay/core/Manager.js
rename to src/plugins/syncPlay/core/Manager.js
index 16640c1df2..c41fe14fb7 100644
--- a/src/components/syncPlay/core/Manager.js
+++ b/src/plugins/syncPlay/core/Manager.js
@@ -9,7 +9,7 @@ import TimeSyncCore from './timeSync/TimeSyncCore';
import PlaybackCore from './PlaybackCore';
import QueueCore from './QueueCore';
import Controller from './Controller';
-import toast from '../../toast/toast';
+import toast from '../../../components/toast/toast';
import globalize from '../../../scripts/globalize';
/**
diff --git a/src/components/syncPlay/core/PlaybackCore.js b/src/plugins/syncPlay/core/PlaybackCore.js
similarity index 100%
rename from src/components/syncPlay/core/PlaybackCore.js
rename to src/plugins/syncPlay/core/PlaybackCore.js
diff --git a/src/components/syncPlay/core/QueueCore.js b/src/plugins/syncPlay/core/QueueCore.js
similarity index 99%
rename from src/components/syncPlay/core/QueueCore.js
rename to src/plugins/syncPlay/core/QueueCore.js
index 81feac0aca..f1a435106e 100644
--- a/src/components/syncPlay/core/QueueCore.js
+++ b/src/plugins/syncPlay/core/QueueCore.js
@@ -4,7 +4,7 @@
*/
import globalize from '../../../scripts/globalize';
-import toast from '../../toast/toast';
+import toast from '../../../components/toast/toast';
import * as Helper from './Helper';
/**
@@ -193,7 +193,6 @@ class QueueCore {
}
this.manager.haltGroupPlayback(apiClient);
- return;
});
}
diff --git a/src/components/syncPlay/core/Settings.js b/src/plugins/syncPlay/core/Settings.js
similarity index 100%
rename from src/components/syncPlay/core/Settings.js
rename to src/plugins/syncPlay/core/Settings.js
diff --git a/src/components/syncPlay/core/index.js b/src/plugins/syncPlay/core/index.js
similarity index 100%
rename from src/components/syncPlay/core/index.js
rename to src/plugins/syncPlay/core/index.js
diff --git a/src/components/syncPlay/core/players/GenericPlayer.js b/src/plugins/syncPlay/core/players/GenericPlayer.js
similarity index 100%
rename from src/components/syncPlay/core/players/GenericPlayer.js
rename to src/plugins/syncPlay/core/players/GenericPlayer.js
diff --git a/src/components/syncPlay/core/players/PlayerFactory.js b/src/plugins/syncPlay/core/players/PlayerFactory.js
similarity index 94%
rename from src/components/syncPlay/core/players/PlayerFactory.js
rename to src/plugins/syncPlay/core/players/PlayerFactory.js
index 1de9aa5126..ab4170c9e7 100644
--- a/src/components/syncPlay/core/players/PlayerFactory.js
+++ b/src/plugins/syncPlay/core/players/PlayerFactory.js
@@ -16,7 +16,7 @@ class PlayerFactory {
/**
* 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) {
console.debug('SyncPlay WrapperFactory registerWrapper:', wrapperClass.type);
@@ -25,7 +25,7 @@ class PlayerFactory {
/**
* Sets the default player wrapper.
- * @param {GenericPlayer} wrapperClass The wrapper.
+ * @param {typeof GenericPlayer} wrapperClass The wrapper.
*/
setDefaultWrapper(wrapperClass) {
console.debug('SyncPlay WrapperFactory setDefaultWrapper:', wrapperClass.type);
diff --git a/src/components/syncPlay/core/timeSync/TimeSync.js b/src/plugins/syncPlay/core/timeSync/TimeSync.js
similarity index 100%
rename from src/components/syncPlay/core/timeSync/TimeSync.js
rename to src/plugins/syncPlay/core/timeSync/TimeSync.js
diff --git a/src/components/syncPlay/core/timeSync/TimeSyncCore.js b/src/plugins/syncPlay/core/timeSync/TimeSyncCore.js
similarity index 100%
rename from src/components/syncPlay/core/timeSync/TimeSyncCore.js
rename to src/plugins/syncPlay/core/timeSync/TimeSyncCore.js
diff --git a/src/components/syncPlay/core/timeSync/TimeSyncServer.js b/src/plugins/syncPlay/core/timeSync/TimeSyncServer.js
similarity index 93%
rename from src/components/syncPlay/core/timeSync/TimeSyncServer.js
rename to src/plugins/syncPlay/core/timeSync/TimeSyncServer.js
index 734763c07d..4cb9fdd307 100644
--- a/src/components/syncPlay/core/timeSync/TimeSyncServer.js
+++ b/src/plugins/syncPlay/core/timeSync/TimeSyncServer.js
@@ -9,10 +9,6 @@ import TimeSync from './TimeSync';
* Class that manages time syncing with server.
*/
class TimeSyncServer extends TimeSync {
- constructor(syncPlayManager) {
- super(syncPlayManager);
- }
-
/**
* Makes a ping request to the server.
*/
diff --git a/src/plugins/syncPlay/plugin.ts b/src/plugins/syncPlay/plugin.ts
new file mode 100644
index 0000000000..e1b7c29cd6
--- /dev/null
+++ b/src/plugins/syncPlay/plugin.ts
@@ -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;
diff --git a/src/components/syncPlay/ui/groupSelectionMenu.js b/src/plugins/syncPlay/ui/groupSelectionMenu.js
similarity index 96%
rename from src/components/syncPlay/ui/groupSelectionMenu.js
rename to src/plugins/syncPlay/ui/groupSelectionMenu.js
index 807899773f..106ee8e42d 100644
--- a/src/components/syncPlay/ui/groupSelectionMenu.js
+++ b/src/plugins/syncPlay/ui/groupSelectionMenu.js
@@ -1,12 +1,12 @@
import { Events } from 'jellyfin-apiclient';
import SyncPlay from '../core';
import SyncPlaySettingsEditor from './settings/SettingsEditor';
-import loading from '../../loading/loading';
-import toast from '../../toast/toast';
-import actionsheet from '../../actionSheet/actionSheet';
+import loading from '../../../components/loading/loading';
+import toast from '../../../components/toast/toast';
+import actionsheet from '../../../components/actionSheet/actionSheet';
import globalize from '../../../scripts/globalize';
import playbackPermissionManager from './playbackPermissionManager';
-import ServerConnections from '../../ServerConnections';
+import ServerConnections from '../../../components/ServerConnections';
import './groupSelectionMenu.scss';
/**
diff --git a/src/components/syncPlay/ui/groupSelectionMenu.scss b/src/plugins/syncPlay/ui/groupSelectionMenu.scss
similarity index 100%
rename from src/components/syncPlay/ui/groupSelectionMenu.scss
rename to src/plugins/syncPlay/ui/groupSelectionMenu.scss
diff --git a/src/components/syncPlay/ui/playbackPermissionManager.js b/src/plugins/syncPlay/ui/playbackPermissionManager.js
similarity index 96%
rename from src/components/syncPlay/ui/playbackPermissionManager.js
rename to src/plugins/syncPlay/ui/playbackPermissionManager.js
index 2a70d7370a..816b57bca9 100644
--- a/src/components/syncPlay/ui/playbackPermissionManager.js
+++ b/src/plugins/syncPlay/ui/playbackPermissionManager.js
@@ -1,4 +1,4 @@
-import { appHost } from '../../apphost';
+import { appHost } from '../../../components/apphost';
/**
* Creates an audio element that plays a silent sound.
diff --git a/src/components/syncPlay/ui/players/HtmlAudioPlayer.js b/src/plugins/syncPlay/ui/players/HtmlAudioPlayer.js
similarity index 79%
rename from src/components/syncPlay/ui/players/HtmlAudioPlayer.js
rename to src/plugins/syncPlay/ui/players/HtmlAudioPlayer.js
index 89929eb688..c0b5a3bf6b 100644
--- a/src/components/syncPlay/ui/players/HtmlAudioPlayer.js
+++ b/src/plugins/syncPlay/ui/players/HtmlAudioPlayer.js
@@ -10,10 +10,6 @@ import HtmlVideoPlayer from './HtmlVideoPlayer';
*/
class HtmlAudioPlayer extends HtmlVideoPlayer {
static type = 'htmlaudioplayer';
-
- constructor(player, syncPlayManager) {
- super(player, syncPlayManager);
- }
}
export default HtmlAudioPlayer;
diff --git a/src/components/syncPlay/ui/players/HtmlVideoPlayer.js b/src/plugins/syncPlay/ui/players/HtmlVideoPlayer.js
similarity index 100%
rename from src/components/syncPlay/ui/players/HtmlVideoPlayer.js
rename to src/plugins/syncPlay/ui/players/HtmlVideoPlayer.js
diff --git a/src/components/syncPlay/ui/players/NoActivePlayer.js b/src/plugins/syncPlay/ui/players/NoActivePlayer.js
similarity index 99%
rename from src/components/syncPlay/ui/players/NoActivePlayer.js
rename to src/plugins/syncPlay/ui/players/NoActivePlayer.js
index 699d31517b..c5f528938d 100644
--- a/src/components/syncPlay/ui/players/NoActivePlayer.js
+++ b/src/plugins/syncPlay/ui/players/NoActivePlayer.js
@@ -3,7 +3,7 @@
* @module components/syncPlay/ui/players/NoActivePlayer
*/
-import { playbackManager } from '../../../playback/playbackmanager';
+import { playbackManager } from '../../../../components/playback/playbackmanager';
import SyncPlay from '../../core';
import QueueManager from './QueueManager';
diff --git a/src/components/syncPlay/ui/players/QueueManager.js b/src/plugins/syncPlay/ui/players/QueueManager.js
similarity index 100%
rename from src/components/syncPlay/ui/players/QueueManager.js
rename to src/plugins/syncPlay/ui/players/QueueManager.js
diff --git a/src/components/syncPlay/ui/settings/SettingsEditor.js b/src/plugins/syncPlay/ui/settings/SettingsEditor.js
similarity index 93%
rename from src/components/syncPlay/ui/settings/SettingsEditor.js
rename to src/plugins/syncPlay/ui/settings/SettingsEditor.js
index 3f90725145..ede7e267a3 100644
--- a/src/components/syncPlay/ui/settings/SettingsEditor.js
+++ b/src/plugins/syncPlay/ui/settings/SettingsEditor.js
@@ -6,10 +6,10 @@
import { Events } from 'jellyfin-apiclient';
import SyncPlay from '../../core';
import { setSetting } from '../../core/Settings';
-import dialogHelper from '../../../dialogHelper/dialogHelper';
-import layoutManager from '../../../layoutManager';
-import loading from '../../../loading/loading';
-import toast from '../../../toast/toast';
+import dialogHelper from '../../../../components/dialogHelper/dialogHelper';
+import layoutManager from '../../../../components/layoutManager';
+import loading from '../../../../components/loading/loading';
+import toast from '../../../../components/toast/toast';
import globalize from '../../../../scripts/globalize';
import 'material-design-icons-iconfont';
@@ -18,8 +18,8 @@ import '../../../../elements/emby-select/emby-select';
import '../../../../elements/emby-button/emby-button';
import '../../../../elements/emby-button/paper-icon-button-light';
import '../../../../elements/emby-checkbox/emby-checkbox';
-import '../../../listview/listview.scss';
-import '../../../formdialog.scss';
+import '../../../../components/listview/listview.scss';
+import '../../../../components/formdialog.scss';
function centerFocus(elem, horiz, on) {
import('../../../../scripts/scrollHelper').then((scrollHelper) => {
diff --git a/src/components/syncPlay/ui/settings/editor.html b/src/plugins/syncPlay/ui/settings/editor.html
similarity index 100%
rename from src/components/syncPlay/ui/settings/editor.html
rename to src/plugins/syncPlay/ui/settings/editor.html
diff --git a/src/plugins/youtubePlayer/plugin.js b/src/plugins/youtubePlayer/plugin.js
index 96d23c2f37..788dbfcfb1 100644
--- a/src/plugins/youtubePlayer/plugin.js
+++ b/src/plugins/youtubePlayer/plugin.js
@@ -333,10 +333,8 @@ class YoutubePlayer {
setVolume(val) {
const currentYoutubePlayer = this.currentYoutubePlayer;
- if (currentYoutubePlayer) {
- if (val != null) {
- currentYoutubePlayer.setVolume(val);
- }
+ if (currentYoutubePlayer && val != null) {
+ currentYoutubePlayer.setVolume(val);
}
}
getVolume() {
diff --git a/src/scripts/browser.js b/src/scripts/browser.js
index b340a403f3..fe0601fc97 100644
--- a/src/scripts/browser.js
+++ b/src/scripts/browser.js
@@ -19,25 +19,14 @@ function isTv() {
return true;
}
- if (isWeb0s()) {
- return true;
- }
-
- return false;
+ return isWeb0s();
}
function isWeb0s() {
const userAgent = navigator.userAgent.toLowerCase();
- if (userAgent.indexOf('netcast') !== -1) {
- return true;
- }
-
- if (userAgent.indexOf('web0s') !== -1) {
- return true;
- }
-
- return false;
+ return userAgent.indexOf('netcast') !== -1
+ || userAgent.indexOf('web0s') !== -1;
}
function isMobile(userAgent) {
@@ -84,11 +73,7 @@ function hasKeyboard(browser) {
return true;
}
- if (browser.tv) {
- return true;
- }
-
- return false;
+ return !!browser.tv;
}
function iOSversion() {
@@ -324,11 +309,9 @@ if (browser.mobile || browser.tv) {
browser.slow = true;
}
-if (typeof document !== 'undefined') {
- /* eslint-disable-next-line compat/compat */
- if (('ontouchstart' in window) || (navigator.maxTouchPoints > 0)) {
- browser.touch = true;
- }
+/* eslint-disable-next-line compat/compat */
+if (typeof document !== 'undefined' && ('ontouchstart' in window) || (navigator.maxTouchPoints > 0)) {
+ browser.touch = true;
}
browser.keyboard = hasKeyboard(browser);
diff --git a/src/scripts/browserDeviceProfile.js b/src/scripts/browserDeviceProfile.js
index 5c3b0b8ca8..f68faf4e40 100644
--- a/src/scripts/browserDeviceProfile.js
+++ b/src/scripts/browserDeviceProfile.js
@@ -53,12 +53,8 @@ import browser from './browser';
}
const media = document.createElement('video');
- if (media.canPlayType('application/x-mpegURL').replace(/no/, '') ||
- media.canPlayType('application/vnd.apple.mpegURL').replace(/no/, '')) {
- return true;
- }
-
- return false;
+ return !!(media.canPlayType('application/x-mpegURL').replace(/no/, '') ||
+ media.canPlayType('application/vnd.apple.mpegURL').replace(/no/, ''));
}
function canPlayHlsWithMSE() {
@@ -110,7 +106,7 @@ import browser from './browser';
function canPlayAudioFormat(format) {
let typeString;
- if (format === 'flac') {
+ if (format === 'flac' || format === 'asf') {
if (browser.tizen || browser.web0s || browser.edgeUwp) {
return true;
}
@@ -118,10 +114,6 @@ import browser from './browser';
if (browser.tizen || browser.edgeUwp) {
return true;
}
- } else if (format === 'asf') {
- if (browser.tizen || browser.web0s || browser.edgeUwp) {
- return true;
- }
} else if (format === 'opus') {
if (browser.web0s) {
// canPlayType lies about OPUS support
@@ -163,17 +155,11 @@ import browser from './browser';
return true;
}
- if (browser.edgeUwp) {
- return true;
- }
-
- return false;
+ return !!browser.edgeUwp;
}
function testCanPlayAv1(videoTestElement) {
- if (browser.tizenVersion >= 5.5) {
- return true;
- } else if (browser.web0sVersion >= 5) {
+ if (browser.tizenVersion >= 5.5 || browser.web0sVersion >= 5) {
return true;
}
@@ -199,6 +185,7 @@ import browser from './browser';
switch (container) {
case 'asf':
+ case 'wmv':
supported = browser.tizen || browser.web0s || browser.edgeUwp;
videoAudioCodecs = [];
break;
@@ -241,10 +228,6 @@ import browser from './browser';
videoCodecs.push('mpeg2video');
}
break;
- case 'wmv':
- supported = browser.tizen || browser.web0s || browser.edgeUwp;
- videoAudioCodecs = [];
- break;
case 'ts':
supported = testCanPlayTs();
videoCodecs.push('h264');
@@ -822,12 +805,12 @@ import browser from './browser';
maxH264Level = 52;
}
- if (browser.tizen ||
- videoTestElement.canPlayType('video/mp4; codecs="avc1.6e0033"').replace(/no/, '')) {
+ if ((browser.tizen ||
+ videoTestElement.canPlayType('video/mp4; codecs="avc1.6e0033"').replace(/no/, ''))
// These tests are passing in safari, but playback is failing
- if (!browser.safari && !browser.iOS && !browser.web0s && !browser.edge && !browser.mobile) {
- h264Profiles += '|high 10';
- }
+ && !browser.safari && !browser.iOS && !browser.web0s && !browser.edge && !browser.mobile
+ ) {
+ h264Profiles += '|high 10';
}
let maxHevcLevel = 120;
diff --git a/src/scripts/dfnshelper.js b/src/scripts/dfnshelper.js
index e184f1035f..8e3a2516e0 100644
--- a/src/scripts/dfnshelper.js
+++ b/src/scripts/dfnshelper.js
@@ -1,4 +1,4 @@
-import { af, arDZ, be, bg, bn, ca, cs, cy, da, de, el, enGB, enUS, eo, es, et, faIR, fi, fr, frCA, gl, he, hi, hr, hu, id, is, it, ja, kk, ko, lt, lv, ms, nb,
+import { af, arDZ, be, bg, bn, ca, cs, cy, da, de, el, enGB, enUS, eo, es, et, eu, faIR, fi, fr, frCA, gl, he, hi, hr, hu, id, is, it, ja, kk, ko, lt, lv, ms, nb,
nl, nn, pl, ptBR, pt, ro, ru, sk, sl, sv, ta, th, tr, uk, vi, zhCN, zhTW } from 'date-fns/locale';
import globalize from './globalize';
@@ -22,6 +22,7 @@ const dateLocales = (locale) => ({
'es-do': es,
'es-mx': es,
'et': et,
+ 'eu': eu,
'fa': faIR,
'fi': fi,
'fr': fr,
@@ -67,9 +68,14 @@ export function getLocale() {
return dateLocales(globalize.getCurrentLocale()) || dateLocales(globalize.getCurrentLocale().replace(/-.*/, '')) || enUS;
}
-export const localeWithSuffix = { addSuffix: true, locale: getLocale() };
+export function getLocaleWithSuffix() {
+ return {
+ addSuffix: true,
+ locale: getLocale()
+ };
+}
export default {
getLocale: getLocale,
- localeWithSuffix: localeWithSuffix
+ getLocaleWithSuffix
};
diff --git a/src/scripts/dom.js b/src/scripts/dom.js
index 8cc3e7d036..e336088c87 100644
--- a/src/scripts/dom.js
+++ b/src/scripts/dom.js
@@ -183,9 +183,9 @@
width = height * (16.0 / 9.0);
}
- return standardWidths.sort(function (a, b) {
- return Math.abs(width - a) - Math.abs(width - b);
- })[0];
+ standardWidths.sort((a, b) => Math.abs(width - a) - Math.abs(width - b));
+
+ return standardWidths[0];
}
/**
diff --git a/src/scripts/editorsidebar.js b/src/scripts/editorsidebar.js
index ca0db05034..10a474798c 100644
--- a/src/scripts/editorsidebar.js
+++ b/src/scripts/editorsidebar.js
@@ -215,19 +215,7 @@ import { getParameterByName } from '../utils/url.ts';
}
}
- function onNodeOpen(event, data) {
- const page = $(this).parents('.page')[0];
- const node = data.node;
- if (node.children) {
- loadNodesToLoad(page, node);
- }
- if (node.li_attr && node.id != '#' && !node.li_attr.loadedFromServer) {
- node.li_attr.loadedFromServer = true;
- $.jstree.reference('.libraryTree', page).load_node(node.id, loadNodeCallback);
- }
- }
-
- function onNodeLoad(event, data) {
+ function onNodeOpen(_, data) {
const page = $(this).parents('.page')[0];
const node = data.node;
if (node.children) {
@@ -254,7 +242,13 @@ import { getParameterByName } from '../utils/url.ts';
variant: 'large'
}
}
- }).off('select_node.jstree', onNodeSelect).on('select_node.jstree', onNodeSelect).off('open_node.jstree', onNodeOpen).on('open_node.jstree', onNodeOpen).off('load_node.jstree', onNodeLoad).on('load_node.jstree', onNodeLoad);
+ })
+ .off('select_node.jstree', onNodeSelect)
+ .on('select_node.jstree', onNodeSelect)
+ .off('open_node.jstree', onNodeOpen)
+ .on('open_node.jstree', onNodeOpen)
+ .off('load_node.jstree', onNodeOpen)
+ .on('load_node.jstree', onNodeOpen);
}
function loadNodesToLoad(page, node) {
@@ -327,7 +321,10 @@ import { getParameterByName } from '../utils/url.ts';
});
}).on('pagebeforehide', '.metadataEditorPage', function () {
const page = this;
- $('.libraryTree', page).off('select_node.jstree', onNodeSelect).off('open_node.jstree', onNodeOpen).off('load_node.jstree', onNodeLoad);
+ $('.libraryTree', page)
+ .off('select_node.jstree', onNodeSelect)
+ .off('open_node.jstree', onNodeOpen)
+ .off('load_node.jstree', onNodeOpen);
});
let itemId;
window.MetadataEditor = {
diff --git a/src/scripts/gamepadtokey.js b/src/scripts/gamepadtokey.js
index d7916f1fef..40e33a7caf 100644
--- a/src/scripts/gamepadtokey.js
+++ b/src/scripts/gamepadtokey.js
@@ -168,12 +168,7 @@ function throttle(key) {
const time = times[key] || 0;
const now = new Date().getTime();
- if ((now - time) >= 200) {
- //times[key] = now;
- return true;
- }
-
- return false;
+ return (now - time) >= 200;
}
function resetThrottle(key) {
@@ -187,11 +182,7 @@ function allowInput() {
return false;
}
- if (appHost.getWindowState() === 'Minimized') {
- return false;
- }
-
- return true;
+ return appHost.getWindowState() !== 'Minimized';
}
function raiseEvent(name, key, keyCode) {
diff --git a/src/scripts/imagehelper.js b/src/scripts/imagehelper.js
index 4fd2c0a0c7..d481f7e4ad 100644
--- a/src/scripts/imagehelper.js
+++ b/src/scripts/imagehelper.js
@@ -1,57 +1,63 @@
+const BASE_DEVICE_IMAGE_URL = 'assets/img/devices/';
+
+function getWebDeviceIcon(browser) {
+ switch (browser) {
+ case 'Opera':
+ case 'Opera TV':
+ case 'Opera Android':
+ return BASE_DEVICE_IMAGE_URL + 'opera.svg';
+ case 'Chrome':
+ case 'Chrome Android':
+ return BASE_DEVICE_IMAGE_URL + 'chrome.svg';
+ case 'Firefox':
+ case 'Firefox Android':
+ return BASE_DEVICE_IMAGE_URL + 'firefox.svg';
+ case 'Safari':
+ case 'Safari iPad':
+ case 'Safari iPhone':
+ return BASE_DEVICE_IMAGE_URL + 'safari.svg';
+ case 'Edge Chromium':
+ case 'Edge Chromium Android':
+ case 'Edge Chromium iPad':
+ case 'Edge Chromium iPhone':
+ return BASE_DEVICE_IMAGE_URL + 'edgechromium.svg';
+ case 'Edge':
+ return BASE_DEVICE_IMAGE_URL + 'edge.svg';
+ case 'Internet Explorer':
+ return BASE_DEVICE_IMAGE_URL + 'msie.svg';
+ default:
+ return BASE_DEVICE_IMAGE_URL + 'html5.svg';
+ }
+}
/* eslint-disable indent */
export function getDeviceIcon(device) {
- const baseUrl = 'assets/img/devices/';
switch (device.AppName || device.Client) {
case 'Samsung Smart TV':
- return baseUrl + 'samsung.svg';
+ return BASE_DEVICE_IMAGE_URL + 'samsung.svg';
case 'Xbox One':
- return baseUrl + 'xbox.svg';
+ return BASE_DEVICE_IMAGE_URL + 'xbox.svg';
case 'Sony PS4':
- return baseUrl + 'playstation.svg';
+ return BASE_DEVICE_IMAGE_URL + 'playstation.svg';
case 'Kodi':
case 'Kodi JellyCon':
- return baseUrl + 'kodi.svg';
+ return BASE_DEVICE_IMAGE_URL + 'kodi.svg';
case 'Jellyfin Android':
case 'AndroidTV':
case 'Android TV':
- return baseUrl + 'android.svg';
+ return BASE_DEVICE_IMAGE_URL + 'android.svg';
case 'Jellyfin Mobile (iOS)':
case 'Jellyfin Mobile (iPadOS)':
case 'Jellyfin iOS':
case 'Infuse':
- return baseUrl + 'apple.svg';
+ return BASE_DEVICE_IMAGE_URL + 'apple.svg';
+ case 'Home Assistant':
+ return BASE_DEVICE_IMAGE_URL + 'home-assistant.svg';
case 'Jellyfin Web':
- switch (device.Name || device.DeviceName) {
- case 'Opera':
- case 'Opera TV':
- case 'Opera Android':
- return baseUrl + 'opera.svg';
- case 'Chrome':
- case 'Chrome Android':
- return baseUrl + 'chrome.svg';
- case 'Firefox':
- case 'Firefox Android':
- return baseUrl + 'firefox.svg';
- case 'Safari':
- case 'Safari iPad':
- case 'Safari iPhone':
- return baseUrl + 'safari.svg';
- case 'Edge Chromium':
- case 'Edge Chromium Android':
- case 'Edge Chromium iPad':
- case 'Edge Chromium iPhone':
- return baseUrl + 'edgechromium.svg';
- case 'Edge':
- return baseUrl + 'edge.svg';
- case 'Internet Explorer':
- return baseUrl + 'msie.svg';
- default:
- return baseUrl + 'html5.svg';
- }
+ return getWebDeviceIcon(device.Name || device.DeviceName);
default:
- return baseUrl + 'other.svg';
+ return BASE_DEVICE_IMAGE_URL + 'other.svg';
}
}
diff --git a/src/scripts/libraryBrowser.js b/src/scripts/libraryBrowser.js
index 87ee2a7d46..eaec777401 100644
--- a/src/scripts/libraryBrowser.js
+++ b/src/scripts/libraryBrowser.js
@@ -68,10 +68,8 @@ export function showLayoutMenu (button, currentLayout, views) {
cancelable: false
}));
- if (!dispatchEvent) {
- if (window.$) {
- $(button).trigger('layoutchange', [id]);
- }
+ if (!dispatchEvent && window.$) {
+ $(button).trigger('layoutchange', [id]);
}
}
});
@@ -117,7 +115,8 @@ export function getQueryPagingHtml (options) {
html += '
';
}
- return html += '';
+ html += '';
+ return html;
}
export function showSortMenu (options) {
diff --git a/src/scripts/libraryMenu.js b/src/scripts/libraryMenu.js
index 81f819f809..ce1918e196 100644
--- a/src/scripts/libraryMenu.js
+++ b/src/scripts/libraryMenu.js
@@ -9,7 +9,8 @@ import viewManager from '../components/viewManager/viewManager';
import { appRouter } from '../components/appRouter';
import { appHost } from '../components/apphost';
import { playbackManager } from '../components/playback/playbackmanager';
-import groupSelectionMenu from '../components/syncPlay/ui/groupSelectionMenu';
+import { pluginManager } from '../components/pluginManager';
+import groupSelectionMenu from '../plugins/syncPlay/ui/groupSelectionMenu';
import browser from './browser';
import globalize from './globalize';
import imageHelper from './imagehelper';
@@ -154,8 +155,14 @@ import '../assets/css/flexstyles.scss';
const policy = user.Policy ? user.Policy : user.localUser.Policy;
- const apiClient = getCurrentApiClient();
- if (headerSyncButton && policy?.SyncPlayAccess !== 'None' && apiClient.isMinServerVersion('10.6.0')) {
+ if (
+ // Button is present
+ headerSyncButton
+ // SyncPlay plugin is loaded
+ && pluginManager.plugins.filter(plugin => plugin.id === 'syncplay').length > 0
+ // SyncPlay enabled for user
+ && policy?.SyncPlayAccess !== 'None'
+ ) {
headerSyncButton.classList.remove('hide');
}
} else {
diff --git a/src/scripts/mouseManager.js b/src/scripts/mouseManager.js
index 1ad3389c04..b6ba2e3ca2 100644
--- a/src/scripts/mouseManager.js
+++ b/src/scripts/mouseManager.js
@@ -88,12 +88,10 @@ import dom from '../scripts/dom';
function onPointerEnter(e) {
const pointerType = e.pointerType || (layoutManager.mobile ? 'touch' : 'mouse');
- if (pointerType === 'mouse') {
- if (!isMouseIdle) {
- const parent = focusManager.focusableParent(e.target);
- if (parent) {
- focusManager.focus(parent);
- }
+ if (pointerType === 'mouse' && !isMouseIdle) {
+ const parent = focusManager.focusableParent(e.target);
+ if (parent) {
+ focusManager.focus(parent);
}
}
}
@@ -107,11 +105,7 @@ import dom from '../scripts/dom';
return false;
}
- if (browser.tv) {
- return true;
- }
-
- return false;
+ return !!browser.tv;
}
function onMouseInterval() {
diff --git a/src/scripts/multiDownload.js b/src/scripts/multiDownload.js
index 54921bf4ef..ec3db52015 100644
--- a/src/scripts/multiDownload.js
+++ b/src/scripts/multiDownload.js
@@ -56,7 +56,8 @@ export default function (urls) {
urls.forEach(function (url) {
// the download init has to be sequential for firefox if the urls are not on the same domain
if (browser.firefox && !sameDomain(url)) {
- return setTimeout(download.bind(null, url), 100 * ++delay);
+ setTimeout(download.bind(null, url), 100 * ++delay);
+ return;
}
download(url);
diff --git a/src/scripts/serverNotifications.js b/src/scripts/serverNotifications.js
index 73a10bcbde..30d2171ae4 100644
--- a/src/scripts/serverNotifications.js
+++ b/src/scripts/serverNotifications.js
@@ -1,5 +1,5 @@
import { playbackManager } from '../components/playback/playbackmanager';
-import SyncPlay from '../components/syncPlay/core';
+import SyncPlay from '../plugins/syncPlay/core';
import { Events } from 'jellyfin-apiclient';
import inputManager from '../scripts/inputManager';
import focusManager from '../components/focusManager';
@@ -123,16 +123,11 @@ function processGeneralCommand(cmd, apiClient) {
displayMessage(cmd);
break;
case 'ToggleOsd':
- // todo
- break;
case 'ToggleContextMenu':
- // todo
- break;
case 'SendKey':
// todo
break;
case 'SendString':
- // todo
focusManager.sendText(cmd.Arguments.String);
break;
default:
diff --git a/src/scripts/shell.js b/src/scripts/shell.js
index aba8698cdb..b21d658f9f 100644
--- a/src/scripts/shell.js
+++ b/src/scripts/shell.js
@@ -43,7 +43,9 @@ export default {
*/
downloadFiles(items) {
if (window.NativeShell?.downloadFile) {
- items.forEach(item => window.NativeShell.downloadFile(item));
+ items.forEach(item => {
+ window.NativeShell.downloadFile(item);
+ });
return true;
}
return false;
diff --git a/src/strings/ar.json b/src/strings/ar.json
index 22f643e25c..3a3ffe10a9 100644
--- a/src/strings/ar.json
+++ b/src/strings/ar.json
@@ -1672,5 +1672,9 @@
"RememberSubtitleSelections": "تعيين مسار الترجمة على أساس البند السابق",
"RememberAudioSelectionsHelp": "حاول ضبط المسار الصوتي على أقرب تطابق للفيديو الأخير.",
"RememberAudioSelections": "تعيين مسار الصوت على أساس البند السابق",
- "LabelMaxVideoResolution": "الحد الأقصى المسموح به لقرار تحويل ترميز الفيديو"
+ "LabelMaxVideoResolution": "الحد الأقصى المسموح به لقرار تحويل ترميز الفيديو",
+ "OptionDateShowAdded": "تاريخ اضافة العرض",
+ "OptionDateEpisodeAdded": "تاريخ اضافة الحلقة",
+ "IgnoreDtsHelp": "قد يؤدي تعطيل هذا الخيار إلى حل بعض المشكلات ، على سبيل المثال فقدان الصوت على القنوات التي تحتوي على دفق صوت وفيديو منفصل.",
+ "IgnoreDts": "تجاهل DTS (الطابع الزمني لفك التشفير)"
}
diff --git a/src/strings/ca.json b/src/strings/ca.json
index a5f85cae8c..c8db8f23eb 100644
--- a/src/strings/ca.json
+++ b/src/strings/ca.json
@@ -969,7 +969,7 @@
"NoNewDevicesFound": "No es van trobar nous dispositius. Per afegir un nou sintonitzador, tancar aquest diàleg i introduïu la informació de el dispositiu de forma manual.",
"NoCreatedLibraries": "Sembla que no s'ha creat cap biblioteca encara. {0} Li agradaria crear una ara? {1}",
"No": "No",
- "NextUp": "Fins a la pròxima",
+ "NextUp": "A continuació",
"NextTrack": "Passar a la següent",
"Next": "Pròxim",
"News": "Notícies",
@@ -1644,5 +1644,8 @@
"ButtonClose": "Tancar",
"ButtonBackspace": "Retrocés",
"Arranger": "Arranjador",
- "AddToFavorites": "Afegir a preferits"
+ "AddToFavorites": "Afegir a preferits",
+ "EnableSplashScreen": "Habilita la pantalla de benvinguda",
+ "ScreenResolution": "Resolució de pantalla",
+ "Bold": "Negreta"
}
diff --git a/src/strings/en-gb.json b/src/strings/en-gb.json
index a05d5e3d71..5b721ee886 100644
--- a/src/strings/en-gb.json
+++ b/src/strings/en-gb.json
@@ -1675,5 +1675,9 @@
"RememberSubtitleSelections": "Set subtitle track based on previous item",
"RememberAudioSelectionsHelp": "Try to set the audio track to the closest match to the last video.",
"RememberAudioSelections": "Set audio track based on previous item",
- "LabelMaxVideoResolution": "Maximum Allowed Video Transcoding Resolution"
+ "LabelMaxVideoResolution": "Maximum Allowed Video Transcoding Resolution",
+ "OptionDateShowAdded": "Date Show Added",
+ "OptionDateEpisodeAdded": "Date Episode Added",
+ "IgnoreDtsHelp": "Disabling this option may resolve some issues, e.g. missing audio on channels with separate audio and video streams.",
+ "IgnoreDts": "Ignore DTS (decoding timestamp)"
}
diff --git a/src/strings/fr.json b/src/strings/fr.json
index 85fe0a38c5..41fdac284c 100644
--- a/src/strings/fr.json
+++ b/src/strings/fr.json
@@ -1676,5 +1676,8 @@
"RememberSubtitleSelections": "Définir la piste de sous-titre en fonction de l'élément précédent",
"RememberAudioSelectionsHelp": "Choisir la piste audio la plus proche de la dernière vidéo.",
"RememberAudioSelections": "Définir la piste audio en fonction de l'élément précédent",
- "IgnoreDtsHelp": "Désactiver cette option pourrait résoudre certains problèmes, comme par exemple l'audio manquant sur des pistes ayant des flux audios et vidéos séparés."
+ "IgnoreDtsHelp": "La désactivation de cette option peut résoudre certains problèmes, par ex. audio manquant sur les canaux avec des flux audio et vidéo séparés.",
+ "OptionDateShowAdded": "Date d'ajout de la série",
+ "OptionDateEpisodeAdded": "Date d'ajout de l'épisode",
+ "IgnoreDts": "Ignorer DTS (horodatage de décodage)"
}
diff --git a/src/strings/pt-pt.json b/src/strings/pt-pt.json
index 770239a50c..e0c72aa6d3 100644
--- a/src/strings/pt-pt.json
+++ b/src/strings/pt-pt.json
@@ -1413,7 +1413,7 @@
"SmallCaps": "Maiúsculas reduzidas",
"LabelTonemappingRange": "Alcance do Tone Mapping :",
"TonemappingAlgorithmHelp": "O Tone Mapping pode ser afinado. Se não estiver familiarizado com estas opções, mantenha-as nas opções padrão. O valor recomendado é 'BT.2390'.",
- "AllowTonemappingHelp": "O processo de Tone Mapping transforma o Dynamic Range de um vídeo HDR em SDR, mantendo os detalhes e as cores, sendo estes bastante importantes para preservar a cena original. Atualmente funciona apenas com vídeos HDR10 ou HLG. Esta opção requer os executáveis CUDA ou OpenCL correspondentes.",
+ "AllowTonemappingHelp": "O processo de Tone Mapping transforma o Dynamic Range de um vídeo HDR em SDR, mantendo os detalhes e as cores, sendo estes bastante importantes para preservar a cena original. Atualmente funciona apenas com vídeos HDR10 ou HLG. Esta opção requer os executáveis CUDA ou OpenCL correspondentes.",
"LabelMaxMuxingQueueSizeHelp": "Número máximo de pacotes armazenados em