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 remote-tracking branch 'upstream/master' into focus-fixes

Browse source
This commit is contained in:
MrTimscampi 2020-08-30 18:19:08 +02:00
commit ca4419da4d
26 changed files with 2146 additions and 1996 deletions
Download patch file Download diff file Expand all files Collapse all files

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

File diff suppressed because it is too large Load diff

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

@ -693,7 +693,7 @@ import 'css!assets/css/videoosd';
lastUpdateTime = now;
const player = this;
currentRuntimeTicks = playbackManager.duration(player);
const currentTime = playbackManager.currentTime(player);
const currentTime = playbackManager.currentTime(player) * 10000;
updateTimeDisplay(currentTime, currentRuntimeTicks, playbackManager.playbackStartTime(player), playbackManager.getBufferedRanges(player));
const item = currentItem;
refreshProgramInfoIfNeeded(player, item);