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

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse source
This commit is contained in:
Luke Pulverenti 2013-04-17 23:53:27 -04:00
commit b6b6416a45
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/playlist.html
View file

@ -6,7 +6,7 @@
<body> <body>
<div id="playlistPage" data-role="page" class="page libraryPage noLogoPage" data-theme="a"> <div id="playlistPage" data-role="page" class="page libraryPage noLogoPage" data-theme="a">
<h1 class="libraryPageHeader"><a href="index.html" class="imageLink"> <h1 class="libraryPageHeader"><a href="index.html" class="imageLink">
<img src="css/images/home.png"></a>Playlist</h1> <img src="css/images/home.png"></a>Now Playing</h1>
<div data-role="content"> <div data-role="content">

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

@ -38,7 +38,10 @@
if (MediaPlayer.canPlay(item)) { if (MediaPlayer.canPlay(item)) {
$('#btnPlayMenu', page).show(); $('#btnPlayMenu', page).show();
$('#playButtonShadow', page).show(); $('#playButtonShadow', page).show();
if (MediaPlayer.isPlaying())
$('#btnQueueMenu', page).show(); $('#btnQueueMenu', page).show();
else
$('#btnQueueMenu', page).hide();
} else { } else {
$('#btnPlayMenu', page).hide(); $('#btnPlayMenu', page).hide();
$('#playButtonShadow', page).hide(); $('#playButtonShadow', page).hide();

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

@ -153,8 +153,14 @@
// HLS must be at the top for safari // HLS must be at the top for safari
// Webm must be ahead of mp4 due to the issue of mp4 playing too fast in chrome // Webm must be ahead of mp4 due to the issue of mp4 playing too fast in chrome
var mkvVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.mkv', $.extend({}, baseParams, {
videoCodec: 'h264',
audioCodec: 'aac'
}));
(this).src([ (this).src([
{ type: "application/x-mpegURL", src: hlsVideoUrl }, { type: "application/x-mpegURL", src: hlsVideoUrl },
{ type: "video/x-matroska", src: mkvVideoUrl },
{ type: "video/webm", src: webmVideoUrl }, { type: "video/webm", src: webmVideoUrl },
{ type: "video/mp4", src: mp4VideoUrl }, { type: "video/mp4", src: mp4VideoUrl },
{ type: "video/mp2t; codecs='h264, aac'", src: tsVideoUrl }, { type: "video/mp2t; codecs='h264, aac'", src: tsVideoUrl },
@ -310,7 +316,7 @@
seriesName = item.SeriesName || item.Album || item.ProductionYear; seriesName = item.SeriesName || item.Album || item.ProductionYear;
} }
html += "<div><img class='nowPlayingBarImage ' alt='' title='' src='" + url + "' style='height:36px;display:inline-block;' /></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>' + name + '<br/>' + seriesName + '</div>';
else else