equal
deleted
inserted
replaced
440 } |
440 } |
441 }); |
441 }); |
442 |
442 |
443 media.on("timeupdate", function(_time) { |
443 media.on("timeupdate", function(_time) { |
444 if (media === currentMedia) { |
444 if (media === currentMedia) { |
|
445 $(".frise-position").css("left",(100*_time/media.duration)+"%"); |
445 onCurrentMediaTimeupdate(_time); |
446 onCurrentMediaTimeupdate(_time); |
446 } |
447 } |
447 if (mashup === currentMedia && !mashup.paused && media === mashup.currentMedia && !media.seeking) { |
448 if (mashup === currentMedia && !mashup.paused && media === mashup.currentMedia && !media.seeking) { |
448 if ( _time < mashupSegmentEnd ) { |
449 if ( _time < mashupSegmentEnd ) { |
449 if ( _time >= mashupSegmentBegin ) { |
450 if ( _time >= mashupSegmentBegin ) { |
655 }); |
656 }); |
656 |
657 |
657 mashup.trigger("add"); |
658 mashup.trigger("add"); |
658 |
659 |
659 } |
660 } |
|
661 |
|
662 /* END mashupcore.js */ |
|
663 |