Merge branch 'master' into statistics

2016-01-25 11:22:58 +01:00
parent a24e29345d 8edb70cddc
commit 2a1862f39a
7 changed files with 89 additions and 33 deletions
--- a/app/assets/javascripts/editor.js.erb
+++ b/app/assets/javascripts/editor.js.erb
@@ -423,9 +423,6 @@ $(function() {
      var file_id =  $(element).data('id');
      //setAnnotations(editor, file_id);

-      session.on('annotationRemoval', handleAnnotationRemoval);
-      session.on('annotationChange', handleAnnotationChange);
-
      /*
       * Register event handlers
       */