equal
deleted
inserted
replaced
496 var dataView; |
496 var dataView; |
497 if(_.isUndefined(data)){//nouveau |
497 if(_.isUndefined(data)){//nouveau |
498 var currentTimePlusUnMin = 60 * 1000 + myMedia.currentTime, |
498 var currentTimePlusUnMin = 60 * 1000 + myMedia.currentTime, |
499 endAnnotation = (currentTimePlusUnMin<myMedia.duration) ? currentTimePlusUnMin : myMedia.duration; |
499 endAnnotation = (currentTimePlusUnMin<myMedia.duration) ? currentTimePlusUnMin : myMedia.duration; |
500 var dataAnnotation = { |
500 var dataAnnotation = { |
501 title : 'Nouveau', |
501 title : '', |
502 begin : myMedia.currentTime, |
502 begin : myMedia.currentTime, |
503 end : endAnnotation, |
503 end : endAnnotation, |
504 description : 'description', |
504 description : '', |
505 type : type, |
505 type : type, |
506 keywords : [] |
506 keywords : [] |
507 }; |
507 }; |
508 dataView = newAnnotation(dataAnnotation); |
508 dataView = newAnnotation(dataAnnotation); |
509 renderAnnotation(); |
509 renderAnnotation(); |
882 |
882 |
883 annotationTimeline.css({ |
883 annotationTimeline.css({ |
884 left : left, |
884 left : left, |
885 width :width |
885 width :width |
886 }); |
886 }); |
887 |
887 }, |
888 |
888 start : function(){ |
889 |
889 var idSlider = $(this).attr('data-id'), |
|
890 annotationTimeline = $('#annotation-timeline-'+ data.id); |
|
891 annotationTimeline.css('z-index',100); |
890 }, |
892 }, |
891 stop : function(){ |
893 stop : function(){ |
892 renderAnnotation() |
894 renderAnnotation() |
893 } |
895 } |
894 }; |
896 }; |