Merging of the framework: Ready for QA run

2015-08-24 01:16:15 +01:00
parent 390469a1b6
commit f06d6ca650
2 changed files with 101 additions and 52 deletions
--- a/public/js/lib/coursewares/sandbox.js
+++ b/public/js/lib/coursewares/sandbox.js
@@ -73,7 +73,9 @@ var reset = function() {
        setTimeout( function() {
            endLoading();
            console.log("resetting on fatal plugin error");
-            codeOutput.setValue("Sorry, your code is either too slow, has a fatal error, or contains an infinite loop.");
+            if(challengeType === 0){
+                codeOutput.setValue("Sorry, your code is either too slow, has a fatal error, or contains an infinite loop.");
+            }
            reset();
        }, 10);
    });