ugh bug fix

pgbovine · pgbovine · commit ec6714aa64e5 · 2014-05-11T12:11:10.000-04:00
diff --git a/v3/js/composingprograms.js b/v3/js/composingprograms.js
@@ -38,7 +38,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
 $(document).ready(function() {
-  genericOptFrontendReady(); // initialize at the beginning
   setSurveyHTML();
 
   $("#embedLinkDiv").hide();
@@ -118,4 +117,6 @@ $(document).ready(function() {
 
   $("#executeBtn").attr('disabled', false);
   $("#executeBtn").click(executeCodeFromScratch);
+
+  genericOptFrontendReady(); // initialize at the end
 });
diff --git a/v3/js/csc108h.js b/v3/js/csc108h.js
@@ -39,7 +39,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
 $(document).ready(function() {
-  genericOptFrontendReady(); // initialize at the beginning
   setSurveyHTML();
 
   $("#embedLinkDiv").hide();
@@ -121,4 +120,6 @@ $(document).ready(function() {
 
   $("#executeBtn").attr('disabled', false);
   $("#executeBtn").click(executeCodeFromScratch);
+
+  genericOptFrontendReady(); // initialize at the end
 });
diff --git a/v3/js/opt-frontend-common.js b/v3/js/opt-frontend-common.js
@@ -103,7 +103,7 @@ function redrawConnectors() {
 }
 
 
-// run in the BEGINNING
+// run at the END so that everything else can be initialized first
 function genericOptFrontendReady() {
   pyInputCodeMirror = CodeMirror(document.getElementById('codeInputPane'), {
     mode: 'python',
diff --git a/v3/js/opt-frontend.js b/v3/js/opt-frontend.js
@@ -403,7 +403,6 @@ function executeCodeWithRawInput(rawInputStr, curInstr) {
 
 
 $(document).ready(function() {
-  genericOptFrontendReady(); // initialize at the beginning
   setSurveyHTML();
 
   $("#embedLinkDiv").hide();
@@ -701,11 +700,6 @@ $(document).ready(function() {
   });
 
 
-  // if blank, then select a canned example on start-up
-  if (!pyInputCodeMirror.getValue()) {
-    $("#aliasExampleLink").trigger('click');
-  }
-
   $('#genEmbedBtn').bind('click', function() {
     assert(appMode == 'display' || appMode == 'visualize' /* 'visualize' is deprecated */);
     var myArgs = getAppState();
@@ -735,4 +729,13 @@ $(document).ready(function() {
       $.get('survey.py', myArgs, function(dat) {});
     }
   });
+
+  genericOptFrontendReady(); // initialize at the end
+
+
+  // if blank, then select a canned example on start-up
+  // (need to do this after pyInputCodeMirror is initialized)
+  if (!pyInputCodeMirror.getValue()) {
+    $("#aliasExampleLink").trigger('click');
+  }
 });

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ function redrawConnectors() {`
`103`	`103`	`}`
`104`	`104`
`105`	`105`
`106`		`-// run in the BEGINNING`
	`106`	`+// run at the END so that everything else can be initialized first`
`107`	`107`	`function genericOptFrontendReady() {`
`108`	`108`	`pyInputCodeMirror = CodeMirror(document.getElementById('codeInputPane'), {`
`109`	`109`	`mode: 'python',`