From a63d6bd00b30869ffd00ea8afb51e4a9905d8b8f Mon Sep 17 00:00:00 2001
From: benmcmahon100 <benmcmahon100@gmail.com>
Date: Wed, 26 Aug 2015 20:22:29 +0100
Subject: [PATCH] Fixed my stupid mistake that almost killed the server again

---
 ...Work_0.0.3.js => commonFrameWork_0.0.4.js} | 25 +++++++++++--------
 server/views/coursewares/showBonfire.jade     |  2 +-
 server/views/coursewares/showHTML.jade        |  2 +-
 server/views/coursewares/showJS.jade          |  2 +-
 4 files changed, 18 insertions(+), 13 deletions(-)
 rename public/js/lib/coursewares/{commonFrameWork_0.0.3.js => commonFrameWork_0.0.4.js} (98%)

diff --git a/public/js/lib/coursewares/commonFrameWork_0.0.3.js b/public/js/lib/coursewares/commonFrameWork_0.0.4.js
similarity index 98%
rename from public/js/lib/coursewares/commonFrameWork_0.0.3.js
rename to public/js/lib/coursewares/commonFrameWork_0.0.4.js
index fe5f790cf4..d6c1d95d93 100644
--- a/public/js/lib/coursewares/commonFrameWork_0.0.3.js
+++ b/public/js/lib/coursewares/commonFrameWork_0.0.4.js
@@ -133,7 +133,7 @@ editor.setOption("extraKeys", {
         }
     },
     "Ctrl-Enter": function() {
-        bonfireExecute();
+        bonfireExecute(true);
         return false;
     }
 });
@@ -480,7 +480,7 @@ var runTests = function(err, data) {
     }
 };
 
-function bonfireExecute() {
+function bonfireExecute(test) {
     goodTests = 0;
     attempts++;
     ga('send', 'event', 'Challenge', 'ran-code', challenge_Name);
@@ -501,6 +501,7 @@ function bonfireExecute() {
 
         if(userJavaScript.match(/function/gi)){
             if(userJavaScript.match(/function\s*?\(|function\s+\w+\s*?\(/gi)){
+
                 submit(userJavaScript, function (cls, message) {
                     if (failedCommentTest) {
                         myCodeMirror.setValue(myCodeMirror.getValue() + "*/");
@@ -510,12 +511,14 @@ function bonfireExecute() {
                     }
                     else if (cls) {
                         codeOutput.setValue(message.error);
-                        runTests('Error', null);
+                        if(test)
+                            runTests('Error', null);
                     } else {
                         codeOutput.setValue(message.output);
                         codeOutput.setValue(codeOutput.getValue().replace(/\\\"/gi, ''));
                         message.input = removeLogs(message.input);
-                        runTests(null, message);
+                        if(test)
+                            runTests(null, message);
                     }
                 });
             }
@@ -533,12 +536,14 @@ function bonfireExecute() {
                 }
                 else if (cls) {
                     codeOutput.setValue(message.error);
-                    runTests('Error', null);
+                    if(test)
+                        runTests('Error', null);
                 } else {
                     codeOutput.setValue(message.output);
                     codeOutput.setValue(codeOutput.getValue().replace(/\\\"/gi, ''));
                     message.input = removeLogs(message.input);
-                    runTests(null, message);
+                    if(test)
+                        runTests(null, message);
                 }
             });
         }
@@ -550,7 +555,7 @@ function bonfireExecute() {
             editorValueForIFrame = editorValueForIFrame + "-->";
         }
         if(!editor.getValue().match(/\$\s*?\(\s*?\$\s*?\)/gi) && challengeType === "0") {
-            safeHTMLRun(true);
+            safeHTMLRun(test);
         }
         else{
             workerError("Unsafe $($)");
@@ -563,7 +568,7 @@ function bonfireExecute() {
 }
 
 $('#submitButton').on('click', function() {
-    bonfireExecute();
+    bonfireExecute(true);
 });
 
 $(document).ready(function(){
@@ -573,9 +578,9 @@ $(document).ready(function(){
     myCodeMirror.setValue(editorValue.replace(/fccss/gi, '<script>').replace(/fcces/gi, "</script>"));
     if(typeof $preview.html() !== 'undefined') {
         $preview.load(function(){
-          bonfireExecute();
+          bonfireExecute(false);
         });
     } else{
-        bonfireExecute();
+        bonfireExecute(false);
     }
 });
diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade
index 8a7e8d2bf1..46953bc344 100644
--- a/server/views/coursewares/showBonfire.jade
+++ b/server/views/coursewares/showBonfire.jade
@@ -124,7 +124,7 @@ block content
                     form.code
                         .form-group.codeMirrorView
                             textarea#codeEditor(autofocus=true, style='display: none;')
-                    script(src='/js/lib/coursewares/commonFrameWork_0.0.3.js')
+                    script(src='/js/lib/coursewares/commonFrameWork_0.0.4.js')
                     script.
                         editor.setOption("mode", "javascript");
 
diff --git a/server/views/coursewares/showHTML.jade b/server/views/coursewares/showHTML.jade
index aa7edeb23e..d0175c1c71 100644
--- a/server/views/coursewares/showHTML.jade
+++ b/server/views/coursewares/showHTML.jade
@@ -72,7 +72,7 @@ block content
                         form.code
                             .codeMirrorView
                                 textarea#codeEditor(autofocus=true, style='display: none;')
-                                script(src = '/js/lib/coursewares/commonFrameWork_0.0.3.js')
+                                script(src = '/js/lib/coursewares/commonFrameWork_0.0.4.js')
                                 script.
                                     editor.setOption("mode", "text/html");
         .col-md-4.col-lg-3
diff --git a/server/views/coursewares/showJS.jade b/server/views/coursewares/showJS.jade
index fad4177e17..a9c73f9a7f 100644
--- a/server/views/coursewares/showJS.jade
+++ b/server/views/coursewares/showJS.jade
@@ -72,7 +72,7 @@ block content
                     form.code
                         .codeMirrorView
                             textarea#codeEditor(autofocus=true, style='display: none;')
-                            script(src = '/js/lib/coursewares/commonFrameWork_0.0.3.js')
+                            script(src = '/js/lib/coursewares/commonFrameWork_0.0.4.js')
                             script.
                                 editor.setOption("mode", "javascript");
     #complete-courseware-dialog.modal(tabindex='-1')