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

Merge branch 'jellyfin:master' into master

This commit is contained in:
hazil 2021-09-04 17:35:05 +05:30 committed by Hazil Mohamed
commit 13f55130a7
98 changed files with 5871 additions and 3582 deletions

View file

@ -313,8 +313,8 @@ import { appRouter } from '../../../components/appRouter';
function onPointerMove(e) {
if ((e.pointerType || (layoutManager.mobile ? 'touch' : 'mouse')) === 'mouse') {
const eventX = e.screenX || 0;
const eventY = e.screenY || 0;
const eventX = e.screenX || e.clientX || 0;
const eventY = e.screenY || e.clientY || 0;
const obj = lastPointerMoveData;
if (!obj) {
@ -716,6 +716,7 @@ import { appRouter } from '../../../components/appRouter';
} else {
nowPlayingPositionSlider.value = 0;
}
if (runtimeTicks && positionTicks != null && currentRuntimeTicks && !enableProgressByTimeOfDay && currentItem.RunTimeTicks && currentItem.Type !== 'Recording' && playbackRate !== null) {
endsAtText.innerHTML = '    ' + mediaInfo.getEndsAtFromPosition(runtimeTicks, positionTicks, playbackRate, true);
} else {
@ -902,7 +903,8 @@ import { appRouter } from '../../../components/appRouter';
actionsheet.show({
items: menuItems,
title: globalize.translate('Audio'),
positionTo: positionTo
positionTo: positionTo,
enableHistory: false
}).then(function (id) {
const index = parseInt(id);
@ -948,7 +950,8 @@ import { appRouter } from '../../../components/appRouter';
actionsheet.show({
title: globalize.translate('Subtitles'),
items: menuItems,
positionTo: positionTo
positionTo: positionTo,
enableHistory: false
}).then(function (id) {
const index = parseInt(id);