Merge pull request #2 from sujith-rek/feat/customOutputHeight

custom output height

Author: NicolasSandoval

runestone/activecode/activecode.py

@@ -71,7 +71,7 @@ def setup(app):
     %(hidecode)s %(include)s %(timelimit)s %(coach)s %(codelens)s %(enabledownload)s %(chatcodes)s %(optional)s
     data-audio='%(ctext)s' %(sourcefile)s %(datafile)s %(stdin)s %(tie)s %(dburl)s %(nopair)s
     %(cargs)s %(largs)s %(rargs)s %(iargs)s %(gradebutton)s %(caption)s %(hidehistory)s %(wasmuri)s
-    %(showlastsql)s %(python3_interpreter)s style="visibility: hidden;">
+    %(showlastsql)s %(python3_interpreter)s %(output_height)s style="visibility: hidden;">
 %(initialcode)s
 </textarea>
 </div>
@@ -163,6 +163,7 @@ class ActiveCode(RunestoneIdDirective):
        :dburl: url to load database for sql mode
        :showlastsql: -- Only show the last sql result in output
        :python3_interpreter: brython (uses brython as interpreter of python3)
+       :output_height: 200px
 
         If this is a homework problem instead of an example in the text
         then the assignment text should go here.  The assignment text ends with
@@ -218,7 +219,8 @@ class ActiveCode(RunestoneIdDirective):
             "nopair": directives.flag,
             "dburl": directives.unchanged,
             "showlastsql": directives.flag,
-            "python3_interpreter": directives.unchanged
+            "python3_interpreter": directives.unchanged,
+            "output_height": directives.unchanged,
         }
     )
 
@@ -273,6 +275,11 @@ def run(self):
         else:
             self.options["python3_interpreter"] = ""
 
+        if ("output_height" in self.options) :
+            self.options["output_height"] = "data-output_height='%s'" % self.options["output_height"]
+        else:
+            self.options["output_height"] = ""
+
         if "caption" not in self.options:
             self.options["caption"] = ""
         else:

runestone/activecode/js/acfactory.js

@@ -34,6 +34,7 @@ export default class ACFactory {
         }
         var text_area = $(opts.orig).find("textarea")[0]
         var python3_interpreter = $(text_area).attr("data-python3_interpreter");
+        var output_height = $(text_area).attr("data-output_height");
         if (opts.timed == true) {
             if(python3_interpreter==="brython"){
                 return new TimedBrythonActiveCode(opts);   

runestone/activecode/js/activecode.js

@@ -67,6 +67,7 @@ export class ActiveCode extends RunestoneBase {
         this.tie = $(orig).data("tie");
         this.dburl = $(orig).data("dburl");
         this.python3_interpreter = $(orig).data("python3_interpreter");
+        this.output_height = $(orig).data("output_height");
         this.runButton = null;
         this.enabledownload = $(orig).data("enabledownload");
         this.downloadButton = null;

runestone/activecode/js/activecode_brython.js

@@ -5,6 +5,7 @@ export default class BrythonActiveCode extends ActiveCode {
         super(opts);
         opts.alignVertical = true;
         this.python3_interpreter = $(orig).data("python3_interpreter");
+        this.output_height = $(orig).data("output_height");
         $(this.runButton).text("Render");
         this.editor.setValue(this.code);
     }
@@ -119,11 +120,17 @@ document <= html.SCRIPT("let container = document.querySelector('.container-pre'
         } else {
             $(outDiv).addClass("col-md-5");
         }
+
+        if (this.output_height == undefined) {
+            this.output_height = "400px";
+        }
+
         this.outDiv = outDiv;
         this.output = document.createElement("iframe");
         $(this.output).css("background-color", "white");
         $(this.output).css("position", "relative");
-        $(this.output).css("height", "400px");
+        // $(this.output).css("height", $(this.output_height));
+        this.output.style.height = this.output_height;
         $(this.output).css("width", "100%");
         outDiv.appendChild(this.output);
         this.outerDiv.appendChild(outDiv);

runestone/dist/node_modules_moment_locale_sync_recursive_-runestone_activecode_js_acfactory_js.bundle.js

@@ -1 +1 @@
-{"js":["runtime.bundle.js?v=1654bbde73e12a3366eb","vendors-node_modules_bootstrap_dist_js_bootstrap_js-node_modules_jquery-ui_jquery-ui_js-node_-e60694.bundle.js?v=02c928219c61d5ca913a","runestone.bundle.js?v=db4b57b8df6b9b8f470a"],"css":[]}
+{"js":["runtime.bundle.js?v=e476ce06ce356667798d","vendors-node_modules_bootstrap_dist_js_bootstrap_js-node_modules_jquery-ui_jquery-ui_js-node_-e60694.bundle.js?v=02c928219c61d5ca913a","runestone.bundle.js?v=db4b57b8df6b9b8f470a"],"css":[]}