demo_player: comparison web/LdtPlayer-release.js

Mercurial Mercurial > demo_player / comparison

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

web/LdtPlayer-release.js

changeset 24	36df3a25d7bd
parent 23	44945db9746a
child 25	4f082f63e295

equal deleted inserted replaced

-:44945db9746a
+:36df3a25d7bd
 });
 }
 };
-IriSP.annotation_template = "{{! template for an annotation displayed in a segmentWidget }}<div title='{{divTitle}}' id='{{id}}'	class='Ldt-iri-chapter' 	style='left: {{startPourcent}}%;          width: {{endPourcent}}%;          background:#{{hexa_color}};' 	></div>";
+IriSP.annotation_template = "{{! template for an annotation displayed in a segmentWidget }}<div title='{{divTitle}}' id='{{id}}'	class='Ldt-iri-chapter' 	style='left: {{startPourcent}}%;          width: {{endPourcent}}%;          background-color:#{{hexa_color}};' 	></div>";
 IriSP.annotationWidget_template = "{{! template for the annotation widget }}<div class='Ldt-AnnotationsWidget'>  <!-- ugly div because we want to have a double border -->  <div class='Ldt-Annotation-DoubleBorder'>      <div class='Ldt-AnnotationContent'>        <div class='Ldt-AnnotationShareIcons'>         <a class='Ldt-fbShare' href=''><img src='{{img_dir}}/facebook.png' alt='share on facebook'></img></a>         <a class='Ldt-TwShare' href=''><img src='{{img_dir}}/twitter.png' alt='share on twitter'></img></a>         <a class='Ldt-GplusShare' href=''><img src='{{img_dir}}/google.png' alt='share on google+'></img></a>      </div>		  <div class='Ldt-SaTitle'></div>	  	<div class='Ldt-SaDescription'></div>    </div>  </div></div>";
 IriSP.annotation_loading_template = "{{! template shown while the annotation widget is loading }}<div id='Ldt-load-container'><div id='Ldt-loader'>&nbsp;</div> Chargement... </div>";
 IriSP.arrowWidget_template = "<div class='Ldt-arrowWidget'></div>";
 IriSP.overlay_marker_template = "{{! the template for the small white bars which is z-indexed over our segment widget }}<div class='positionMarker' style='background-color: #F7268E;'></div>";
 IriSP.player_template = "{{! template for the radio player }}<div class='Ldt-controler demo'>	<div class='Ldt-LeftPlayerControls'>    <div class='Ldt-button Ldt-CtrlPlay'></div>		<div class='Ldt-button Ldt-CtrlAnnotate'></div>    <div class='Ldt-button Ldt-CtrlSearch'></div>	</div>		<div class='Ldt-RightPlayerControls'>    <div class='Ldt-Time'>      <div class='Ldt-ElapsedTime'></div>      <div class='Ldt-TimeSeparator'>/</div>      <div class='Ldt-TotalTime'></div>    </div>		<div class='Ldt-button Ldt-CtrlSound'></div>	</div></div>";
 return count;
 };
 // conversion de couleur Decimal vers HexaDecimal || 000 si fff
 IriSP.DEC_HEXA_COLOR = function (dec) {
-	 var hexa='0123456789ABCDEF',hex='';
+	 var hexa='0123456789ABCDEF';
+var hex='';
 	 var tmp;
 	 while (dec>15){
 		  tmp = dec-(Math.floor(dec/16))*16;
 		  hex = hexa.charAt(tmp)+hex;
 		  dec = Math.floor(dec/16);
 var begin = Math.round((+ annotation.begin) / 1000);
 var end = Math.round((+ annotation.end) / 1000);
 var duration = this._serializer.currentMedia().meta["dc:duration"] / 1000;
 var id = annotation.id;
-var startPourcent 	= IriSP.timeToPourcent(begin, duration) + onePxPercent;
+var startPourcent 	= IriSP.timeToPourcent(begin, duration);
-/* some sort of collapsing occurs, so we only have to substract one pixel to each box instead of
+/* surprisingly, the following code doesn't work on webkit - for some reason, most of the
-two
+boxes are 3 pixels wider.
 */
-var endPourcent 	= IriSP.timeToPourcent(end, duration) - startPourcent - onePxPercent * 1.5;
+if (IriSP.jQuery.browser.webkit) { console.log("webkit");
+var endPourcent 	= (IriSP.timeToPourcent(end, duration) - startPourcent - onePxPercent * 4.5).toFixed(1);
-/* on the other hand, we have to substract one pixel from the first box because it's the only
+}
-one to have to effective 1px margins */
+else
+var endPourcent 	= (IriSP.timeToPourcent(end, duration) - startPourcent - onePxPercent * 1.5).toFixed(1);
 if (i == 0) {
 endPourcent -= onePxPercent;
 }
 var color = annotation.content.color;
 else
 var color = annotation.color;
 var hexa_color = IriSP.DEC_HEXA_COLOR(color);
 if (hexa_color === "FFCC00")
 hexa_color = "333";
+if (hexa_color.length == 4)
+hexa_color = hexa_color + '00';
 var annotationTemplate = Mustache.to_html(IriSP.annotation_template,
 {"divTitle" : divTitle, "id" : id, "startPourcent" : startPourcent,
 "endPourcent" : endPourcent, "hexa_color" : hexa_color,
 "seekPlace" : Math.round(begin/1000)});
 this.selector.find(".tip").show();
 this._shown = true;
 };
 IriSP.TooltipWidget.prototype.hide = function() {
-console.log("hide");
 this.selector.find(".tip").hide();
 this._shown = false;
 };
 /* a widget that displays tweet - used in conjunction with the polemicWidget */

demo_player