mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
Video player fixes
Fix for proper cleanup after playback stopped/fullscreen stop Fix for fullscreen after navigation
This commit is contained in:
parent
c3e4b0bdd5
commit
de64ab5394
2 changed files with 16 additions and 8 deletions
|
@ -43,8 +43,10 @@
|
||||||
self.resetEnhancements = function () {
|
self.resetEnhancements = function () {
|
||||||
var footer = $("#footer");
|
var footer = $("#footer");
|
||||||
var videoBackdrop = $("#videoBackdrop", footer);
|
var videoBackdrop = $("#videoBackdrop", footer);
|
||||||
|
var mediaElement = $("#mediaElement", videoBackdrop);
|
||||||
var nowPlayingBar = $("#nowPlayingBar", videoBackdrop);
|
var nowPlayingBar = $("#nowPlayingBar", videoBackdrop);
|
||||||
footer.append(nowPlayingBar);
|
mediaElement.html(""); // remove play/pause
|
||||||
|
footer.append(mediaElement).append(nowPlayingBar);
|
||||||
videoBackdrop.remove();
|
videoBackdrop.remove();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -57,6 +59,8 @@
|
||||||
document.webkitExitFullscreen();
|
document.webkitExitFullscreen();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$('#videoPlayer').removeClass('fullscreenVideo');
|
||||||
|
|
||||||
fullscreenExited = true;
|
fullscreenExited = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -8,19 +8,19 @@
|
||||||
var currentMediaElement;
|
var currentMediaElement;
|
||||||
var currentProgressInterval;
|
var currentProgressInterval;
|
||||||
var positionSlider;
|
var positionSlider;
|
||||||
self.isPositionSliderActive;
|
|
||||||
var currentTimeElement;
|
var currentTimeElement;
|
||||||
var currentItem;
|
var currentItem;
|
||||||
self.volumeSlider;
|
|
||||||
var muteButton;
|
var muteButton;
|
||||||
var unmuteButton;
|
var unmuteButton;
|
||||||
self.startTimeTicksOffset;
|
|
||||||
var curentDurationTicks;
|
var curentDurationTicks;
|
||||||
var canClientSeek;
|
var canClientSeek;
|
||||||
|
|
||||||
self.playlist = [];
|
|
||||||
var currentPlaylistIndex = 0;
|
var currentPlaylistIndex = 0;
|
||||||
|
|
||||||
|
self.isPositionSliderActive;
|
||||||
|
self.volumeSlider;
|
||||||
|
self.startTimeTicksOffset;
|
||||||
|
self.playlist = [];
|
||||||
|
|
||||||
self.updateCanClientSeek = function (elem) {
|
self.updateCanClientSeek = function (elem) {
|
||||||
var duration = elem.duration;
|
var duration = elem.duration;
|
||||||
canClientSeek = duration && !isNaN(duration) && duration != Number.POSITIVE_INFINITY && duration != Number.NEGATIVE_INFINITY;
|
canClientSeek = duration && !isNaN(duration) && duration != Number.POSITIVE_INFINITY && duration != Number.NEGATIVE_INFINITY;
|
||||||
|
@ -81,6 +81,10 @@
|
||||||
|
|
||||||
if (currentItem.MediaType == "Video") {
|
if (currentItem.MediaType == "Video") {
|
||||||
ApiClient.stopActiveEncodings();
|
ApiClient.stopActiveEncodings();
|
||||||
|
if (self.isFullScreen()) {
|
||||||
|
self.exitFullScreen();
|
||||||
|
}
|
||||||
|
self.resetEnhancements();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1128,11 +1132,11 @@
|
||||||
var footer = $('#footer');
|
var footer = $('#footer');
|
||||||
footer.hide();
|
footer.hide();
|
||||||
|
|
||||||
if (elem.mediaType == "Video") {
|
if (currentItem.MediaType == "Video") {
|
||||||
self.resetEnhancements();
|
|
||||||
if (self.isFullScreen()) {
|
if (self.isFullScreen()) {
|
||||||
self.exitFullScreen();
|
self.exitFullScreen();
|
||||||
}
|
}
|
||||||
|
self.resetEnhancements();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue