Merge branch 'editor-js-refactor' into editor-frontend-refactor

app/assets/javascripts/editor.js.erb

@@ -4,13 +4,15 @@ $(function() {
   //TODO Change this. Otherwise it will fuck people up,
   //because it's really confusing if the variables and the code are
   //split over 6 files.
-  $.extend(CodeOceanEditor,
+  $.extend(
+      CodeOceanEditor,
       CodeOceanEditorAJAX,
       CodeOceanEditorEvaluation,
       CodeOceanEditorFlowr,
       CodeOceanEditorSubmissions,
       CodeOceanEditorTurtle,
-      CodeOceanEditorWebsocket);
+      CodeOceanEditorWebsocket
+  );
 
   if ($('#editor').isPresent() && CodeOceanEditor) {
     if (CodeOceanEditor.isBrowserSupported()) {

app/assets/javascripts/editor/editor.js.erb

@@ -203,7 +203,7 @@ var CodeOceanEditor = {
       if (this.qa_api) {
         editor.getSession().on("change", function (deltaObject) {
           this.qa_api.executeCommand('syncEditor', [this.active_file, deltaObject]);
-        });
+        }.bind(this));
       }
 
       var document = editor.getSession().getDocument();