Merge pull request #328 from jellyfin/release-10.3.z
Backmerge for Release 10.3.3
This commit is contained in:
@@ -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());
|
||||
});
|
||||
});
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user