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

refactor initTurtle, hiding and showing of canvas.

Browse Source
This commit is contained in:
Ralf Teusner
2016-08-12 14:41:20 +02:00
parent 269c592bb8
commit 728489c2fb
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,7 @@ $(function() {
var editor_for_file = new Map(); var editor_for_file = new Map();
var regex_for_language = new Map(); var regex_for_language = new Map();
var tracepositions_regex; var tracepositions_regex;
var resetTurtle = true;
var active_file = undefined; var active_file = undefined;
var active_frame = undefined; var active_frame = undefined;
@ -949,6 +950,11 @@ $(function() {
websocket.send(JSON.stringify({cmd: 'exit'})); websocket.send(JSON.stringify({cmd: 'exit'}));
websocket.flush(); websocket.flush();
websocket.close(); websocket.close();
if(turtlescreen != null){
resetTurtle = true;
}
hideSpinner(); hideSpinner();
running = false; running = false;
toggleButtonStates(); toggleButtonStates();
@ -1027,10 +1033,11 @@ $(function() {
// clear canvas // clear canvas
// turtlecanvas.getContext("2d").clearRect(0, 0, turtlecanvas.width, turtlecanvas.height); // turtlecanvas.getContext("2d").clearRect(0, 0, turtlecanvas.width, turtlecanvas.height);
if(resetTurtle) {
turtlescreen = new Turtle(websocket, turtlecanvas); turtlescreen = new Turtle(websocket, turtlecanvas);
if ($('#run').isPresent()) { showCanvas();
$('#run').bind('click', hideCanvas); resetTurtle = false;
} }
}; };
var initPrompt = function() { var initPrompt = function() {
@ -1058,10 +1065,12 @@ $(function() {
printWebsocketOutput(msg); printWebsocketOutput(msg);
break; break;
case 'turtle': case 'turtle':
initTurtle();
showCanvas(); showCanvas();
handleTurtleCommand(msg); handleTurtleCommand(msg);
break; break;
case 'turtlebatch': case 'turtlebatch':
initTurtle();
showCanvas(); showCanvas();
handleTurtlebatchCommand(msg); handleTurtlebatchCommand(msg);
break; break;

2
app/views/exercises/implement.html.slim
View File

@ -38,7 +38,7 @@
/ #output-col1.col-sm-12 / #output-col1.col-sm-12
#output-col1 #output-col1
// todo set to full width if turtle isnt used // todo set to full width if turtle isnt used
#prompt.input-group.hidden #prompt.input-group.hidden.col-lg-7.col-md-7.two-column
span.input-group-addon data-prompt=t('exercises.editor.input') = t('exercises.editor.input') span.input-group-addon data-prompt=t('exercises.editor.input') = t('exercises.editor.input')
input#prompt-input.form-control type='text' input#prompt-input.form-control type='text'
span.input-group-btn span.input-group-btn