wjones/jellyfin-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into connection-manager-global

Browse Source
This commit is contained in:
Julien Machiels
2020-09-01 10:16:21 +02:00
committed by GitHub
parent 73c7dfa0dd 924e8df815
commit 3cbe0f7264
139 changed files with 1032 additions and 3566 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/controllers/playback/queue/index.html
+1 -1
View File
@@ -135,7 +135,7 @@
<button is="paper-icon-button-light" class="btnShowSearch btnCommand autoSize" title="${Search}" data-command="GoToSearch">
<span class="material-icons search"></span>
</button>
<button is="paper-icon-button-light" class="bthShowSettings btnCommand autoSize" title="${ButtonSettings}" data-command="GoToSettings">
<button is="paper-icon-button-light" class="bthShowSettings btnCommand autoSize" title="${Settings}" data-command="GoToSettings">
<span class="material-icons settings"></span>
</button>
</div>
src/controllers/playback/video/index.js
+1 -1
View File
@@ -692,7 +692,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);