milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

time display change, chapter length check fix

Browse source
This commit is contained in:
Techywarrior 2013-03-25 22:11:45 -07:00
parent b0b9ab1e19
commit 180d47f04b
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dashboard-ui/scripts/Extensions.js
View file

@ -684,9 +684,14 @@ _V_.ChapterMenuItem = _V_.MenuItem.extend({
function ticks_to_human(str) {
var in_seconds = (str / 10000000);
var hours = '0'+Math.floor(in_seconds/3600);
var hours = Math.floor(in_seconds/3600);
var minutes = '0'+Math.floor((in_seconds-(hours*3600))/60);
var seconds = '0'+Math.round(in_seconds-(hours*3600)-(minutes*60));
return [hours.substr(-2),minutes.substr(-2),seconds.substr(-2)].join(":");
var time = '';
if (hours > 0) time += hours+":";
time += minutes.substr(-2) + ":" +seconds.substr(-2);
return time;
};

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

@ -258,7 +258,7 @@ var videoJSextension = {
_V_.merge( _V_.ControlBar.prototype.options.components, { ResolutionSelectorButton : {} } );
//chceck if chapters exist and add chapter selector
if (item.Chapters.length > 0) {
if (item.Chapters && item.Chapters.length) {
// Put together the videojs source arrays for each available chapter
$.each( item.Chapters, function( i, chapter ) {