--- a/server/src/remie/static/remie/metadataplayer/AnnotationsController.js	Wed Jul 22 16:31:08 2015 +0200
+++ b/server/src/remie/static/remie/metadataplayer/AnnotationsController.js	Wed Jul 22 16:33:38 2015 +0200
@@ -15,7 +15,7 @@
     display_or_write: false,
     starts_hidden: false,
     hide_without_segment: false,
-    segments_annotation_type: "chap"
+    segments_annotation_type: "chap",
 };
 
 IriSP.Widgets.AnnotationsController.prototype.template = 
@@ -80,15 +80,15 @@
         if (_currentSegments.length == 0){
             if (this.visible){
                 this.hide();
-                _this.player.trigger("CreateAnnotation.hide");
-                _this.player.trigger("AnnotationsList.hide");
+                this.player.trigger("CreateAnnotation.hide");
+                this.player.trigger("AnnotationsList.hide");
             }
         }
         else {
             if (!this.visible){
                 this.show();
-                _this.player.trigger("CreateAnnotation.hide");
-                _this.player.trigger("AnnotationsList.hide");
+                this.player.trigger("CreateAnnotation.hide");
+                this.player.trigger("AnnotationsList.hide");
             }
         }
     }

--- a/server/src/remie/static/remie/metadataplayer/CreateAnnotation.js	Wed Jul 22 16:31:08 2015 +0200
+++ b/server/src/remie/static/remie/metadataplayer/CreateAnnotation.js	Wed Jul 22 16:33:38 2015 +0200
@@ -51,7 +51,8 @@
     project_id: "",
     after_send_timeout: 0,
     close_after_send: false,
-    tag_prefix: "#"
+    tag_prefix: "#",
+    pause_when_displaying: false,
 };
 
 IriSP.Widgets.CreateAnnotation.prototype.messages = {
@@ -270,6 +271,9 @@
 IriSP.Widgets.CreateAnnotation.prototype.show = function() {
     if (!this.visible){
         this.visible = true;
+        if (this.pause_when_displaying){
+            this.media.pause();
+        }
         this.showScreen('Main');
         this.$.find(".Ldt-CreateAnnotation-Description").val("").css("border-color", "#666666").addClass("empty");
         if (this.show_title_field) {

--- a/server/src/remie/static/remie/metadataplayer/LatestAnnotation.js	Wed Jul 22 16:31:08 2015 +0200
+++ b/server/src/remie/static/remie/metadataplayer/LatestAnnotation.js	Wed Jul 22 16:33:38 2015 +0200
@@ -173,18 +173,20 @@
     
     if(this.copy_and_edit_button){
         this.copyAndEditButton_$ = this.$.find('.Ldt-LatestAnnotation-CopyEditButton');
-        this.copyAndEditButton_$.click(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);
-        });
+        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;