milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #328 from jellyfin/release-10.3.z

Browse source 
Backmerge for Release 10.3.3
This commit is contained in:
Bond-009 2019-05-18 12:55:59 +02:00 • committed by GitHub
commit 3245e5c0d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 364 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/components/playback/mediasession.js
View file

@ -273,11 +273,11 @@ define(['playbackManager', 'nowPlayingHelper', 'events', 'connectionManager'], f
events.on(currentPlayer, 'timeupdate', onGeneralEvent);
}
function execute(name) {
playbackManager[name](currentPlayer);
}
if (navigator.mediaSession) {
function execute(name) {
playbackManager[name](currentPlayer);
}
navigator.mediaSession.setActionHandler('previoustrack', function () {
execute('previousTrack');
@ -310,4 +310,4 @@ define(['playbackManager', 'nowPlayingHelper', 'events', 'connectionManager'], f
});
bindToPlayer(playbackManager.getCurrentPlayer());
});
});

1
src/components/playback/playbackmanager.js
View file

@ -2576,7 +2576,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
} else {
playerStartPositionTicks = null;
contentType = getMimeType(type.toLowerCase(), mediaSource.TranscodingContainer);
if (mediaUrl.toLowerCase().indexOf('copytimestamps=true') === -1) {