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

remove chromecast ui

Browse source
This commit is contained in:
Luke Pulverenti 2014-04-10 11:49:46 -04:00
parent 305646fa63
commit ad3f285ded
3 changed files with 74 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -139,7 +139,7 @@
text-align: left; text-align: left;
margin-left: 0; margin-left: 0;
right: 0; right: 0;
bottom: 85px; bottom: 83px;
} }
/* Media queries /* Media queries
@ -259,7 +259,7 @@
} }
#mediaPlayer #videoControls .mediaPlayerFlyout { #mediaPlayer #videoControls .mediaPlayerFlyout {
bottom: 150px; bottom: 148px;
} }
} }
@ -370,4 +370,4 @@
.cursor-inactive { .cursor-inactive {
cursor: none; cursor: none;
} }

113
dashboard-ui/scripts/chromecast.js
View file

@ -688,20 +688,20 @@
this.currentMediaSession.addUpdateListener(this.onMediaStatusUpdate.bind(this)); this.currentMediaSession.addUpdateListener(this.onMediaStatusUpdate.bind(this));
this.currentMediaDuration = this.currentMediaSession.media.duration; this.currentMediaDuration = this.currentMediaSession.media.duration;
var playTime = document.getElementById(this.playback); //var playTime = document.getElementById(this.playback);
if (!playTime) { //if (!playTime) {
// Set duration time // // Set duration time
var totalTime = document.getElementById(this.duration); // var totalTime = document.getElementById(this.duration);
totalTime.innerHTML = " / " + formatTime(this.currentMediaDuration); // totalTime.innerHTML = " / " + formatTime(this.currentMediaDuration);
// Set play time // // Set play time
playTime = document.createElement("div"); // playTime = document.createElement("div");
playTime.id = this.playback; // playTime.id = this.playback;
playTime.className = "currentTime"; // playTime.className = "currentTime";
playTime.style.marginRight = "5px"; // playTime.style.marginRight = "5px";
totalTime.parentNode.insertBefore(playTime, totalTime); // totalTime.parentNode.insertBefore(playTime, totalTime);
playTime.innerHTML = formatTime(this.currentMediaTime); // playTime.innerHTML = formatTime(this.currentMediaTime);
} //}
}; };
function formatTime(duration) { function formatTime(duration) {
@ -829,10 +829,10 @@
this.onError.bind(this)); this.onError.bind(this));
this.castPlayerState = PLAYER_STATE.STOPPED; this.castPlayerState = PLAYER_STATE.STOPPED;
clearInterval(this.timer); clearInterval(this.timer);
var playTime = document.getElementById(this.playback); //var playTime = document.getElementById(this.playback);
if (playTime) { //if (playTime) {
playTime.parentNode.removeChild(playTime); // playTime.parentNode.removeChild(playTime);
} //}
}; };
/** /**
@ -892,9 +892,8 @@
*/ */
CastPlayer.prototype.seekMedia = function (event) { CastPlayer.prototype.seekMedia = function (event) {
var pos = parseInt(event); var pos = parseInt(event);
var p = document.getElementById(this.progressBar);
var curr = parseInt(this.currentMediaTime + this.currentMediaDuration * pos); var curr = parseInt(this.currentMediaTime + this.currentMediaDuration * pos);
var pw = parseInt(p.value) + pos;
if (this.castPlayerState != PLAYER_STATE.PLAYING && this.castPlayerState != PLAYER_STATE.PAUSED) { if (this.castPlayerState != PLAYER_STATE.PLAYING && this.castPlayerState != PLAYER_STATE.PAUSED) {
return; return;
@ -932,21 +931,21 @@
* @param {Object} e An media status update object * @param {Object} e An media status update object
*/ */
CastPlayer.prototype.updateProgressBar = function (e) { CastPlayer.prototype.updateProgressBar = function (e) {
var p = document.getElementById(this.progressBar); //var p = document.getElementById(this.progressBar);
if (e.idleReason == 'FINISHED' && e.playerState == 'IDLE') { //if (e.idleReason == 'FINISHED' && e.playerState == 'IDLE') {
p.value = 0; // p.value = 0;
clearInterval(this.timer); // clearInterval(this.timer);
this.castPlayerState = PLAYER_STATE.STOPPED; // this.castPlayerState = PLAYER_STATE.STOPPED;
if (e.idleReason == 'FINISHED') { // if (e.idleReason == 'FINISHED') {
$.publish("/playback/complete", e); // $.publish("/playback/complete", e);
console.log("playback complete", e); // console.log("playback complete", e);
} // }
} //}
else { //else {
p.value = Number(e.currentTime / this.currentMediaSession.media.duration + 1).toFixed(3); // p.value = Number(e.currentTime / this.currentMediaSession.media.duration + 1).toFixed(3);
this.progressFlag = false; // this.progressFlag = false;
setTimeout(this.setProgressFlag.bind(this), 1000); // don't update progress in 1 second // setTimeout(this.setProgressFlag.bind(this), 1000); // don't update progress in 1 second
} //}
}; };
/** /**
@ -961,33 +960,33 @@
* Update progress bar based on timer * Update progress bar based on timer
*/ */
CastPlayer.prototype.updateProgressBarByTimer = function () { CastPlayer.prototype.updateProgressBarByTimer = function () {
var p = document.getElementById(this.progressBar); //var p = document.getElementById(this.progressBar);
if (isNaN(parseInt(p.value))) { //if (isNaN(parseInt(p.value))) {
p.value = 0; // p.value = 0;
} //}
if (this.currentMediaDuration > 0) { //if (this.currentMediaDuration > 0) {
var pp = Number(this.currentMediaTime / this.currentMediaDuration).toFixed(3); // var pp = Number(this.currentMediaTime / this.currentMediaDuration).toFixed(3);
var startTime = this.currentMediaOffset / 10000000; // var startTime = this.currentMediaOffset / 10000000;
var playTime = document.getElementById(this.playback); // var playTime = document.getElementById(this.playback);
if (playTime) { // if (playTime) {
playTime.innerHTML = formatTime(startTime + this.currentMediaTime); // playTime.innerHTML = formatTime(startTime + this.currentMediaTime);
} // }
} //}
if (this.progressFlag) { //if (this.progressFlag) {
// don't update progress if it's been updated on media status update event // // don't update progress if it's been updated on media status update event
p.value = pp; // p.value = pp;
} //}
if (pp > 100 || this.castPlayerState == PLAYER_STATE.IDLE) { //if (pp > 100 || this.castPlayerState == PLAYER_STATE.IDLE) {
clearInterval(this.timer); // clearInterval(this.timer);
this.deviceState = DEVICE_STATE.IDLE; // this.deviceState = DEVICE_STATE.IDLE;
this.castPlayerState = PLAYER_STATE.IDLE; // this.castPlayerState = PLAYER_STATE.IDLE;
$.publish("/playback/complete", true); // $.publish("/playback/complete", true);
console.log("playback complete"); // console.log("playback complete");
} //}
}; };
/** /**

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

@ -1330,42 +1330,42 @@ $(function () {
footerHtml += '<div class="barBackground ui-bar-b"></div>'; footerHtml += '<div class="barBackground ui-bar-b"></div>';
footerHtml += '<div style="display:inline-block;width:12px;"></div>'; footerHtml += '<div style="display:inline-block;width:12px;"></div>';
footerHtml += '<a id="playlistButton" class="mediaButton playlistButton" href="playlist.html" data-role="button" data-icon="bullets" data-iconpos="notext" data-inline="true" title="Playlist">Playlist</a>'; footerHtml += '<a id="playlistButton" class="mediaButton playlistButton" href="playlist.html" data-role="button" data-icon="bullets" data-iconpos="notext" data-inline="true" title="Playlist">Playlist</a>';
footerHtml += '<button id="previousTrackButton" class="mediaButton previousTrackButton" title="Previous Track" type="button" onclick="MediaController.previousTrack();" data-icon="previous-track" data-iconpos="notext" data-inline="true">Previous Track</button>'; footerHtml += '<button id="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>';
footerHtml += '<button id="playButton" class="mediaButton" title="Play" type="button" onclick="MediaController.unpause();" data-icon="play" data-iconpos="notext" data-inline="true">Play</button>'; footerHtml += '<button id="playButton" class="mediaButton" title="Play" type="button" onclick="MediaPlayer.unpause();" data-icon="play" data-iconpos="notext" data-inline="true">Play</button>';
footerHtml += '<button id="pauseButton" class="mediaButton" title="Pause" type="button" onclick="MediaController.pause();" data-icon="pause" data-iconpos="notext" data-inline="true">Pause</button>'; footerHtml += '<button id="pauseButton" class="mediaButton" title="Pause" type="button" onclick="MediaPlayer.pause();" data-icon="pause" data-iconpos="notext" data-inline="true">Pause</button>';
footerHtml += '<div id="mediaElement"></div>'; footerHtml += '<div id="mediaElement"></div>';
footerHtml += '<button id="stopButton" class="mediaButton" title="Stop" type="button" onclick="MediaController.stop();" data-icon="stop" data-iconpos="notext" data-inline="true">Stop</button>'; footerHtml += '<button id="stopButton" class="mediaButton" title="Stop" type="button" onclick="MediaPlayer.stop();" data-icon="stop" data-iconpos="notext" data-inline="true">Stop</button>';
footerHtml += '<button id="nextTrackButton" class="mediaButton nextTrackButton" title="Next Track" type="button" onclick="MediaController.nextTrack();" data-icon="next-track" data-iconpos="notext" data-inline="true">Next Track</button>'; footerHtml += '<button id="nextTrackButton" class="mediaButton nextTrackButton" title="Next Track" type="button" onclick="MediaPlayer.nextTrack();" data-icon="next-track" data-iconpos="notext" data-inline="true">Next Track</button>';
footerHtml += '<div class="positionSliderContainer sliderContainer">'; footerHtml += '<div class="positionSliderContainer sliderContainer">';
footerHtml += '<input id="positionSlider" type="range" class="mediaSlider positionSlider slider" step=".001" min="0" max="100" value="0" style="display:none;" data-mini="true" data-theme="a" data-highlight="true" />'; footerHtml += '<input type="range" class="mediaSlider positionSlider slider" step=".001" min="0" max="100" value="0" style="display:none;" data-mini="true" data-theme="a" data-highlight="true" />';
footerHtml += '</div>'; footerHtml += '</div>';
footerHtml += '<div class="currentTime" id="currentTime"></div>'; footerHtml += '<div class="currentTime"></div>';
footerHtml += '<div class="nowPlayingMediaInfo"></div>'; footerHtml += '<div class="nowPlayingMediaInfo"></div>';
footerHtml += '<button id="muteButton" class="mediaButton muteButton" title="Mute" type="button" onclick="MediaController.mute();" data-icon="audio" data-iconpos="notext" data-inline="true">Mute</button>'; footerHtml += '<button id="muteButton" class="mediaButton muteButton" title="Mute" type="button" onclick="MediaPlayer.mute();" data-icon="audio" data-iconpos="notext" data-inline="true">Mute</button>';
footerHtml += '<button id="unmuteButton" class="mediaButton unmuteButton" title="Unmute" type="button" onclick="MediaController.unMute();" data-icon="volume-off" data-iconpos="notext" data-inline="true">Unmute</button>'; footerHtml += '<button id="unmuteButton" class="mediaButton unmuteButton" title="Unmute" type="button" onclick="MediaPlayer.unMute();" data-icon="volume-off" data-iconpos="notext" data-inline="true">Unmute</button>';
footerHtml += '<div class="volumeSliderContainer sliderContainer">'; footerHtml += '<div class="volumeSliderContainer sliderContainer">';
footerHtml += '<input type="range" class="mediaSlider volumeSlider slider" step=".05" min="0" max="1" value="0" style="display:none;" data-mini="true" data-theme="a" data-highlight="true" />'; footerHtml += '<input type="range" class="mediaSlider volumeSlider slider" step=".05" min="0" max="1" value="0" style="display:none;" data-mini="true" data-theme="a" data-highlight="true" />';
footerHtml += '</div>'; footerHtml += '</div>';
footerHtml += '<button onclick="MediaController.showQualityFlyout();" id="qualityButton" class="mediaButton qualityButton" title="Quality" type="button" data-icon="gear" data-iconpos="notext" data-inline="true">Quality</button>'; footerHtml += '<button onclick="MediaPlayer.showQualityFlyout();" id="qualityButton" class="mediaButton qualityButton" title="Quality" type="button" data-icon="gear" data-iconpos="notext" data-inline="true">Quality</button>';
footerHtml += '<div class="mediaFlyoutContainer"><div id="qualityFlyout" style="display:none;" class="mediaPlayerFlyout"></div></div>'; footerHtml += '<div class="mediaFlyoutContainer"><div id="qualityFlyout" style="display:none;" class="mediaPlayerFlyout"></div></div>';
footerHtml += '<button onclick="MediaController.showAudioTracksFlyout();" id="audioTracksButton" class="imageButton mediaButton audioTracksButton" title="Audio tracks" type="button" data-icon="audiocd" data-iconpos="notext" data-inline="true">Audio Tracks</button>'; footerHtml += '<button onclick="MediaPlayer.showAudioTracksFlyout();" id="audioTracksButton" class="imageButton mediaButton audioTracksButton" title="Audio tracks" type="button" data-icon="audiocd" data-iconpos="notext" data-inline="true">Audio Tracks</button>';
footerHtml += '<div class="mediaFlyoutContainer"><div id="audioTracksFlyout" style="display:none;" class="mediaPlayerFlyout audioTracksFlyout"></div></div>'; footerHtml += '<div class="mediaFlyoutContainer"><div id="audioTracksFlyout" style="display:none;" class="mediaPlayerFlyout audioTracksFlyout"></div></div>';
footerHtml += '<button onclick="MediaController.showSubtitleMenu();" id="subtitleButton" class="imageButton mediaButton subtitleButton" title="Subtitles" type="button" data-icon="subtitles" data-iconpos="notext" data-inline="true">Subtitles</button>'; footerHtml += '<button onclick="MediaPlayer.showSubtitleMenu();" id="subtitleButton" class="imageButton mediaButton subtitleButton" title="Subtitles" type="button" data-icon="subtitles" data-iconpos="notext" data-inline="true">Subtitles</button>';
footerHtml += '<div class="mediaFlyoutContainer"><div id="subtitleFlyout" style="display:none;" class="mediaPlayerFlyout subtitleFlyout"></div></div>'; footerHtml += '<div class="mediaFlyoutContainer"><div id="subtitleFlyout" style="display:none;" class="mediaPlayerFlyout subtitleFlyout"></div></div>';
footerHtml += '<button onclick="MediaController.showChaptersFlyout();" id="chaptersButton" class="mediaButton chaptersButton" title="Scenes" type="button" data-icon="video" data-iconpos="notext" data-inline="true">Scenes</button>'; footerHtml += '<button onclick="MediaPlayer.showChaptersFlyout();" id="chaptersButton" class="mediaButton chaptersButton" title="Scenes" type="button" data-icon="video" data-iconpos="notext" data-inline="true">Scenes</button>';
footerHtml += '<div class="mediaFlyoutContainer"><div id="chaptersFlyout" style="display:none;" class="mediaPlayerFlyout chaptersFlyout"></div></div>'; footerHtml += '<div class="mediaFlyoutContainer"><div id="chaptersFlyout" style="display:none;" class="mediaPlayerFlyout chaptersFlyout"></div></div>';
footerHtml += '<button onclick="MediaController.toggleFullscreen();" id="fullscreenButton" class="mediaButton fullscreenButton" title="Fullscreen" type="button" data-icon="action" data-iconpos="notext" data-inline="true">Fullscreen</button>'; footerHtml += '<button onclick="MediaPlayer.toggleFullscreen();" id="fullscreenButton" class="mediaButton fullscreenButton" title="Fullscreen" type="button" data-icon="action" data-iconpos="notext" data-inline="true">Fullscreen</button>';
footerHtml += '</div>'; footerHtml += '</div>';
@ -1376,7 +1376,7 @@ $(function () {
var footerElem = $('#footer', document.body); var footerElem = $('#footer', document.body);
footerElem.trigger('create'); footerElem.trigger('create');
$(window).on("beforeunload", function () { $(window).on("beforeunload", function () {
// Close the connection gracefully when possible // Close the connection gracefully when possible