diff --git a/app/assets/javascripts/editor/editor.js.erb b/app/assets/javascripts/editor/editor.js.erb index 34fbe19f..3d89bada 100644 --- a/app/assets/javascripts/editor/editor.js.erb +++ b/app/assets/javascripts/editor/editor.js.erb @@ -33,7 +33,7 @@ var CodeOceanEditor = { runmode: this.NONE, numMessages: 0, - prompt: $('#prompt'), + prompt: '#prompt', lastCopyText: null, autosaveTimer: null, diff --git a/app/assets/javascripts/editor/evaluation.js.erb b/app/assets/javascripts/editor/evaluation.js.erb index 2235e137..b4099811 100644 --- a/app/assets/javascripts/editor/evaluation.js.erb +++ b/app/assets/javascripts/editor/evaluation.js.erb @@ -154,16 +154,18 @@ CodeOceanEditorEvaluation = { //TODO: Move Prompt Part in own component showPrompt: function(msg) { var label = $('#prompt .input-group-addon'); + var prompt = $(this.prompt) label.text(msg.data || label.data('prompt')); - if (this.prompt.isPresent() && this.prompt.hasClass('hidden')) { - this.prompt.removeClass('hidden'); + if (prompt.isPresent() && prompt.hasClass('hidden')) { + prompt.removeClass('hidden'); } $('#prompt input').focus(); }, hidePrompt: function() { - if (this.prompt.isPresent() && !this.prompt.hasClass('hidden')) { - this.prompt.addClass('hidden'); + var prompt = $(this.prompt) + if (prompt.isPresent() && !prompt.hasClass('hidden')) { + prompt.addClass('hidden'); } }, diff --git a/app/views/exercises/_editor_output.html.slim b/app/views/exercises/_editor_output.html.slim index d7deabd8..f2f5b4af 100644 --- a/app/views/exercises/_editor_output.html.slim +++ b/app/views/exercises/_editor_output.html.slim @@ -4,13 +4,16 @@ div id='output_sidebar_uncollapsed' class='hidden col-sm-12' data-message-no-out .row = render('editor_button', classes: 'btn-block btn-primary btn-sm', icon: 'fa fa-minus-square', id: 'toggle-sidebar-output', label: t('exercises.editor.collapse_sidebar')) hr + div + #turtlediv + canvas#turtlecanvas.hidden width=400 height=400 style='border-style:solid;border-width:thin' + hr div #hint .panel.panel-warning .panel-heading = t('exercises.implement.hint') .panel-body div - // todo set to full width if turtle isnt used #prompt.input-group.hidden span.input-group-addon data-prompt=t('exercises.editor.input') = t('exercises.editor.input') input#prompt-input.form-control type='text' @@ -21,9 +24,4 @@ div id='output_sidebar_uncollapsed' class='hidden col-sm-12' data-message-no-out - if CodeOcean::Config.new(:code_ocean).read[:flowr][:enabled] #flowrHint.panel.panel-info data-url=CodeOcean::Config.new(:code_ocean).read[:flowr][:url] role='tab' .panel-heading = 'Gain more insights here' - .panel-body - hr - div - #turtlediv - // todo what should the canvas default size be? - canvas#turtlecanvas.hidden width=400 height=400 style='border-style:solid;border-width:thin' \ No newline at end of file + .panel-body \ No newline at end of file