yaz/commit
add endTime
author | Michiel Hildebrand |
---|---|
Tue Nov 8 09:16:25 2011 +0100 | |
committer | Michiel Hildebrand |
Tue Nov 8 09:16:25 2011 +0100 | |
commit | 150c1d37938fc918b375995b55a5ae834f9ca5f2 |
tree | 4e6ae5b4fe09714b79fc2a72a9782d568ca47eea |
parent | 6e2b9bdf64601af09a8aa7f5c9a85a2a53c844ed |
Diff style: patch stat
diff --git a/web/js/videoframes/videoframes.js b/web/js/videoframes/videoframes.js index e14f1e2..09d5588 100644 --- a/web/js/videoframes/videoframes.js +++ b/web/js/videoframes/videoframes.js @@ -154,8 +154,9 @@ YUI.add('video-frames', function(Y) { video = this.get("video"), time = frame.startTime/1000, label = frame.tag ? frame.tag.label : '', - role = frame.role ? frame.role : ''; - + role = frame.role ? frame.role : '', + endTime = frame.duration ? time+(frame.duration/1000) : null; + var html = '<div class="image">' +'<img src="'+frameServer+'?url='+video+'&time='+time+'">' +'</div>'; @@ -163,10 +164,11 @@ YUI.add('video-frames', function(Y) { //html += '<div class="frame-confirm">click to confirm</div>'; html += '<div class="frame-confirm '+role+'">' +this._roleLabel(role) - +label+' '+this.formatTime(time)+ - '</div>'; + +label+' '+this.formatTime(time)+'</div>'; } else { - html += '<div class="tag">'+label+' '+this.formatTime(time)+'</div>'; + html += '<div class="tag">'+label+' '+this.formatTime(time); + if(endTime) { html += ' -- '+this.formatTime(endTime); } + html += '</div>'; } return html;