From 18daa1c998bcc182f1006faa415e70a27e9efa8c Mon Sep 17 00:00:00 2001 From: Sebastian Serth Date: Wed, 2 Mar 2022 11:44:48 +0100 Subject: [PATCH] Enable image preview in STDOUT --- app/assets/javascripts/editor/evaluation.js | 21 +++++++++++++-------- lib/runner/connection/buffer.rb | 2 +- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/editor/evaluation.js b/app/assets/javascripts/editor/evaluation.js index d3f8ed14..c5723f12 100644 --- a/app/assets/javascripts/editor/evaluation.js +++ b/app/assets/javascripts/editor/evaluation.js @@ -199,26 +199,31 @@ CodeOceanEditorEvaluation = { return; } + if (output.stdout !== undefined && !output.stdout.startsWith(" tags if (!colorize) { if (output.stdout !== undefined && output.stdout !== '') { - //element.append(output.stdout) - element.text(element.text() + output.stdout) + + element.append(output.stdout) + //element.text(element.text() + output.stdout) } if (output.stderr !== undefined && output.stderr !== '') { - //element.append('StdErr: ' + output.stderr); - element.text('StdErr: ' + element.text() + output.stderr); + element.append('StdErr: ' + output.stderr); + //element.text('StdErr: ' + element.text() + output.stderr); } } else if (output.stderr) { - //element.addClass('text-warning').append(output.stderr); - element.addClass('text-warning').text(element.text() + output.stderr); + element.addClass('text-warning').append(output.stderr); + //element.addClass('text-warning').text(element.text() + output.stderr); this.QaApiOutputBuffer.stderr += output.stderr; } else if (output.stdout) { - //element.addClass('text-success').append(output.stdout); - element.addClass('text-success').text(element.text() + output.stdout); + element.addClass('text-success').append(output.stdout); + //element.addClass('text-success').text(element.text() + output.stdout); this.QaApiOutputBuffer.stdout += output.stdout; } else { element.addClass('text-muted').text($('#output').data('message-no-output')); diff --git a/lib/runner/connection/buffer.rb b/lib/runner/connection/buffer.rb index 7a1b3af5..b3421df8 100644 --- a/lib/runner/connection/buffer.rb +++ b/lib/runner/connection/buffer.rb @@ -84,7 +84,7 @@ class Runner::Connection::Buffer # Second, if we have the beginning of a valid command but an invalid JSON return true if invalid_json && message.start_with?(/\s*{"cmd/) # Third, buffer the message if it contains long messages (e.g., an image or turtle batch commands) - return true if invalid_json && (message.include?('