mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
fixes for chrome 35
This commit is contained in:
parent
9f83edf9ec
commit
b8c3e8c777
4 changed files with 23 additions and 22 deletions
|
@ -32,6 +32,7 @@
|
|||
|
||||
self.initVideoPlayer = function () {
|
||||
video = playVideo(item, mediaSource, startPosition, user);
|
||||
|
||||
return video;
|
||||
};
|
||||
|
||||
|
@ -861,9 +862,9 @@
|
|||
|
||||
// Can't autoplay in these browsers so we need to use the full controls
|
||||
if (requiresControls) {
|
||||
html += '<video class="itemVideo" id="itemVideo" autoplay controls preload="none">';
|
||||
html += '<video class="itemVideo" id="itemVideo" autoplay controls>';
|
||||
} else {
|
||||
html += '<video class="itemVideo" id="itemVideo" autoplay preload="none">';
|
||||
html += '<video class="itemVideo" id="itemVideo" autoplay>';
|
||||
}
|
||||
|
||||
if (!isStatic) {
|
||||
|
@ -890,7 +891,6 @@
|
|||
$('#video-stopButton', videoControls).show();
|
||||
$('#video-playButton', videoControls).hide();
|
||||
$('#video-pauseButton', videoControls).show();
|
||||
$('#video-playlistButton', videoControls).hide();
|
||||
$('#video-previousTrackButton', videoControls).hide();
|
||||
$('#video-nextTrackButton', videoControls).hide();
|
||||
var videoElement = $('#videoElement', mediaPlayer).prepend(html);
|
||||
|
|
|
@ -726,6 +726,7 @@
|
|||
};
|
||||
|
||||
self.pause = function () {
|
||||
|
||||
currentMediaElement.pause();
|
||||
};
|
||||
|
||||
|
@ -1138,7 +1139,7 @@
|
|||
html += '<div class="mediaPlayerAudioContainer" style="display:none;"><div class="mediaPlayerAudioContainerInner">';;
|
||||
}
|
||||
|
||||
html += '<audio class="mediaPlayerAudio" preload="auto" controls>';
|
||||
html += '<audio class="mediaPlayerAudio" controls>';
|
||||
html += '</audio></div></div>';
|
||||
|
||||
$(document.body).append(html);
|
||||
|
|
|
@ -1309,7 +1309,6 @@ $(function () {
|
|||
|
||||
videoPlayerHtml += '<div id="video-basic-controls">';
|
||||
|
||||
videoPlayerHtml += '<a id="video-playlistButton" class="mediaButton playlistButton" href="playlist.videoPlayerHtml" data-role="button" data-icon="bullets" data-iconpos="notext" data-inline="true" title="Playlist">Playlist</a>';
|
||||
videoPlayerHtml += '<button id="video-previousTrackButton" class="mediaButton previousTrackButton" title="Previous Track" type="button" onclick="MediaPlayer.previousTrack();" data-icon="previous-track" data-iconpos="notext" data-inline="true">Previous Track</button>';
|
||||
videoPlayerHtml += '<button id="video-playButton" class="mediaButton" title="Play" type="button" onclick="MediaPlayer.unpause();" data-icon="play" data-iconpos="notext" data-inline="true">Play</button>';
|
||||
videoPlayerHtml += '<button id="video-pauseButton" class="mediaButton" title="Pause" type="button" onclick="MediaPlayer.pause();" data-icon="pause" data-iconpos="notext" data-inline="true">Pause</button>';
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue