# HG changeset patch # User veltr # Date 1374591993 -7200 # Node ID 639129cf95bcc48ba7823c0180a8602e2c7cf08e # Parent 40a9ce0779d548a235a29fe02b631f03a6cb060a Corrections on Jwplayer diff -r 40a9ce0779d5 -r 639129cf95bc src/widgets/Annotation.css --- a/src/widgets/Annotation.css Fri Jul 19 17:21:13 2013 +0200 +++ b/src/widgets/Annotation.css Tue Jul 23 17:06:33 2013 +0200 @@ -59,6 +59,7 @@ .Ldt-Annotation-Title, .Ldt-Annotation-MashupMedia { color: #0068c4; + text-decoration: none; } .Ldt-Annotation-Type { diff -r 40a9ce0779d5 -r 639129cf95bc src/widgets/Annotation.js --- a/src/widgets/Annotation.js Fri Jul 19 17:21:13 2013 +0200 +++ b/src/widgets/Annotation.js Tue Jul 23 17:06:33 2013 +0200 @@ -34,7 +34,7 @@ + '
' + '
' + '{{#show_social}}
{{/show_social}}' - + '

{{#show_annotation_type}} » {{/show_annotation_type}} ' + + '

{{#show_annotation_type}} » {{/show_annotation_type}} ' + '( - )

' + '

{{l10n.excerpt_from}} ' + '( - )

' @@ -148,6 +148,13 @@ this.renderTemplate(); + this.$.find(".Ldt-Annotation-Title").click(function() { + if (currentAnnotation) { + _this.media.setCurrentTime(currentAnnotation.begin); + } + return false; + }); + if (this.show_social) { this.insertSubwidget(this.$.find(".Ldt-Annotation-Social"), { type: "Social" }, "socialWidget"); } diff -r 40a9ce0779d5 -r 639129cf95bc src/widgets/JwpPlayer.js --- a/src/widgets/JwpPlayer.js Fri Jul 19 17:21:13 2013 +0200 +++ b/src/widgets/JwpPlayer.js Tue Jul 23 17:06:33 2013 +0200 @@ -33,6 +33,10 @@ //_pauseState = false; //this.media.trigger("play"); } + + if (this.url_transform) { + _opts.file = this.url_transform(_opts.file); + } // Binding functions to jwplayer diff -r 40a9ce0779d5 -r 639129cf95bc test/spel.htm --- a/test/spel.htm Fri Jul 19 17:21:13 2013 +0200 +++ b/test/spel.htm Tue Jul 23 17:06:33 2013 +0200 @@ -12,9 +12,11 @@ -

Tests Spectacle en ligne(s)

-
-
+
+

Tests Spectacle en ligne(s)

+
+
+