# HG changeset patch # User Anthony Ly # Date 1368718961 -7200 # Node ID c66274d0d8503f6afcd7983695e3389f558eaec2 # Parent 9fd6247d8c87838effddb84242ca19dfd23d2878 url plugins on html diff -r 9fd6247d8c87 -r c66274d0d850 integration/edition.html --- a/integration/edition.html Thu May 16 15:48:26 2013 +0200 +++ b/integration/edition.html Thu May 16 17:42:41 2013 +0200 @@ -447,37 +447,20 @@ \ No newline at end of file diff -r 9fd6247d8c87 -r c66274d0d850 integration/home.html --- a/integration/home.html Thu May 16 15:48:26 2013 +0200 +++ b/integration/home.html Thu May 16 17:42:41 2013 +0200 @@ -150,5 +150,13 @@ + + \ No newline at end of file diff -r 9fd6247d8c87 -r c66274d0d850 integration/js/edition.js --- a/integration/js/edition.js Thu May 16 15:48:26 2013 +0200 +++ b/integration/js/edition.js Thu May 16 17:42:41 2013 +0200 @@ -3,7 +3,47 @@ var global = { diaporama : null, idAnnotation : null -}; +}, +chapitres = {}, +annotations = {}; + +//onLoad +myProject.onLoad(function() { + + $(".project-title").text(myProject.title); + + myMedia = myProject.getCurrentMedia(); + + IriSP.htmlPlayer( + myMedia, + $(".main-video"), + { + width: 460, + height: 345, + controls: true, + autostart: true + } + ); + + myMedia.on("timeupdate", function(t) { + + //curseur chapitre + var pos = $(".chapitre-cut-wrap").width() * t / myMedia.duration, + wContainer = $('.chapitre-cut-wrap').width(), + btnCutChapter = $('.btn-cut-chapter'), + wBtnCutChapter = btnCutChapter.outerWidth(); + + $(".indicateur-chapter").css("left",pos); + if(pos+wBtnCutChapter>wContainer){ + btnCutChapter.css("left",(pos - wBtnCutChapter)); + }else{ + btnCutChapter.css("left",pos); + } + + }); + +});//myProject.onLoad + //modal $(document).on('click', 'a.open-modal', function(e){ @@ -109,6 +149,7 @@ //nouveau chapitre $('.chapter-widget').on('click', '.btn-cut-chapter', function(e){ e.preventDefault(); + var uniqId = 'id' + (new Date()).getTime(); $.get('template.html', function(templates){ var viewChapterRow = { @@ -261,11 +302,7 @@ }); //annotation > diaporama (spin) -var spinParam = { - imageBasePath :'lib/spin/img/', - max:60, - min:0 -}; + //config //CLEditor annotation > text (wysiwyg) @@ -371,4 +408,4 @@ $('#annotation-tab a:last-child').tab('show'); -}); \ No newline at end of file +});//ready \ No newline at end of file diff -r 9fd6247d8c87 -r c66274d0d850 integration/js/projet.js --- a/integration/js/projet.js Thu May 16 15:48:26 2013 +0200 +++ b/integration/js/projet.js Thu May 16 17:42:41 2013 +0200 @@ -6,7 +6,7 @@ //ZeroClipboard (fonctionne sous localhost) var clip = new ZeroClipboard( $('.clipboard'), { - moviePath: "lib/ZeroClipboard/ZeroClipboard.swf" + moviePath: ZeroClipboardMoviePath }); clip.on( 'complete', function(client, args) { alert("Copied text to clipboard: " + args.text ); diff -r 9fd6247d8c87 -r c66274d0d850 integration/liste-projet.html --- a/integration/liste-projet.html Thu May 16 15:48:26 2013 +0200 +++ b/integration/liste-projet.html Thu May 16 17:42:41 2013 +0200 @@ -150,6 +150,8 @@ - + \ No newline at end of file diff -r 9fd6247d8c87 -r c66274d0d850 integration/liste-ressource.html --- a/integration/liste-ressource.html Thu May 16 15:48:26 2013 +0200 +++ b/integration/liste-ressource.html Thu May 16 17:42:41 2013 +0200 @@ -218,5 +218,12 @@ + \ No newline at end of file diff -r 9fd6247d8c87 -r c66274d0d850 integration/modal-video.html --- a/integration/modal-video.html Thu May 16 15:48:26 2013 +0200 +++ b/integration/modal-video.html Thu May 16 17:42:41 2013 +0200 @@ -44,9 +44,5 @@ \ No newline at end of file