# HG changeset patch
# User Anthony Ly <anthonyly.com@gmail.com>
# Date 1370274435 -7200
# Node ID 79974d302930c088b3dae9a2755c12c6bc72ac50
# Parent  2542e988f80c66634bbdd00d926f5638647e812d# Parent  31b0ac589b45f6ff99203597222687d854672830
Merge

diff -r 31b0ac589b45 -r 79974d302930 integration/js/common.js
--- a/integration/js/common.js	Mon Jun 03 16:39:52 2013 +0200
+++ b/integration/js/common.js	Mon Jun 03 17:47:15 2013 +0200
@@ -31,7 +31,12 @@
     });
 
     $('.popup').on('click', '.popup-content a', function(e){
-        e.preventDefault();
+        
+        if($(this).hasClass('no-prevent')){
+            return true;
+        }else{
+            e.preventDefault();
+        }
         if($(this).hasClass('btn-cancel')){
             $(this).parents('.popup').modal('hide');
         }
diff -r 31b0ac589b45 -r 79974d302930 integration/js/edition.js
--- a/integration/js/edition.js	Mon Jun 03 16:39:52 2013 +0200
+++ b/integration/js/edition.js	Mon Jun 03 17:47:15 2013 +0200
@@ -498,10 +498,10 @@
             var currentTimePlusUnMin = 60 * 1000 + myMedia.currentTime,
                 endAnnotation = (currentTimePlusUnMin<myMedia.duration) ? currentTimePlusUnMin : myMedia.duration;
             var dataAnnotation = {
-                title : 'Nouveau',
+                title : '',
                 begin : myMedia.currentTime,
                 end : endAnnotation,
-                description : 'description',
+                description : '',
                 type : type,
                 keywords : []
             };
@@ -884,9 +884,11 @@
                 left : left,
                 width :width
             });
-
-
-
+        },
+        start : function(){
+            var idSlider = $(this).attr('data-id'),
+                annotationTimeline = $('#annotation-timeline-'+ data.id);
+            annotationTimeline.css('z-index',100);
         },
         stop : function(){
             renderAnnotation()
diff -r 31b0ac589b45 -r 79974d302930 integration/modal-bibliotheque-video.html
--- a/integration/modal-bibliotheque-video.html	Mon Jun 03 16:39:52 2013 +0200
+++ b/integration/modal-bibliotheque-video.html	Mon Jun 03 17:47:15 2013 +0200
@@ -23,7 +23,7 @@
 				</h5>
 			</div>
 			<div class="span2">
-				<a href="#"><img src="img/140x140.gif" alt=""></a>
+				<a class="no-prevent" href="http://www.dailymotion.com/video/xgs10f_the-three-tenors-la-donna-e-mobile_music"><img src="img/140x140.gif" alt=""></a>
 				<h5>
 					<a href="#">Titre du média</a>
 				</h5>