bammy

Philip Guo · Philip Guo · commit beda7dfd6b35 · 2012-08-07T16:46:23.000-07:00
diff --git a/PyTutorGAE/js/opt-frontend.js b/PyTutorGAE/js/opt-frontend.js
diff --git a/PyTutorGAE/js/pytutor.js b/PyTutorGAE/js/pytutor.js
@@ -28,9 +28,11 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
 // Massive refactoring notes:
-//   - we need a d3 selector for domRoot (use this
+//   - test whether preseeded code and curInstr works
+//   - test whether back button works properly
 //   - does jsPlumb have a notion of "sets" of connectors so that we can reset a particular
 //     set rather than ALL connections?
+//   - executed lines highlighting seems to be broken
 
 
 function ExecutionVisualizer(inputCode, traceData, startingInstruction, domRootID) {
@@ -268,6 +270,9 @@ ExecutionVisualizer.prototype.render = function() {
             myViz.curInstr -= 1;
           }
           myViz.updateOutput();
+
+          k.preventDefault(); // don't horizontally scroll the display
+          myViz.keyStuckDown = true;
         }
       }
       else if (k.keyCode == 39) { // right arrow
@@ -284,11 +289,11 @@ ExecutionVisualizer.prototype.render = function() {
             myViz.curInstr += 1;
           }
           myViz.updateOutput();
+
+          k.preventDefault(); // don't horizontally scroll the display
+          myViz.keyStuckDown = true;
         }
       }
-
-      k.preventDefault(); // don't horizontally scroll the display
-      myViz.keyStuckDown = true;
     }
   });
 
diff --git a/PyTutorGAE/tutor.html b/PyTutorGAE/tutor.html
@@ -56,7 +56,7 @@
 
 <!-- my own code -->
 <script type="text/javascript" src="js/pytutor.js"></script>
-<script type="text/javascript" src="js/edu-python-tutor.js"></script>
+<script type="text/javascript" src="js/opt-frontend.js"></script>
 
 <link rel="stylesheet" href="css/pytutor.css"/>
 

Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,11 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.`
`28`	`28`
`29`	`29`
`30`	`30`	`// Massive refactoring notes:`
`31`		`-// - we need a d3 selector for domRoot (use this`
	`31`	`+// - test whether preseeded code and curInstr works`
	`32`	`+// - test whether back button works properly`
`32`	`33`	`// - does jsPlumb have a notion of "sets" of connectors so that we can reset a particular`
`33`	`34`	`// set rather than ALL connections?`
	`35`	`+// - executed lines highlighting seems to be broken`
`34`	`36`
`35`	`37`
`36`	`38`	`function ExecutionVisualizer(inputCode, traceData, startingInstruction, domRootID) {`
`@@ -268,6 +270,9 @@ ExecutionVisualizer.prototype.render = function() {`
`268`	`270`	`myViz.curInstr -= 1;`
`269`	`271`	`}`
`270`	`272`	`myViz.updateOutput();`
	`273`	`+`
	`274`	`+ k.preventDefault(); // don't horizontally scroll the display`
	`275`	`+ myViz.keyStuckDown = true;`
`271`	`276`	`}`
`272`	`277`	`}`
`273`	`278`	`else if (k.keyCode == 39) { // right arrow`
`@@ -284,11 +289,11 @@ ExecutionVisualizer.prototype.render = function() {`
`284`	`289`	`myViz.curInstr += 1;`
`285`	`290`	`}`
`286`	`291`	`myViz.updateOutput();`
	`292`	`+`
	`293`	`+ k.preventDefault(); // don't horizontally scroll the display`
	`294`	`+ myViz.keyStuckDown = true;`
`287`	`295`	`}`
`288`	`296`	`}`
`289`		`-`
`290`		`- k.preventDefault(); // don't horizontally scroll the display`
`291`		`- myViz.keyStuckDown = true;`
`292`	`297`	`}`
`293`	`298`	`});`
`294`	`299`