From 54c33052813f24d317c34d2dd0b08a3cf9cf5f08 Mon Sep 17 00:00:00 2001 From: Michael Q Larson Date: Sat, 24 Jan 2015 14:42:34 -0800 Subject: [PATCH] change bonfire path to playground and update links, and also add a should example test to playground --- app.js | 2 +- public/js/lib/bonfire/bonfireFramework.js | 6 ++++-- views/bonfire/bonfire.jade | 2 +- views/partials/footer.jade | 2 +- views/partials/navbar.jade | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app.js b/app.js index 9966d52262..1b00f76de3 100644 --- a/app.js +++ b/app.js @@ -255,7 +255,7 @@ app.get( ); app.all('/account', passportConf.isAuthenticated); app.get('/account/api', userController.getAccountAngular); -app.get('/bonfire', bonfireController.index); +app.get('/playground', bonfireController.index); app.get( '/bonfires/:bonfireNumber', bonfireController.returnIndividualBonfire diff --git a/public/js/lib/bonfire/bonfireFramework.js b/public/js/lib/bonfire/bonfireFramework.js index aea21a58ea..adb0f362ef 100644 --- a/public/js/lib/bonfire/bonfireFramework.js +++ b/public/js/lib/bonfire/bonfireFramework.js @@ -35,6 +35,8 @@ var nonChallengeValue = '/*Welcome to Bonfire, Free Code Camp\'s future CoderByt '}\n' + 'expect(test()).to.be.a("array");\n\n' + 'assert.deepEqual(test(), [1,4,9]);\n\n' + + 'var foo = test();\n' + + 'foo.should.be.a("array");\n\n' + 'test();'; var codeOutput = CodeMirror.fromTextArea(document.getElementById("codeOutput"), { @@ -139,8 +141,8 @@ var scrapeTests = function(userJavaScript) { while (match != null) { var replacement = '//' + counter + testSalt; userJavaScript = userJavaScript.substring(0, match.index) - + replacement - + userJavaScript.substring(match.index + match[0].length); + + replacement + + userJavaScript.substring(match.index + match[0].length); if (!userTests) { userTests= []; diff --git a/views/bonfire/bonfire.jade b/views/bonfire/bonfire.jade index 8fcf04a9ed..62894f1630 100644 --- a/views/bonfire/bonfire.jade +++ b/views/bonfire/bonfire.jade @@ -17,7 +17,7 @@ block content .row #mainEditorPanel.col-sm-12.col-md-7.col-xs-12 .panel.panel-primary.panel-bonfire - .panel-heading.text-center Bonfire Playground + .panel-heading.text-center Playground .panel.panel-body form.code .form-group.codeMirrorView diff --git a/views/partials/footer.jade b/views/partials/footer.jade index f4d23dd17d..8651171bf6 100644 --- a/views/partials/footer.jade +++ b/views/partials/footer.jade @@ -17,4 +17,4 @@ |   a.ion-locked(title="Free Code Camp's Privacy Policy", href="/privacy") |   - a.ion-code-working(title="Bonfire Coding Playground", href="/bonfire") \ No newline at end of file + a.ion-code-working(title="Bonfire Coding Playground", href="/playground") \ No newline at end of file diff --git a/views/partials/navbar.jade b/views/partials/navbar.jade index e42d08e94c..e6ca1aba4f 100644 --- a/views/partials/navbar.jade +++ b/views/partials/navbar.jade @@ -29,7 +29,7 @@ nav.navbar.navbar-default.navbar-fixed-top.nav-height li a(href='http://forum.freecodecamp.com' target='_blank') Forum li - a(href='/bonfire') Bonfire + a(href='/bonfires') Bonfires if !user li       li