From 870c80d72da31bbd1f234f6629c55e23eefdaea4 Mon Sep 17 00:00:00 2001 From: terakilobyte Date: Tue, 9 Jun 2015 16:46:41 -0400 Subject: [PATCH] Alter variable names in testing loop to avoid common collisions. Bump file version to force browser fetch. --- ...ework_0.0.4.js => coursewaresJSFramework_0.0.5.js} | 11 ++++++----- server/views/coursewares/showBonfire.jade | 2 +- server/views/coursewares/showJS.jade | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) rename public/js/lib/coursewares/{coursewaresJSFramework_0.0.4.js => coursewaresJSFramework_0.0.5.js} (96%) diff --git a/public/js/lib/coursewares/coursewaresJSFramework_0.0.4.js b/public/js/lib/coursewares/coursewaresJSFramework_0.0.5.js similarity index 96% rename from public/js/lib/coursewares/coursewaresJSFramework_0.0.4.js rename to public/js/lib/coursewares/coursewaresJSFramework_0.0.5.js index 9601fbe94d..1960b94d91 100644 --- a/public/js/lib/coursewares/coursewaresJSFramework_0.0.4.js +++ b/public/js/lib/coursewares/coursewaresJSFramework_0.0.5.js @@ -213,16 +213,17 @@ var runTests = function(err, data) { } else if (userTests) { userTests.push(false); pushed = true; - userTests.forEach(function(test, ix, arr){ + userTests.forEach(function(chaiTestFromJSON, indexOfTestArray, __testArray){ try { - if (test) { - var output = eval(reassembleTest(test, data)); + if (chaiTestFromJSON) { + var output = eval(reassembleTest(chaiTestFromJSON, data)); + debugger; } } catch(error) { allTestsPassed = false; - arr[ix].err = error.message; + __testArray[indexOfTestArray].err = error.message; } finally { - if (!test) { + if (!chaiTestFromJSON) { createTestDisplay(); } } diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade index b09968ebe3..4270e5975a 100644 --- a/server/views/coursewares/showBonfire.jade +++ b/server/views/coursewares/showBonfire.jade @@ -125,7 +125,7 @@ block content form.code .form-group.codeMirrorView textarea#codeEditor(autofocus=true, style='display: none;') - script(src='/js/lib/coursewares/coursewaresJSFramework_0.0.4.js') + script(src='/js/lib/coursewares/coursewaresJSFramework_0.0.5.js') #complete-courseware-dialog.modal(tabindex='-1') .modal-dialog.animated.zoomIn.fast-animation diff --git a/server/views/coursewares/showJS.jade b/server/views/coursewares/showJS.jade index 43d954a2f2..25bb25cd3f 100644 --- a/server/views/coursewares/showJS.jade +++ b/server/views/coursewares/showJS.jade @@ -67,7 +67,7 @@ block content form.code .form-group.codeMirrorView textarea#codeEditor(autofocus=true, style='display: none;') - script(src='/js/lib/coursewares/coursewaresJSFramework_0.0.4.js') + script(src='/js/lib/coursewares/coursewaresJSFramework_0.0.5.js') #complete-courseware-dialog.modal(tabindex='-1') .modal-dialog.animated.zoomIn.fast-animation .modal-content