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

add more to video osd

Browse source
This commit is contained in:
Luke Pulverenti 2015-05-13 13:53:26 -04:00
parent 973adc227f
commit c14b074ab9
3 changed files with 46 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dashboard-ui/scripts/mediacontroller.js
View file

@ -389,7 +389,7 @@
};
// TOOD: This doesn't really belong here
self.getNowPlayingNameHtml = function (nowPlayingItem) {
self.getNowPlayingNameHtml = function (nowPlayingItem, includeNonNameInfo) {
var topText = nowPlayingItem.Name;
@ -412,7 +412,7 @@
bottomText = topText;
topText = nowPlayingItem.SeriesName || nowPlayingItem.Album;
}
else if (nowPlayingItem.ProductionYear) {
else if (nowPlayingItem.ProductionYear && includeNonNameInfo !== false) {
bottomText = nowPlayingItem.ProductionYear;
}

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

@ -290,12 +290,14 @@
var state = self.getPlayerStateInternal(self.currentMediaElement, item, self.currentMediaSource);
var url = "";
var imageWidth = 250;
var imageHeight = 400;
if (state.NowPlayingItem.PrimaryImageTag) {
url = ApiClient.getScaledImageUrl(state.NowPlayingItem.PrimaryImageItemId, {
type: "Primary",
width: 150,
width: imageWidth,
tag: state.NowPlayingItem.PrimaryImageTag
});
}
@ -303,7 +305,7 @@
url = ApiClient.getScaledImageUrl(state.NowPlayingItem.PrimaryImageItemId, {
type: "Primary",
width: 150,
width: imageWidth,
tag: state.NowPlayingItem.PrimaryImageTag
});
}
@ -311,7 +313,7 @@
url = ApiClient.getScaledImageUrl(state.NowPlayingItem.BackdropItemId, {
type: "Backdrop",
height: 300,
height: imageHeight,
tag: state.NowPlayingItem.BackdropImageTag,
index: 0
});
@ -321,19 +323,13 @@
url = ApiClient.getScaledImageUrl(state.NowPlayingItem.ThumbImageItemId, {
type: "Thumb",
height: 300,
height: imageHeight,
tag: state.NowPlayingItem.ThumbImageTag
});
}
var nowPlayingTextElement = $('.nowPlayingText', mediaControls);
var nameHtml = MediaController.getNowPlayingNameHtml(state.NowPlayingItem);
if (nameHtml.indexOf('<br/>') != -1) {
nowPlayingTextElement.addClass('nowPlayingDoubleText');
} else {
nowPlayingTextElement.removeClass('nowPlayingDoubleText');
}
var nameHtml = MediaController.getNowPlayingNameHtml(state.NowPlayingItem, false);
if (url) {
$('.nowPlayingImage', mediaControls).html('<img src="' + url + '" />');
@ -354,6 +350,25 @@
$('.videoTopControlsLogo', mediaControls).html('');
}
nameHtml = '<div class="videoNowPlayingName">' + nameHtml + '</div>';
var miscInfo = LibraryBrowser.getMiscInfoHtml(item);
if (miscInfo) {
nameHtml += '<div class="videoNowPlayingRating">' + miscInfo + '</div>';
}
var ratingHtml = LibraryBrowser.getRatingHtml(item);
if (ratingHtml) {
nameHtml += '<div class="videoNowPlayingRating">' + ratingHtml + '</div>';
}
if (item.Overview) {
nameHtml += '<div class="videoNowPlayingOverview">' + item.Overview + '</div>';
}
nowPlayingTextElement.html(nameHtml);
};