Merge branch 'master' of github.com:bnmnetp/runestone

FatLeidhu · Jun 24, 2014 · aa626ce · aa626ce
2 parents 5203e77 + 8ef3851
commit aa626ce
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/common/js/bookfuncs.js b/common/js/bookfuncs.js
@@ -92,9 +92,10 @@ function createEditors() {
             first_line = 1;
         }
         cm_editors[newEdId] = CodeMirror.fromTextArea(edList[i], {
-                                                          mode: {name: lang,
-                                                              version: 2,
-                                                              singleLineStringErrors: false},
+                                                          mode: { name: lang,
+                                                                  version: 2,
+                                                                  singleLineStringErrors: false
+                                                                },
                                                           lineNumbers: true,
                                                           firstLineNumber: first_line,
                                                           indentUnit: 4,
@@ -104,10 +105,20 @@ function createEditors() {
                                                           onKeyEvent: handleEdKeys
                                                       }
         );
+
         cm_editors[newEdId].parentDiv = edList[i].parentNode.parentNode.id;
         //requestCode(edList[i].parentNode.id) // populate with user's code
     }
 
+    // allow ActiveCode editors to be dynamically resized by user
+    $('.CodeMirror').each(function (_, cmNode) {
+        $(cmNode).resizable({
+            resize: function() {
+                cmNode.CodeMirror.setSize($(this).width(), $(this).height());
+                cmNode.CodeMirror.refresh();
+            }
+        });
+    });
 }
 
 function builtinRead(x) {

diff --git a/static/runestone-custom-sphinx-bootstrap.css b/static/runestone-custom-sphinx-bootstrap.css
@@ -132,6 +132,14 @@ div.section {
 	clear:both;
 }
 
+.CodeMirror-scroll {
+    /* this allows CM elements to be resized to (almost) any 
+     * height while still relying on max-height (which keeps 
+     * the CM editors to no more than the size needed 
+     * unless resized) */
+    max-height: 9999;
+}
+
 button.btn, btn.btn-sm,
 input[type="submit"].btn.btn-sm,
 input[type="button"].btn.btn-sm {