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

Show line breaks in score run and HTML tags in output

Browse Source
This commit is contained in:
Sebastian Serth
2021-02-06 13:34:11 +01:00
parent 5798f972f4
commit 4c7b5a5d23
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -370,7 +370,8 @@ var CodeOceanEditor = {
}, },
initializeRegexes: function () { initializeRegexes: function () {
this.regex_for_language.set("ace/mode/python", /File "(.+?)", line (\d+)/g); // These RegEx are run on the HTML escaped output!
this.regex_for_language.set("ace/mode/python", /File "(.+?)", line (\d+)/g);
this.regex_for_language.set("ace/mode/java", /(.*\.java):(\d+):/g); this.regex_for_language.set("ace/mode/java", /(.*\.java):(\d+):/g);
}, },
@ -467,7 +468,7 @@ var CodeOceanEditor = {
let errorMessagesToShow = []; let errorMessagesToShow = [];
result.error_messages.forEach(function (item) { result.error_messages.forEach(function (item) {
if (item) { if (item) {
errorMessagesToShow.push(item.replace(/\n/g, '<br>')) errorMessagesToShow.push(item)
} }
}) })
@ -605,7 +606,8 @@ var CodeOceanEditor = {
if (this.tracepositions_regex) { if (this.tracepositions_regex) {
$('#output>pre').each($.proxy(function(index, element) { $('#output>pre').each($.proxy(function(index, element) {
element = $(element) element = $(element)
const text = element.text(); debugger;
const text = _.escape(element.text());
element.on("click", "a", this.jumpToSourceLine.bind(this)); element.on("click", "a", this.jumpToSourceLine.bind(this));
let matches; let matches;

2
app/assets/stylesheets/editor.css.scss
View File

@ -155,11 +155,13 @@ button i.fa-spin {
.error_messages_list { .error_messages_list {
list-style-type: disc; list-style-type: disc;
padding-inline-start: 1.25rem; padding-inline-start: 1.25rem;
white-space: pre-wrap;
} }
.single_error_message { .single_error_message {
list-style-type: none; list-style-type: none;
padding-inline-start: 0; padding-inline-start: 0;
white-space: pre-wrap;
} }
.enforce-top-margin { .enforce-top-margin {