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

Video player fixes

Browse source 
Fix for proper cleanup after playback stopped/fullscreen stop
Fix for fullscreen after navigation
This commit is contained in:
Tim Hobbs 2014-03-14 14:16:01 -07:00
parent c3e4b0bdd5
commit de64ab5394
2 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -43,8 +43,10 @@
self.resetEnhancements = function () {
var footer = $("#footer");
var videoBackdrop = $("#videoBackdrop", footer);
var mediaElement = $("#mediaElement", videoBackdrop);
var nowPlayingBar = $("#nowPlayingBar", videoBackdrop);
footer.append(nowPlayingBar);
mediaElement.html(""); // remove play/pause
footer.append(mediaElement).append(nowPlayingBar);
videoBackdrop.remove();
};
@ -57,6 +59,8 @@
document.webkitExitFullscreen();
}
$('#videoPlayer').removeClass('fullscreenVideo');
fullscreenExited = true;
}

18
dashboard-ui/scripts/mediaplayer.js
View file

@ -8,19 +8,19 @@
var currentMediaElement;
var currentProgressInterval;
var positionSlider;
self.isPositionSliderActive;
var currentTimeElement;
var currentItem;
self.volumeSlider;
var muteButton;
var unmuteButton;
self.startTimeTicksOffset;
var curentDurationTicks;
var canClientSeek;
self.playlist = [];
var currentPlaylistIndex = 0;
self.isPositionSliderActive;
self.volumeSlider;
self.startTimeTicksOffset;
self.playlist = [];
self.updateCanClientSeek = function (elem) {
var duration = elem.duration;
canClientSeek = duration && !isNaN(duration) && duration != Number.POSITIVE_INFINITY && duration != Number.NEGATIVE_INFINITY;
@ -81,6 +81,10 @@
if (currentItem.MediaType == "Video") {
ApiClient.stopActiveEncodings();
if (self.isFullScreen()) {
self.exitFullScreen();
}
self.resetEnhancements();
}
}
@ -1128,11 +1132,11 @@
var footer = $('#footer');
footer.hide();
if (elem.mediaType == "Video") {
self.resetEnhancements();
if (currentItem.MediaType == "Video") {
if (self.isFullScreen()) {
self.exitFullScreen();
}
self.resetEnhancements();
}
};