Skip to content
This repository was archived by the owner on Jun 7, 2023. It is now read-only.

Commit 42410df

Browse files
committed
Use textarea instead of pre as the main container for activecode
1 parent c481874 commit 42410df

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

runestone/activecode/activecode.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ def setup(app):
5454

5555

5656
TEMPLATE = """
57-
<pre data-component="activecode" id=%(divid)s data-lang="%(language)s" %(autorun)s %(hidecode)s %(include)s %(timelimit)s %(coach)s %(codelens)s data-audio='%(ctext)s' %(sourcefile)s %(datafile)s %(stdin)s %(gradebutton)s %(caption)s>
57+
<textarea data-component="activecode" id=%(divid)s data-lang="%(language)s" %(autorun)s %(hidecode)s %(include)s %(timelimit)s %(coach)s %(codelens)s data-audio='%(ctext)s' %(sourcefile)s %(datafile)s %(stdin)s %(gradebutton)s %(caption)s>
5858
%(initialcode)s
59-
</pre>
59+
</textarea>
6060
"""
6161

6262
class ActivcodeNode(nodes.General, nodes.Element):

runestone/activecode/js/activecode.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1468,7 +1468,7 @@ ACFactory.createActiveCode = function (orig, lang) {
14681468
ACFactory.addActiveCodeToDiv = function(outerdiv, acdiv, sid, initialcode, language) {
14691469
var thepre, newac;
14701470
$("#"+acdiv).empty();
1471-
thepre = document.createElement("pre");
1471+
thepre = document.createElement("textarea");
14721472
thepre['data-component'] = "activecode";
14731473
thepre.id = acdiv;
14741474
$(thepre).data('lang', language);
@@ -1497,7 +1497,7 @@ ACFactory.createScratchActivecode = function() {
14971497
divid = divid.slice(-2).join("");
14981498
}
14991499
divid = divid.split('?')[0]; // remove any query string (e.g ?lastPosition)
1500-
divid = divid.replaceAll('/', '').replace('.html', '');
1500+
divid = divid.replaceAll('/', '').replace('.html', '').replace(':', '');
15011501
eBookConfig.scratchDiv = divid;
15021502
// generate the HTML
15031503
var html = '<div id="ac_modal_' + divid + '" class="modal fade">' +
@@ -1508,11 +1508,11 @@ ACFactory.createScratchActivecode = function() {
15081508
' <h4 class="modal-title">Scratch ActiveCode</h4>' +
15091509
' </div> ' +
15101510
' <div class="modal-body">' +
1511-
' <pre data-component="activecode" id="' + divid + '">' +
1512-
'<br /> ' +
1513-
'<br /> ' +
1514-
'<br /> ' +
1515-
' </pre>' +
1511+
' <textarea data-component="activecode" id="' + divid + '">' +
1512+
'\n' +
1513+
'\n' +
1514+
'\n' +
1515+
' </textarea>' +
15161516
' </div>' +
15171517
' </div>' +
15181518
' </div>' +

0 commit comments

Comments
 (0)