summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleš Smodiš <aless@guru.si>2015-09-16 13:18:49 +0200
committerAleš Smodiš <aless@guru.si>2015-09-16 13:18:49 +0200
commitc2b7956557835b1a232a84bdb262a700924a1538 (patch)
treebfbbe6034bf0232cdd746b86c072800c9db89efa
parentd10866be04d45fc73eddce0ec7005161e69e97a2 (diff)
Bugfix: console must not collapse spaces.
-rw-r--r--css/codeq/console.css11
-rw-r--r--js/codeq/console.js2
-rw-r--r--js/prolog.js6
3 files changed, 15 insertions, 4 deletions
diff --git a/css/codeq/console.css b/css/codeq/console.css
index 7d1f6ae..5f721b7 100644
--- a/css/codeq/console.css
+++ b/css/codeq/console.css
@@ -4,6 +4,17 @@
font-size: medium;
word-break: break-all;
}
+.cq-con-line {
+ white-space: pre-wrap;
+ background-color: transparent;
+ border: none;
+ color: inherit;
+ font-family: inherit;
+ font-size: inherit;
+ line-height: inherit;
+ margin: 0;
+ padding: 0;
+}
.cq-con-text {
}
diff --git a/js/codeq/console.js b/js/codeq/console.js
index 90b66cd..99c1550 100644
--- a/js/codeq/console.js
+++ b/js/codeq/console.js
@@ -176,7 +176,7 @@
jq1, jq2, jqCursor;
if (!jqLine) {
- jqLine = $('<div class="' + lineDescriptor.className + '"></div>');
+ jqLine = $('<pre class="cq-con-line ' + lineDescriptor.className + '"></pre>');
if (lineDescriptor.row == 0) {
jqContent.prepend(jqLine);
}
diff --git a/js/prolog.js b/js/prolog.js
index ebce9bf..2868830 100644
--- a/js/prolog.js
+++ b/js/prolog.js
@@ -19,12 +19,12 @@
promptMode = !t.have_more;
}
else {
- terminal.error(data.message, 'error');
+ terminal.append(data.message, 'error');
promptMode = true;
}
if (promptMode) {
terminal.setLineBuffered();
- terminal.append('\n?- ', 'output');
+ terminal.append('.\n?- ', 'output');
}
},
tcf = function terminalCommandFailed (error) {
@@ -59,7 +59,7 @@
}, problem_id).then(tcs, tcf);
}
else {
- terminal.append('\n');
+ terminal.append('\n', 'input');
if (command == ';') {
// show next answer
return codeq.comms.sendQuery({