htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexander Kastius
2016-09-01 11:52:05 +02:00
parent 378472f4ed 7903447a31
commit 7eea48e705
3 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/editor/editor.js.erb
View File

@ -35,7 +35,7 @@ var CodeOceanEditor = {
lastCopyText: null, lastCopyText: null,
autosaveTimer: null, autosaveTimer: null,
autosaveLabel: $("#autosave-label span"), autosaveLabel: "#autosave-label span",
ENTER_KEY_CODE: 13, ENTER_KEY_CODE: 13,
@ -189,9 +189,10 @@ var CodeOceanEditor = {
autosave: function () { autosave: function () {
var date = new Date(); var date = new Date();
this.autosaveLabel.parent().css("visibility", "visible"); var autosaveLabel = $(this.autosaveLabel);
this.autosaveLabel.text(date.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds()); autosaveLabel.parent().css("visibility", "visible");
this.autosaveLabel.text(date.toLocaleTimeString()); autosaveLabel.text(date.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds());
autosaveLabel.text(date.toLocaleTimeString());
this.autosaveTimer = null; this.autosaveTimer = null;
this.createSubmission($('#autosave'), null); this.createSubmission($('#autosave'), null);
}, },

6
app/assets/javascripts/editor/evaluation.js.erb
View File

@ -138,13 +138,13 @@ CodeOceanEditorEvaluation = {
}, },
killWebsocketAndContainer: function () { killWebsocketAndContainer: function () {
if (this.websocket.readyState != WebSocket.OPEN) { if (this.websocket.getReadyState() != WebSocket.OPEN) {
return; return;
} }
this.websocket.send(JSON.stringify({cmd: 'exit'})); this.websocket.send(JSON.stringify({cmd: 'exit'}));
this.websocket.flush(); this.websocket.killWebSocket();
this.websocket.close();
this.hideSpinner(); this.hideSpinner();
this.running = false; this.running = false;
this.toggleButtonStates(); this.toggleButtonStates();

15
app/assets/javascripts/editor/websocket.js.erb
View File

@ -88,3 +88,18 @@ CommandSocket.prototype.executeCommand = function(cmd) {
CommandSocket.prototype.send = function(data) { CommandSocket.prototype.send = function(data) {
this.websocket.send(data); this.websocket.send(data);
}; };
/**
* Returns the ready state of the socket.
*/
CommandSocket.prototype.getReadyState = function() {
return this.websocket.readyState;
};
/**
* Closes the websocket.
*/
CommandSocket.prototype.killWebSocket = function() {
this.websocket.flush();
this.websocket.close();
};