get rid of display_on_frills mode for simplicity

pgbovine · pgbovine · commit 75cd6e8fce34 · 2014-05-12T09:29:42.000-04:00
diff --git a/v3/js/opt-frontend-common.js b/v3/js/opt-frontend-common.js
@@ -61,7 +61,7 @@ var domain = "http://pythontutor.com/"; // for deployment
 var isExecutingCode = false; // nasty, nasty global
 
 
-var appMode = 'edit'; // 'edit', 'display', 'display_no_frills'. also support
+var appMode = 'edit'; // 'edit' or 'display'. also support
                       // 'visualize' for backward compatibility (same as 'display')
 
 var preseededCurInstr = null; // if you passed in a 'curInstr=<number>' in the URL, then set this var
@@ -317,13 +317,7 @@ function updateAppDisplay(newAppMode) {
     $.bbq.pushState({ mode: 'display' }, 2 /* completely override other hash strings to keep URL clean */);
   }
   else {
-    assert(appMode == 'display_no_frills');
-    assert(myVisualizer);
-
-    $("#pyInputPane").hide();
-    $("#pyOutputPane,#surveyHeader").show();
-    $("#embedLinkDiv").show();
-    $.bbq.pushState({ mode: 'display_no_frills' }, 2 /* completely override other hash strings to keep URL clean */);
+    assert(false);
   }
 
   $('#urlOutput,#embedCodeOutput').val(''); // clear to avoid stale values
@@ -369,11 +363,6 @@ function enterEditMode() {
   updateAppDisplay('edit');
 }
 
-function enterDisplayNoFrillsMode() {
-  console.log('enterDisplayNoFrillsMode');
-  updateAppDisplay('display_no_frills');
-}
-
 
 function executePythonCode(pythonSourceCode,
                            backendScript, backendOptionsObj,
diff --git a/v3/js/opt-frontend.js b/v3/js/opt-frontend.js
@@ -394,7 +394,9 @@ function executeCodeFromScratch() {
 }
 
 function executeCodeWithRawInput(rawInputStr, curInstr) {
-  enterDisplayNoFrillsMode();
+  // kick back into edit mode before executing or else the display won't
+  // refresh properly ... ugh
+  enterEditMode();
 
   // set some globals
   rawInputLst.push(rawInputStr);

Original file line number	Diff line number	Diff line change
`@@ -394,7 +394,9 @@ function executeCodeFromScratch() {`
`394`	`394`	`}`
`395`	`395`
`396`	`396`	`function executeCodeWithRawInput(rawInputStr, curInstr) {`
`397`		`- enterDisplayNoFrillsMode();`
	`397`	`+ // kick back into edit mode before executing or else the display won't`
	`398`	`+ // refresh properly ... ugh`
	`399`	`+ enterEditMode();`
`398`	`400`
`399`	`401`	`// set some globals`
`400`	`402`	`rawInputLst.push(rawInputStr);`