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

show messages the first time folder rips are streamed

Browse source
This commit is contained in:
Luke Pulverenti 2013-05-24 21:51:17 -04:00
parent 94ae0c4d3d
commit a2a0afa970
2 changed files with 77 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
dashboard-ui/css/site.css
View file

@ -707,7 +707,7 @@ progress {
} }
.nowPlayingBarImage { .nowPlayingBarImage {
border: 1px solid #a7a7a7; border: 1px solid #a7a7a7!important;
padding: 1px; padding: 1px;
vertical-align: bottom; vertical-align: bottom;
} }
@ -736,6 +736,12 @@ progress {
display: none; display: none;
} }
.nowPlayingText {
position: relative;
top: -3px;
margin-left: 3px;
}
@media all and (min-width: 650px) { @media all and (min-width: 650px) {
.nowPlayingMediaInfo { .nowPlayingMediaInfo {
display: inline-block; display: inline-block;
@ -847,8 +853,8 @@ input[type="range"]::-ms-fill-upper {
} }
@media all and (max-width: 500px) { @media all and (max-width: 600px) {
.volumeButton, .volumeSlider, .fullscreenButton { .volumeButton, .volumeSlider, .fullscreenButton, .nowPlayingText {
display: none!important; display: none!important;
} }

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

@ -303,12 +303,19 @@
$('#stopButton', nowPlayingBar).show(); $('#stopButton', nowPlayingBar).show();
$('#playButton', nowPlayingBar).hide(); $('#playButton', nowPlayingBar).hide();
$('#pauseButton', nowPlayingBar).show(); $('#pauseButton', nowPlayingBar).show();
$('#playlistButton', nowPlayingBar).show();
$('#previousTrackButton', nowPlayingBar).show();
$('#nextTrackButton', nowPlayingBar).show();
$('#mediaElement', nowPlayingBar).html(html);
$('#fullscreenButton', nowPlayingBar).hide(); $('#fullscreenButton', nowPlayingBar).hide();
if (requiresControls) {
$('#previousTrackButton', nowPlayingBar).hide();
$('#nextTrackButton', nowPlayingBar).hide();
$('#playlistButton', nowPlayingBar).hide();
} else {
$('#previousTrackButton', nowPlayingBar).show();
$('#nextTrackButton', nowPlayingBar).show();
$('#playlistButton', nowPlayingBar).show();
}
$('#mediaElement', nowPlayingBar).html(html);
var audioElement = $("audio", nowPlayingBar); var audioElement = $("audio", nowPlayingBar);
var initialVolume = localStorage.getItem("volume") || 0.5; var initialVolume = localStorage.getItem("volume") || 0.5;
@ -590,6 +597,60 @@
self.play = function (items, startPosition) { self.play = function (items, startPosition) {
var item = items[0];
var videoType = (item.VideoType || "").toLowerCase();
if (videoType == "dvd") {
self.playWithWarning(items, startPosition, "dvdstreamconfirmed", "Dvd Folder Streaming");
return;
}
else if (videoType == "bluray") {
self.playWithWarning(items, startPosition, "bluraystreamconfirmed", "Blu-ray Folder Streaming");
return;
}
else if (videoType == "iso") {
var isoType = (item.IsoType || "").toLowerCase();
if (isoType == "dvd") {
self.playWithWarning(items, startPosition, "dvdisostreamconfirmed", "Dvd Iso Streaming");
return;
}
else if (isoType == "bluray") {
self.playWithWarning(items, startPosition, "blurayisostreamconfirmed", "Blu-ray Iso Streaming");
return;
}
}
self.play(items, startPosition);
};
self.playWithWarning = function (items, startPosition, localStorageKeyName, header) {
if (localStorage.getItem(localStorageKeyName) == "1") {
self.playInternal(items, startPosition);
return;
}
Dashboard.confirm("This feature is expiremental. It may not work at all with some titles. Do you wish to continue?", header, function(result) {
if (result) {
localStorage.setItem(localStorageKeyName, "1");
self.playInternal(items, startPosition);
}
});
};
self.playInternal = function (items, startPosition) {
if (self.isPlaying()) { if (self.isPlaying()) {
self.stop(); self.stop();
} }
@ -670,9 +731,9 @@
html += "<div><a href='itemdetails.html?id=" + item.Id + "'><img class='nowPlayingBarImage ' alt='' title='' src='" + url + "' style='height:36px;display:inline-block;' /></a></div>"; html += "<div><a href='itemdetails.html?id=" + item.Id + "'><img class='nowPlayingBarImage ' alt='' title='' src='" + url + "' style='height:36px;display:inline-block;' /></a></div>";
if (item.Type == "Movie") if (item.Type == "Movie")
html += '<div>' + name + '<br/>' + seriesName + '</div>'; html += '<div class="nowPlayingText">' + name + '<br/>' + seriesName + '</div>';
else else
html += '<div>' + seriesName + '<br/>' + name + '</div>'; html += '<div class="nowPlayingText">' + seriesName + '<br/>' + name + '</div>';
$('.nowPlayingMediaInfo', nowPlayingBar).html(html); $('.nowPlayingMediaInfo', nowPlayingBar).html(html);
}; };