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

update plugin catalog

Browse source
This commit is contained in:
Luke Pulverenti 2015-08-24 16:37:34 -04:00
parent 65ed0d3d3c
commit 4094adb5a7
11 changed files with 425 additions and 438 deletions
Download patch file Download diff file Expand all files Collapse all files

11
dashboard-ui/scripts/mediaplayer-video.js
View file

@ -946,15 +946,17 @@
// This will start the transcoding process before actually feeding the video url into the player
if ($.browser.safari && !mediaSource.RunTimeTicks) {
Dashboard.showModalLoadingMsg();
Dashboard.showLoadingMsg();
ApiClient.ajax({
type: 'GET',
url: streamInfo.url.replace('master.m3u8', 'live.m3u8')
}).always(function () {
Dashboard.hideLoadingMsg();
}).done(function () {
self.playVideoInternal(item, mediaSource, startPosition, streamInfo, callback);
}).fail(function() {
Dashboard.hideModalLoadingMsg();
});
} else {
@ -1057,8 +1059,6 @@
}).one("playing.mediaplayerevent", function () {
Dashboard.hideModalLoadingMsg();
// For some reason this is firing at the start, so don't bind until playback has begun
$(this).on("ended", self.onPlaybackStopped).one('ended', self.playNextAfterEnded);
@ -1091,7 +1091,6 @@
}).on("error.mediaplayerevent", function () {
Dashboard.hideModalLoadingMsg();
self.stop();
var errorMsg = Globalize.translate('MessageErrorPlayingVideo');