--- a/web/LdtPlayer-release.js Fri Dec 16 17:52:30 2011 +0100
+++ b/web/LdtPlayer-release.js Fri Dec 16 17:53:27 2011 +0100
@@ -8670,11 +8670,11 @@
};
-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.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.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'> </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'></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>";
IriSP.search_template = "{{! template for the search container }}<div class='LdtSearchContainer' style='margin-left: {{margin_left}}; position: absolute; margin-top: -60px;'> <div class='LdtSearch' style='display: none; background-color: #EEE; width: 165px; boder: 1px; border-color: #CFCFCF; position: absolute; text-align: center;'> <input class='LdtSearchInput' style='margin-top: 2px; margin-bottom: 2px;' /> </div></div><div class='cleaner'></div>";
IriSP.share_template = "{{! social network sharing template }}<a onclick='__IriSP.MyApiPlayer.share(\'delicious\');' title='partager avec delicious'><span class='share shareDelicious'> </span></a> <a onclick='__IriSP.MyApiPlayer.share(\'facebook\');' title='partager avec facebook'> <span class='share shareFacebook'> </span></a><a onclick='__IriSP.MyApiPlayer.share(\'twitter\');' title='partager avec twitter'> <span class='share shareTwitter'> </span></a><a onclick='__IriSP.MyApiPlayer.share(\'myspace\');' title='partager avec Myspace'> <span class='share shareMySpace'> </span></a>";
@@ -10491,7 +10491,7 @@
endPourcent -= onePxPercent;
}
- var divTitle = annotation.content.title.substr(0,55);
+ var divTitle = (annotation.content.title + " - " + annotation.content.description).substr(0,55);
if (typeof(annotation.content.color) !== "undefined")
var color = annotation.content.color;
@@ -10499,7 +10499,7 @@
var color = annotation.color;
var hexa_color = IriSP.DEC_HEXA_COLOR(color);
- console.log(hexa_color);
+
if (hexa_color === "FFCC00")
hexa_color = "333";
@@ -10530,7 +10530,7 @@
var offset_x = offset.left + correction - 106;
if (offset_x < 0)
offset_x = 0;
-
+
self.TooltipWidget.show(divTitle, color, offset_x, event.pageY - 160);
} })(divTitle)).mouseout(function(){
IriSP.jQuery(this).animate({opacity: 0.3}, 5);
@@ -10545,7 +10545,7 @@
/* restores the view after a search */
IriSP.SegmentsWidget.prototype.clear = function() {
- //this.selector.children(".Ldt-iri-chapter").css('border','none').animate({opacity:0.3}, 100);
+ this.selector.children(".Ldt-iri-chapter").css('border','none').animate({opacity:0.3}, 100);
};
IriSP.SegmentsWidget.prototype.clickHandler = function(annotation) {
@@ -10757,6 +10757,7 @@
/* this widget displays a small tooltip */
IriSP.TooltipWidget = function(Popcorn, config, Serializer) {
IriSP.Widget.call(this, Popcorn, config, Serializer);
+ this._shown = false;
};
@@ -10775,17 +10776,21 @@
};
IriSP.TooltipWidget.prototype.show = function(text, color, x, y) {
- if (this.selector.find(".tiptext").text() == text)
+ if (this._shown === true || this.selector.find(".tiptext").text() == text)
return;
this.selector.find(".tipcolor").css("background-color", color);
this.selector.find(".tiptext").text(text);
this.selector.find(".tip").css("left", x).css("top", y);
+
+ this._shown = true;
};
IriSP.TooltipWidget.prototype.hide = function() {
this.clear();
this.selector.find(".tip").css("left", -10000).css("top", -100000);
+
+ this._shown = false;
};
/* a widget that displays tweet - used in conjunction with the polemicWidget */