From 11495563fabf0913ac9bad6643988f4971197da5 Mon Sep 17 00:00:00 2001
From: kimth <kimt@mit.edu>
Date: Tue, 31 Jul 2012 16:42:17 -0400
Subject: [PATCH] Tweaks to CodeMirror: fix indentation, textarea is vertically
resizable
---
common/lib/capa/capa/inputtypes.py | 12 +++++++++---
common/lib/capa/capa/templates/textbox.html | 9 +++++++--
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index 31482214b3c..8b3867be5b3 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -313,14 +313,20 @@ def textbox(element, value, status, render_template, msg=''):
size = element.get('size')
rows = element.get('rows') or '30'
cols = element.get('cols') or '80'
- mode = element.get('mode') or 'python' # mode for CodeMirror, eg "python" or "xml"
hidden = element.get('hidden', '') # if specified, then textline is hidden and id is stored in div of name given by hidden
- linenumbers = element.get('linenumbers','true') # for CodeMirror
+
if not value: value = element.text # if no student input yet, then use the default input given by the problem
+
+ # For CodeMirror
+ mode = element.get('mode') or 'python' # mode, eg "python" or "xml"
+ linenumbers = element.get('linenumbers','true') # for CodeMirror
+ tabsize = element.get('tabsize','4')
+ tabsize = int(tabsize)
+
context = {'id': eid, 'value': value, 'state': status, 'count': count, 'size': size, 'msg': msg,
'mode': mode, 'linenumbers': linenumbers,
'rows': rows, 'cols': cols,
- 'hidden': hidden,
+ 'hidden': hidden, 'tabsize': tabsize,
}
html = render_template("textbox.html", context)
try:
diff --git a/common/lib/capa/capa/templates/textbox.html b/common/lib/capa/capa/templates/textbox.html
index d553ba16e5b..d37eda72849 100644
--- a/common/lib/capa/capa/templates/textbox.html
+++ b/common/lib/capa/capa/templates/textbox.html
@@ -35,15 +35,20 @@
lineNumbers: true,
% endif
mode: "${mode}",
- tabsize: 4,
+ matchBrackets: true,
+ lineWrapping: true,
+ indentUnit: "${tabsize}",
+ tabSize: "${tabsize}",
+ smartIndent: false
});
});
</script>
<style type="text/css">
.CodeMirror {
- border: 2px solid black;
+ border: 1px solid black;
font-size: 14px;
line-height: 18px;
+ resize: vertical;
}
</style>
</section>
--
GitLab