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

Remove @all_containers instead of @containers during cleanup

Browse Source 
Also added some comments and todos
Also fixed debug messages in remove_from_all_containers
Also refactored duplicated code with extracted function
Also removed some commented lines of code
This commit is contained in:
Tom Staubitz
2015-12-12 00:41:26 +08:00
parent e335759644
commit 943d5554d9
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -168,7 +168,8 @@ $(function() {
}
}
}
setAnnotations(editors[i], $(editors[i].container).data('id'));
// setAnnotations(editors[i], $(editors[i].container).data('id'));
console.log('location: #{Time.now}' + window.location.port);
}
// toggle button states (it might be the case that the request for comments button has to be enabled
toggleButtonStates();
@@ -419,7 +420,7 @@ $(function() {
session.setUseWrapMode(true);
var file_id = $(element).data('id');
setAnnotations(editor, file_id);
//setAnnotations(editor, file_id);
session.on('annotationRemoval', handleAnnotationRemoval);
session.on('annotationChange', handleAnnotationChange);
@@ -1118,7 +1119,9 @@ $(function() {
};
var initWebsocketConnection = function(url) {
websocket = new WebSocket('wss://' + window.location.hostname + ':' + window.location.port + url);
//TODO: get the protocol from config file dependent on environment. (dev: ws, prod: wss)
//causes: Puma::HttpParserError: Invalid HTTP format, parsing fails.
websocket = new WebSocket('ws://' + window.location.hostname + ':' + window.location.port + url);
websocket.onopen = function(evt) { resetOutputTab(); }; // todo show some kind of indicator for established connection
websocket.onclose = function(evt) { /* expected at some point */ };
websocket.onmessage = function(evt) { parseCanvasMessage(evt.data, true); };