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

2016-09-01 11:52:05 +02:00
parent 378472f4ed 7903447a31
commit 7eea48e705
3 changed files with 23 additions and 7 deletions
--- a/app/assets/javascripts/editor/evaluation.js.erb
+++ b/app/assets/javascripts/editor/evaluation.js.erb
@@ -138,13 +138,13 @@ CodeOceanEditorEvaluation = {
  },

  killWebsocketAndContainer: function () {
-    if (this.websocket.readyState != WebSocket.OPEN) {
+    if (this.websocket.getReadyState() != WebSocket.OPEN) {
      return;
    }

    this.websocket.send(JSON.stringify({cmd: 'exit'}));
-    this.websocket.flush();
-    this.websocket.close();
+    this.websocket.killWebSocket();
+    
    this.hideSpinner();
    this.running = false;
    this.toggleButtonStates();