added codeDivWidth and codeDivHeight as adjustable options

pgbovine · pgbovine · commit 468b4469804e · 2013-09-02T11:51:09.000-04:00
diff --git a/v3/js/iframe-embed.js b/v3/js/iframe-embed.js
@@ -53,11 +53,18 @@ $(document).ready(function() {
   var cumModeBool = (queryStrOptions.cumulativeState == 'true');
 
   var codeDivWidth = undefined;
-  var cdv = $.bbq.getState('codeDivWidth');
-  if (cdv) {
-    codeDivWidth = Number(cdv);
+  var cdw = $.bbq.getState('codeDivWidth');
+  if (cdw) {
+    codeDivWidth = Number(cdw);
   }
 
+  var codeDivHeight = undefined;
+  var cdh = $.bbq.getState('codeDivHeight');
+  if (cdh) {
+    codeDivHeight = Number(cdh);
+  }
+
+
   var startingInstruction = queryStrOptions.preseededCurInstr;
   if (!startingInstruction) {
     startingInstruction = 0;
@@ -119,6 +126,7 @@ $(document).ready(function() {
                             pyCrazyMode: (pyState == '2crazy'),
                             highlightLines: typeof $.bbq.getState("highlightLines") !== "undefined",
                             codeDivWidth: codeDivWidth,
+                            codeDivHeight: codeDivHeight,
                            }
 
   function executeCode(forceStartingInstr) {
diff --git a/v3/js/opt-frontend.js b/v3/js/opt-frontend.js
@@ -553,6 +553,8 @@ $(document).ready(function() {
                   showOnlyOutputs: $('#showOnlyOutputsSelector').val(),
                   py: $('#pythonVersionSelector').val(),
                   curInstr: myVisualizer.curInstr,
+                  codeDivWidth: myVisualizer.DEFAULT_EMBEDDED_CODE_DIV_WIDTH,
+                  codeDivHeight: myVisualizer.DEFAULT_EMBEDDED_CODE_DIV_HEIGHT,
                  };
 
     var embedUrlStr = $.param.fragment(domain + "iframe-embed.html", myArgs, 2 /* clobber all */);
diff --git a/v3/js/pytutor.js b/v3/js/pytutor.js
@@ -82,8 +82,9 @@ var curVisualizerID = 1; // global to uniquely identify each ExecutionVisualizer
 //   codeDivWidth  - maximum width  of #pyCodeOutputDiv (in integer pixels)
 //   editCodeBaseURL - the base URL to visit when the user clicks 'Edit code' (if null, then 'Edit code' link hidden)
 //   allowEditAnnotations - allow user to edit per-step annotations (default: false)
-//   embeddedMode         - shortcut for hideOutput=true, allowEditAnnotations=false
-//                          codeDivWidth=350, codeDivHeight=400
+//   embeddedMode         - shortcut for hideOutput=true, allowEditAnnotations=false,
+//                                       codeDivWidth=this.DEFAULT_EMBEDDED_CODE_DIV_WIDTH,
+//                                       codeDivHeight=this.DEFAULT_EMBEDDED_CODE_DIV_HEIGHT
 //   disableHeapNesting   - if true, then render all heap objects at the top level (i.e., no nested objects)
 //   drawParentPointers   - if true, then draw environment diagram parent pointers for all frames
 //                          WARNING: there are hard-to-debug MEMORY LEAKS associated with activating this option
@@ -109,6 +110,8 @@ function ExecutionVisualizer(domRootID, dat, params) {
   this.curInputCode = dat.code.rtrim(); // kill trailing spaces
   this.curTrace = dat.trace;
 
+  this.DEFAULT_EMBEDDED_CODE_DIV_WIDTH = 350;
+  this.DEFAULT_EMBEDDED_CODE_DIV_HEIGHT = 400;
 
   // optional filtering to remove redundancy ...
   // ok, we're gonna filter out all trace entries of 'call' events,
@@ -419,11 +422,11 @@ ExecutionVisualizer.prototype.render = function() {
 
     // don't override if they've already been set!
     if (this.params.codeDivWidth === undefined) {
-      this.params.codeDivWidth = 350;
+      this.params.codeDivWidth = this.DEFAULT_EMBEDDED_CODE_DIV_WIDTH;
     }
 
     if (this.params.codeDivHeight === undefined) {
-      this.params.codeDivHeight = 400;
+      this.params.codeDivHeight = this.DEFAULT_EMBEDDED_CODE_DIV_HEIGHT;
     }
     
     this.allowEditAnnotations = false;
