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

fixes for chrome 35

Browse source
This commit is contained in:
Luke Pulverenti 2014-04-13 14:25:22 -04:00
parent 9f83edf9ec
commit b8c3e8c777
4 changed files with 23 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

35
dashboard-ui/css/mediaplayer-video.css
View file

@ -26,15 +26,15 @@
.itemVideo { .itemVideo {
background-color: #000; background-color: #000;
margin: 20px 20px 80px; margin: 5px 5px 75px;
width: 320px; width: 320px;
height: 181px; height: 181px;
} }
#videoControls { #videoControls {
z-index: 99999; z-index: 99999;
padding: 0 20px 5px; padding: 0 5px 5px;
height: 80px; height: 75px;
position: absolute; position: absolute;
top: auto; top: auto;
right: 0; right: 0;
@ -54,7 +54,7 @@
#videoControls #video-basic-controls { #videoControls #video-basic-controls {
position: absolute; position: absolute;
top: 30px; top: 25px;
left: 20px; left: 20px;
bottom: 0; bottom: 0;
width: 600px; width: 600px;
@ -63,7 +63,7 @@
#videoControls #video-advanced-controls { #videoControls #video-advanced-controls {
position: absolute; position: absolute;
top: 30px; top: 25px;
right: 20px; right: 20px;
bottom: 0; bottom: 0;
width: 400px; width: 400px;
@ -142,6 +142,11 @@
bottom: 85px; bottom: 85px;
} }
#mediaPlayer .volumeSliderContainer {
position: relative;
top: 5px;
}
/* Media queries /* Media queries
***************************************/ ***************************************/
@ -191,10 +196,6 @@
margin-left: -550px; margin-left: -550px;
margin-top: -329px; margin-top: -329px;
} }
#video-videoPlayerMenuButton {
display: none;
}
} }
@media all and (min-width: 1440px) and (min-height: 720px) { @media all and (min-width: 1440px) and (min-height: 720px) {
@ -245,10 +246,6 @@
width: 250px; width: 250px;
} }
#mediaPlayer #video-basic-controls .volumeSliderContainer {
margin-top: 8px;
}
#mediaPlayer #video-basic-controls, #mediaPlayer #video-advanced-controls { #mediaPlayer #video-basic-controls, #mediaPlayer #video-advanced-controls {
width: 200px; width: 200px;
height: 120px; height: 120px;
@ -269,14 +266,18 @@
} }
} }
@media all and (max-width: 500px) { @media all and (max-width: 600px) {
#mediaPlayer .previousTrackButton, #mediaPlayer .nextTrackButton { #mediaPlayer .volumeSliderContainer, #mediaPlayer .muteButton, #mediaPlayer .unmuteButton {
display: none!important;
}
#mediaPlayer .nowPlayingImage, #mediaPlayer .nowPlayingText {
display: none!important; display: none!important;
} }
} }
@media all and (max-width: 400px) { @media all and (max-width: 500px) {
#mediaPlayer .playlistButton { #mediaPlayer .previousTrackButton, #mediaPlayer .nextTrackButton {
display: none!important; display: none!important;
} }
} }

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

@ -32,6 +32,7 @@
self.initVideoPlayer = function () { self.initVideoPlayer = function () {
video = playVideo(item, mediaSource, startPosition, user); video = playVideo(item, mediaSource, startPosition, user);
return video; return video;
}; };
@ -861,9 +862,9 @@
// Can't autoplay in these browsers so we need to use the full controls // Can't autoplay in these browsers so we need to use the full controls
if (requiresControls) { if (requiresControls) {
html += '<video class="itemVideo" id="itemVideo" autoplay controls preload="none">'; html += '<video class="itemVideo" id="itemVideo" autoplay controls>';
} else { } else {
html += '<video class="itemVideo" id="itemVideo" autoplay preload="none">'; html += '<video class="itemVideo" id="itemVideo" autoplay>';
} }
if (!isStatic) { if (!isStatic) {
@ -890,7 +891,6 @@
$('#video-stopButton', videoControls).show(); $('#video-stopButton', videoControls).show();
$('#video-playButton', videoControls).hide(); $('#video-playButton', videoControls).hide();
$('#video-pauseButton', videoControls).show(); $('#video-pauseButton', videoControls).show();
$('#video-playlistButton', videoControls).hide();
$('#video-previousTrackButton', videoControls).hide(); $('#video-previousTrackButton', videoControls).hide();
$('#video-nextTrackButton', videoControls).hide(); $('#video-nextTrackButton', videoControls).hide();
var videoElement = $('#videoElement', mediaPlayer).prepend(html); var videoElement = $('#videoElement', mediaPlayer).prepend(html);

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

@ -726,6 +726,7 @@
}; };
self.pause = function () { self.pause = function () {
currentMediaElement.pause(); currentMediaElement.pause();
}; };
@ -1138,7 +1139,7 @@
html += '<div class="mediaPlayerAudioContainer" style="display:none;"><div class="mediaPlayerAudioContainerInner">';; 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>'; html += '</audio></div></div>';
$(document.body).append(html); $(document.body).append(html);

1
dashboard-ui/scripts/site.js
View file

@ -1309,7 +1309,6 @@ $(function () {
videoPlayerHtml += '<div id="video-basic-controls">'; 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-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-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>'; 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>';