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

video playback check-ins

Browse source
This commit is contained in:
Techywarrior 2013-03-26 14:32:01 -07:00
parent ac31d33c0c
commit e33fba75d5
3 changed files with 89 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -44,17 +44,17 @@
ItemDetailPage.renderGallery(item); ItemDetailPage.renderGallery(item);
if (!item.Chapters || !item.Chapters.length) { if (!item.Chapters || !item.Chapters.length) {
$('#scenesCollapsible', page).remove(); $('#scenesCollapsible', page).hide();
} else { } else {
ItemDetailPage.renderScenes(item); ItemDetailPage.renderScenes(item);
} }
if (!item.LocalTrailerCount || item.LocalTrailerCount == 0) { if (!item.LocalTrailerCount || item.LocalTrailerCount == 0) {
$('#trailersCollapsible', page).remove(); $('#trailersCollapsible', page).hide();
} else { } else {
ItemDetailPage.renderTrailers(item); ItemDetailPage.renderTrailers(item);
} }
if (!item.SpecialFeatureCount || item.SpecialFeatureCount == 0) { if (!item.SpecialFeatureCount || item.SpecialFeatureCount == 0) {
$('#specialsCollapsible', page).remove(); $('#specialsCollapsible', page).hide();
} else { } else {
ItemDetailPage.renderSpecials(item); ItemDetailPage.renderSpecials(item);
} }
@ -450,18 +450,19 @@
html += '<div class="posterViewItem posterViewItemWithDualText">'; html += '<div class="posterViewItem posterViewItemWithDualText">';
html += '<a href="#play-Trailer-' + i + '" onclick="ItemDetailPage.playTrailer(' + i + ');">'; html += '<a href="#play-Trailer-' + i + '" onclick="ItemDetailPage.playTrailer(' + i + ');">';
if (trailer.ImageTag) { var imageTags = trailer.ImageTags || {};
var imgUrl = ApiClient.getImageUrl(item.Id, { if (imageTags.Primary) {
width: 500,
tag: trailer.ImageTag, var imgUrl = ApiClient.getImageUrl(trailer.Id, {
type: "Trailer", maxwidth: 500,
index: i tag: imageTags.Primary,
type: "primary"
}); });
html += '<img src="' + imgUrl + '" />'; html += '<img src="' + imgUrl + '" />';
} else { } else {
html += '<img src="css/images/itemDetails/videoDefault.png"/>'; html += '<img src="css/images/items/detail/video.png"/>';
} }
html += '<div class="posterViewItemText posterViewItemPrimaryText">' + trailer.Name + '</div>'; html += '<div class="posterViewItemText posterViewItemPrimaryText">' + trailer.Name + '</div>';
@ -516,20 +517,22 @@
html += '<div class="posterViewItem posterViewItemWithDualText">'; html += '<div class="posterViewItem posterViewItemWithDualText">';
html += '<a href="#play-Special-' + i + '" onclick="ItemDetailPage.playSpecial(' + i + ');">'; html += '<a href="#play-Special-' + i + '" onclick="ItemDetailPage.playSpecial(' + i + ');">';
if (special.ImageTag) { var imageTags = special.ImageTags || {};
var imgUrl = ApiClient.getImageUrl(item.Id, { if (imageTags.Primary) {
width: 500,
tag: special.ImageTag, var imgUrl = ApiClient.getImageUrl(special.Id, {
type: "Special", maxwidth: 500,
index: i tag: imageTags.Primary,
type: "primary"
}); });
html += '<img src="' + imgUrl + '" />'; html += '<img src="' + imgUrl + '" />';
} else { } else {
html += '<img src="css/images/itemDetails/videoDefault.png"/>'; html += '<img src="css/images/items/detail/video.png"/>';
} }
html += '<div class="posterViewItemText posterViewItemPrimaryText">' + special.Name + '</div>'; html += '<div class="posterViewItemText posterViewItemPrimaryText">' + special.Name + '</div>';
html += '<div class="posterViewItemText">'; html += '<div class="posterViewItemText">';

2
dashboard-ui/scripts/extensions.js
View file

@ -491,7 +491,7 @@ _V_.ResolutionMenuItem = _V_.MenuItem.extend({
var startTimeTicks = newSrc.match(new RegExp("StartTimeTicks=[0-9]+","g")); var startTimeTicks = newSrc.match(new RegExp("StartTimeTicks=[0-9]+","g"));
var start_time = startTimeTicks[0].replace("StartTimeTicks=",""); var start_time = startTimeTicks[0].replace("StartTimeTicks=","");
newSrc = newSrc.replace(new RegExp("StartTimeTicks=[0-9]+","g"),"StartTimeTicks="+Math.floor((start_time)+(10000000*current_time))); newSrc = newSrc.replace(new RegExp("StartTimeTicks=[0-9]+","g"),"StartTimeTicks="+Math.floor(parseInt(start_time)+(10000000*current_time)));
}else { }else {
newSrc += "&StartTimeTicks="+Math.floor(10000000*current_time); newSrc += "&StartTimeTicks="+Math.floor(10000000*current_time);
} }

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

@ -179,6 +179,10 @@
if ((this).duration() != "Infinity") if ((this).duration() != "Infinity")
$(".vjs-remaining-time-display").show(); $(".vjs-remaining-time-display").show();
}); });
(this).addEvent("play", MediaPlayer.updateProgress);
ApiClient.reportPlaybackStart(Dashboard.getCurrentUserId(), item.Id);
}); });
return $('video', nowPlayingBar)[0]; return $('video', nowPlayingBar)[0];
@ -192,6 +196,18 @@
if ($(elem).hasClass("vjs-tech")) { if ($(elem).hasClass("vjs-tech")) {
var player = _V_("videoWindow"); var player = _V_("videoWindow");
var startTimeTicks = player.tag.src.match(new RegExp("StartTimeTicks=[0-9]+","g"));
var start_time = startTimeTicks[0].replace("StartTimeTicks=","");
var item_string = player.tag.src.match(new RegExp("Videos/[0-9a-z\-]+","g"));
var item_id = item_string[0].replace("Videos/","");
var positionTicks = parseInt(start_time) + Math.floor(10000000*player.currentTime());
ApiClient.reportPlaybackStopped(Dashboard.getCurrentUserId(), item_id, positionTicks);
clearTimeout(progressInterval);
if (player.techName == "html5") { if (player.techName == "html5") {
player.tag.src = ""; player.tag.src = "";
player.tech.removeTriggers(); player.tech.removeTriggers();
@ -213,6 +229,22 @@
isPlaying: function () { isPlaying: function () {
return MediaPlayer.mediaElement; return MediaPlayer.mediaElement;
},
updateProgress: function () {
progressInterval = setInterval(function(){
var player = _V_("videoWindow");
var startTimeTicks = player.tag.src.match(new RegExp("StartTimeTicks=[0-9]+","g"));
var start_time = startTimeTicks[0].replace("StartTimeTicks=","");
var item_string = player.tag.src.match(new RegExp("Videos/[0-9a-z\-]+","g"));
var item_id = item_string[0].replace("Videos/","");
var positionTicks = parseInt(start_time) + Math.floor(10000000*player.currentTime());
ApiClient.reportPlaybackProgress(Dashboard.getCurrentUserId(), item_id, positionTicks);
},30000);
} }
}; };