display instruction limit exceeded error

pgbovine · pgbovine · commit a311ca89221b · 2016-06-11T23:55:25.000-04:00
diff --git a/v3/js/opt-live.js b/v3/js/opt-live.js
@@ -191,6 +191,8 @@ function updateStepLabels() {
                                            myVisualizer.curLineNumber - 1, 1), "errorLine", "fullLine");
       allMarkerIds.push(markerId);
     }
+  } else if (myVisualizer.instrLimitReached) {
+    $("#frontendErrorOutput").html(htmlspecialchars(myVisualizer.instrLimitReachedWarningMsg));
   } else {
     $("#frontendErrorOutput").html(''); // clear it
   }
diff --git a/v3/js/pytutor.js b/v3/js/pytutor.js
@@ -748,6 +748,7 @@ ExecutionVisualizer.prototype.render = function() {
   if (this.instrLimitReached) {
     this.curTrace.pop() // kill last entry
     var warningMsg = lastEntry.exception_msg;
+    this.instrLimitReachedWarningMsg = warningMsg;
     myViz.domRoot.find("#errorOutput").html(htmlspecialchars(warningMsg));
     myViz.domRoot.find("#errorOutput").show();
   }

Original file line number	Diff line number	Diff line change
`@@ -191,6 +191,8 @@ function updateStepLabels() {`
`191`	`191`	`myVisualizer.curLineNumber - 1, 1), "errorLine", "fullLine");`
`192`	`192`	`allMarkerIds.push(markerId);`
`193`	`193`	`}`
	`194`	`+ } else if (myVisualizer.instrLimitReached) {`
	`195`	`+ $("#frontendErrorOutput").html(htmlspecialchars(myVisualizer.instrLimitReachedWarningMsg));`
`194`	`196`	`} else {`
`195`	`197`	`$("#frontendErrorOutput").html(''); // clear it`
`196`	`198`	`}`
Original file line number	Diff line number	Diff line change
`@@ -748,6 +748,7 @@ ExecutionVisualizer.prototype.render = function() {`
`748`	`748`	`if (this.instrLimitReached) {`
`749`	`749`	`this.curTrace.pop() // kill last entry`
`750`	`750`	`var warningMsg = lastEntry.exception_msg;`
	`751`	`+ this.instrLimitReachedWarningMsg = warningMsg;`
`751`	`752`	`myViz.domRoot.find("#errorOutput").html(htmlspecialchars(warningMsg));`
`752`	`753`	`myViz.domRoot.find("#errorOutput").show();`
`753`	`754`	`}`