# HG changeset patch # User Yves-Marie Haussonne <1218002+ymph@users.noreply.github.com> # Date 1299581998 -3600 # Node ID 9266a28107b35bc61d0428aabec3b2be115b0eff # Parent 57a17386f41b0521fa4eac00a8f3da98f9a3fc67# Parent e9f4dc2d3fc4ed3c37197bc13f30e355d251c168 Merge with 2f87630badbe3e4942fc5835b1b79f360c85ff50 diff -r 57a17386f41b -r 9266a28107b3 web/rsln/polemicaltimeline.php diff -r 57a17386f41b -r 9266a28107b3 web/rsln/res/metadataplayer/src/js/LdtPlayer.js --- a/web/rsln/res/metadataplayer/src/js/LdtPlayer.js Mon Feb 21 11:16:36 2011 +0100 +++ b/web/rsln/res/metadataplayer/src/js/LdtPlayer.js Tue Mar 08 11:59:58 2011 +0100 @@ -317,7 +317,7 @@ } }); - + ChartTimeLine(); }); } @@ -332,7 +332,7 @@ if(__IriSP.config.gui.mode=="radio"){ __IriSP.jQuery( "
\n"+ "
\n"+ - " Get flash to see this player \n"+ + " Nécessite Flash player Veuillez patienter durant le chargement du média \n"+ "
\n"+ "
\n"+ "
\n"+ @@ -443,11 +443,11 @@ }; __IriSP.Media = function (id,url,duration,title,description){ - this.id = id; - this.url = url; - this.title = title; + this.id = id; + this.url = url; + this.title = title; this.description = description; - this.duration = duration; + this.duration = duration; this.lignes = new Array(); __IriSP.trace("__IriSP.Media","Media ID : "+id); @@ -994,7 +994,8 @@ if(obj.newstate == 'PAUSED') { __IriSP.trace("__IriSP.stateMonitor","PAUSE"); - __IriSP.MyApiPlayer.changePageUrlOffset(__IriSP.currentPosition); + __IriSP.MyApiPlayer.changePageUrlOffset(__IriSP.currentPosition); + //PaperSlider.attr({x:-100,y:-100}); __IriSP.jQuery(".ui-icon-play").css("background-position","0px -160px"); } else if (obj.newstate == 'PLAYING'){ @@ -1013,10 +1014,12 @@ __IriSP.positionListener = function(obj) { //__IriSP.trace("__IriSP.positionListener",obj.position); __IriSP.currentPosition = obj.position; - var tmp = document.getElementById("posit"); - if (tmp) { tmp.innerHTML = "position: " + __IriSP.currentPosition; } + //var tmp = document.getElementById("posit"); + //if (tmp) { tmp.innerHTML = "position: " + __IriSP.currentPosition; } __IriSP.jQuery("#slider-range-min").slider("value", obj.position); - __IriSP.jQuery("#amount").val(obj.position+" s"); + PaperSlider.attr({x:obj.position/500*750/10,y:20}); + //PaperSlider.toFront(); + //__IriSP.jQuery("#amount").val(obj.position+" s"); // afficher annotation __IriSP.MyLdt.checkTime(__IriSP.currentPosition); @@ -1197,9 +1200,9 @@ __IriSP.jQuery(""+__IriSP.jQueryAnnotationTemplate+"
").appendTo("#Ldt-Annotations"); // TOOLTIP BUG ! - //__IriSP.jQuery("#"+this.id).tooltip({ effect: 'slide'}); + __IriSP.jQuery("#"+this.id).tooltip({ effect: 'slide'}); //var thisNode = __IriSP.jQuery(); - addTip("#"+this.id, __IriSP.stripHtml(titleForDiv),"#000"); + //addTip("#"+this.id, __IriSP.stripHtml(titleForDiv),"#000"); __IriSP.jQuery("#"+this.id).fadeTo(0,0.3); __IriSP.jQuery("#"+this.id).mouseover(function() {