--- a/src/widgets/LatestAnnotation.js Tue Sep 01 15:24:26 2015 +0200
+++ b/src/widgets/LatestAnnotation.js Tue Sep 01 15:31:46 2015 +0200
@@ -16,31 +16,94 @@
* Set to a username if you only want to display annotations from a given user
*/
show_only_annotation_from_user: false,
+ /*
+ * Displays a button that copy currently displayed annotation into CreateAnnotation input field
+ */
+ copy_and_edit_button: false,
+ /*
+ * Allows clicks on an annotation from Annotations to display the annotation content into this widget
+ */
+ selectable_annotations: false,
empty_message: false,
starts_hidden: false,
+ show_header: false,
+ custom_header: false,
};
+IriSP.Widgets.LatestAnnotation.prototype.messages = {
+ fr : {
+ copy_and_edit: "Copier et Editer",
+ empty : "Aucune annotation à afficher",
+ header: "Dernière annotation"
+ },
+ en: {
+ copy_and_edit: "Copy and Edit",
+ empty: "No annotation to display",
+ header: "Last annotation"
+ }
+}
+
IriSP.Widgets.LatestAnnotation.prototype.template =
- "<div class='Ldt-LatestAnnotation'>"
+ "{{#show_header}}"
+ + "<p class='Ldt-LatestAnnotation-header'>"
+ + "{{#custom_header}}{{custom_header}}{{/custom_header}}"
+ + "{{^custom_header}}{{l10n.header}}{{/custom_header}}"
+ + "</p>"
+ + "{{/show_header}}"
+ + "<div class='Ldt-LatestAnnotation'>"
+ "</div>";
IriSP.Widgets.LatestAnnotation.prototype.annotationTemplate =
"<div class='Ldt-LatestAnnotation-Box'>"
- + " <div class='Ldt-LatestAnnotation-Element Ldt-LatestAnnotation-CreationDate'>{{{annotation_created}}}</div>"
- + " <div class='Ldt-LatestAnnotation-Element Ldt-LatestAnnotation-Title'>{{{annotation_creator}}}{{#annotation_title}}: {{{annotation_title}}}{{/annotation_title}}</div>"
- + " <div class='Ldt-LatestAnnotation-Element Ldt-LatestAnnotation-Content'>"
+ + "<div class='Ldt-LatestAnnotation-Element Ldt-LatestAnnotation-CreationDate'>{{{annotation_created}}}</div>"
+ + "<div class='Ldt-LatestAnnotation-Element Ldt-LatestAnnotation-Title'>{{{annotation_creator}}}{{#annotation_title}}: {{{annotation_title}}}{{/annotation_title}}</div>"
+ + "<div class='Ldt-LatestAnnotation-Element Ldt-LatestAnnotation-Content'>"
+ "{{{annotation_content}}}"
- + " </div>"
+ + "</div>"
+ + "{{#copy_and_edit_button}}<div class='Ldt-LatestAnnotation-CopyEditButton'>{{button_text}}</div>{{/copy_and_edit_button}}"
+ "</div>"
+
IriSP.Widgets.LatestAnnotation.prototype.draw = function(){
var _this = this;
-
this.renderTemplate();
this.annotationContainer_$ = this.$.find('.Ldt-LatestAnnotation');
- this.onMediaEvent("timeupdate", "refresh");
+ if (this.selectable_annotations){
+ this.onMdpEvent("AnnotationsList.refresh", function(){
+ _this.getWidgetAnnotations().forEach(function(_annotation){
+ _annotation.off("click");
+ _annotation.on("click", function(){
+ _html = Mustache.to_html(_this.annotationTemplate, {
+ annotation_created: _annotation.created.toLocaleDateString()+", "+_annotation.created.toLocaleTimeString(),
+ annotation_creator: _annotation.creator,
+ annotation_title: _annotation.title,
+ annotation_content: _annotation.description,
+ copy_and_edit_button: _this.copy_and_edit_button,
+ button_text: _this.l10n.copy_and_edit,
+ });
+ _this.annotationContainer_$.html(_html);
+ _this.selectedAnnotation = true;
+ });
+ });
+ });
+
+ this.segments = _this.source.getAnnotationsByTypeTitle(this.segments_annotation_type)
+ this.segments.forEach(function(_segment){
+ _segment.on("click", function(){
+ _this.selectedAnnotation = false;
+ })
+ })
+ this.currentSegment = false;
+ }
+
+ this.onMediaEvent("timeupdate", function(){
+ _this.refresh();
+ });
+ this.onMediaEvent("settimerange", function(_timeRange){
+ _this.refresh(_timeRange);
+ })
if (this.starts_hidden){
this.visible = true;
@@ -51,40 +114,59 @@
this.show();
}
+ this.selectedAnnotation = false; // This flag tells the widget if it must display last annotation (false) or clicked annotation (true)
+ this.player.trigger("AnnotationsList.refresh");
this.refresh();
}
-IriSP.Widgets.LatestAnnotation.prototype.messages = {
- fr : {
- empty : "Aucune annotation à afficher"
- },
- en: {
- empty: "No annotation to display"
- }
-}
-IriSP.Widgets.LatestAnnotation.prototype.refresh = function(){
- var _currentTime = this.media.getCurrentTime()
- var _segmentsAnnotations = this.source.getAnnotationsByTypeTitle(this.segments_annotation_type)
- var _currentSegments = _segmentsAnnotations.filter(function(_segment){
- return (_currentTime >= _segment.begin && _currentTime <= _segment.end)
- });
+IriSP.Widgets.LatestAnnotation.prototype.refresh = function(_timeRange){
+ _timeRange = typeof _timeRange !== 'undefined' ? _timeRange : false ;
+ var _this = this;
if (this.hide_without_segment){
- if (_currentSegments.length == 0){
+ if (!_timeRange && !this.media.getTimeRange()){
+ var _currentTime = this.media.getCurrentTime();
+ var _currentSegments = this.segments.filter(function(_segment){
+ return (_currentTime >= _segment.begin && _currentTime <= _segment.end)
+ });
+ if (_currentSegments.length == 0){
+ this.currentSegment = false;
+ this.selectedAnnotation = false;
+ }
+ else {
+ this.currentSegment = _currentSegments[0]
+ }
+ }
+ else {
+ var _segmentBegin = _timeRange? _timeRange[0] : this.media.getTimeRange()[0],
+ _segmentEnd = _timeRange? _timeRange[1] : this.media.getTimeRange()[1];
+ if ((!this.currentSegment)||(this.currentSegment.begin != _segmentBegin || this.currentSegment.end != _segmentEnd)) {
+ var _currentSegments = this.segments.filter(function(_segment){
+ return _segment.begin == _segmentBegin && _segment.end == _segmentEnd
+ });
+ if (_currentSegments.length > 0){
+ this.selectedAnnotation = false;
+ this.currentSegment = _currentSegments[0];
+ }
+ }
+ }
+ if (!this.currentSegment){
if (this.visible){
- this.hide()
+ this.hide();
}
}
else {
if (!this.visible){
- this.show()
+ this.show();
}
}
}
- if (this.visible){
+
+ if (this.visible && !this.selectedAnnotation){
var _list = this.getWidgetAnnotations();
+
if(this.filter_by_segment){
- if (_currentSegments.length == 0) {
+ if (!this.currentSegment) {
_list = _list.filter(function(_annotation){
return false;
});
@@ -92,40 +174,56 @@
else {
_list = _list.filter(function(_annotation){
_annotationTime = (_annotation.begin+_annotation.end)/2;
- return (_currentSegments[0].begin <= _annotationTime && _currentSegments[0].end >= _annotationTime);
+ return (_this.currentSegment.begin <= _annotationTime && _this.currentSegment.end >= _annotationTime);
});
}
- _list.sortBy(function(_annotation){
- return _annotation.created;
+ }
+ _list = _list.sortBy(function(_annotation){
+ return _annotation.created;
+ });
+
+ var _latestAnnotation = false;
+ var _html="";
+ if (_list.length != 0){
+ _latestAnnotation = _list.pop();
+ _html = Mustache.to_html(this.annotationTemplate, {
+ annotation_created: _latestAnnotation.created.toLocaleDateString()+", "+_latestAnnotation.created.toLocaleTimeString(),
+ annotation_creator: _latestAnnotation.creator,
+ annotation_title: _latestAnnotation.title,
+ annotation_content: _latestAnnotation.description,
+ copy_and_edit_button: this.copy_and_edit_button,
+ button_text: this.l10n.copy_and_edit,
});
-
- var _latestAnnotation = false;
- var _html="";
- if (_list.length != 0){
- _latestAnnotation = _list.pop();
- _html = Mustache.to_html(this.annotationTemplate, {
- annotation_created: _latestAnnotation.created.toLocaleDateString()+", "+_latestAnnotation.created.toLocaleTimeString(),
- annotation_creator: _latestAnnotation.creator,
- annotation_title: _latestAnnotation.title,
- annotation_content: _latestAnnotation.description,
- });
+ }
+ else {
+ var _empty_message = this.l10n.empty
+ if (this.empty_message) {
+ _empty_message = this.empty_message
}
- else {
- var _empty_message = this.l10n.empty
- if (this.empty_message) {
- _empty_message = this.empty_message
- }
- _html = "<div class='Ldt-LatestAnnotation-Element Ldt-LatestAnnotation-NoAnnotation'>"+_empty_message+"</div>";
- }
- this.annotationContainer_$.html(_html);
-
+ _html = "<div class='Ldt-LatestAnnotation-Element Ldt-LatestAnnotation-NoAnnotation'>"+_empty_message+"</div>";
}
+ this.annotationContainer_$.html(_html);
}
+
+ if(this.copy_and_edit_button){
+ this.copyAndEditButton_$ = this.$.find('.Ldt-LatestAnnotation-CopyEditButton');
+ this.copyAndEditButton_$.click(this.functionWrapper("copy_and_edit"));
+ }
+}
+
+IriSP.Widgets.LatestAnnotation.prototype.copy_and_edit = function(){
+ this.player.trigger("CreateAnnotation.show");
+ this.player.trigger("AnnotationsList.hide");
+ annotationText = $('.Ldt-LatestAnnotation-Content').get(0).innerHTML;
+
+ $('.Ldt-CreateAnnotation-Description').removeClass('empty');
+ $('.Ldt-CreateAnnotation-Description').val(annotationText);
}
IriSP.Widgets.LatestAnnotation.prototype.hide = function() {
if (this.visible){
this.visible = false;
+ this.$.find('.Ldt-LatestAnnotation-header').hide();
this.annotationContainer_$.hide()
}
}
@@ -133,6 +231,7 @@
IriSP.Widgets.LatestAnnotation.prototype.show = function() {
if(!this.visible){
this.visible = true;
+ this.$.find('.Ldt-LatestAnnotation-header').show();
this.annotationContainer_$.show()
}
}