Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp

controllers/fieldGuide.js

@@ -1,12 +1,10 @@
 var R = require('ramda'),
     FieldGuide = require('./../models/FieldGuide'),
-    resources = require('./resources');
+    resources = require('./resources'),
+    debug = require('debug')('freecc:fieldguides');
 
 exports.returnIndividualFieldGuide = function(req, res, next) {
   var dashedName = req.params.fieldGuideName;
-
-  var fieldGuideName = dashedName.replace(/\-/g, ' ');
-
   if (req.user) {
     var completed = req.user.completedFieldGuides;
 
@@ -22,7 +20,7 @@ exports.returnIndividualFieldGuide = function(req, res, next) {
   }
 
   FieldGuide.find(
-    { name: new RegExp(fieldGuideName, 'i') },
+    { dashedName: new RegExp(dashedName, 'i') },
     function(err, fieldGuideFromMongo) {
       if (err) {
         return next(err);
@@ -38,11 +36,10 @@ exports.returnIndividualFieldGuide = function(req, res, next) {
       }
 
       var fieldGuide = R.head(fieldGuideFromMongo);
-      var dashedNameFull =
         fieldGuide.name.toLowerCase().replace(/\s/g, '-').replace(/\?/g, '');
 
-      if (dashedNameFull !== dashedName) {
+      if (fieldGuide.dashedName !== dashedName) {
-        return res.redirect('../field-guide/' + dashedNameFull);
+        return res.redirect('../field-guide/' + fieldGuide.dashedName);
       }
       res.render('field-guide/show', {
         title: fieldGuide.name,
@@ -68,7 +65,7 @@ exports.showAllFieldGuides = function(req, res) {
 
 exports.returnNextFieldGuide = function(req, res, next) {
   if (!req.user) {
-    return res.redirect('/field-guide/how-do-i-use-this-guide?');
+    return res.redirect('/field-guide/how-do-i-use-this-guide');
   }
 
   var displayedFieldGuides =
@@ -89,7 +86,7 @@ exports.returnNextFieldGuide = function(req, res, next) {
           ].join('')
         });
       }
-      return res.redirect('../field-guide/how-do-i-use-this-guide?');
+      return res.redirect('../field-guide/how-do-i-use-this-guide');
     }
     var nameString = fieldGuide.name.toLowerCase().replace(/\s/g, '-');
     return res.redirect('../field-guide/' + nameString);

controllers/resources.js

@@ -454,7 +454,10 @@ module.exports = {
       return allFieldGuideNames;
     } else {
       allFieldGuideNames = fieldGuides.map(function (elem) {
-        return { name: elem.name, id: elem._id };
+        return {
+          name: elem.name,
+          dashedName: elem.dashedName,
+          id: elem._id };
       });
       return allFieldGuideNames;
     }

public/js/lib/coursewares/coursewaresHCJQFramework_0.1.8.js

@@ -78,19 +78,20 @@ setTimeout(updatePreview, 300);
  * "post" methods
  */
 
+var testResults = [];
 var postSuccess = function(data) {
   var testDoc = document.createElement("div");
   $(testDoc)
-    .html("<div class='row'><div class='col-xs-2 text-center'><i class='ion-checkmark-circled big-success-icon'></i></div><div class='col-xs-10 test-output test-vertical-center wrappable'>" + JSON.parse(data) + "</div></div><div class='ten-pixel-break'/>")
+    .html("<div class='row'><div class='col-xs-2 text-center'><i class='ion-checkmark-circled big-success-icon'></i></div><div class='col-xs-10 test-output test-vertical-center wrappable'>" + JSON.parse(data) + "</div></div><div class='ten-pixel-break'/>");
-    .appendTo($('#testSuite'));
+  $('#testSuite').append(testDoc);
   testSuccess();
 };
 
 var postError = function(data) {
   var testDoc = document.createElement("div");
   $(testDoc)
-    .html("<div class='row'><div class='col-xs-2 text-center'><i class='ion-close-circled big-error-icon'></i></div><div class='col-xs-10 test-vertical-center test-output wrappable'>" + JSON.parse(data) + "</div></div><div class='ten-pixel-break'/>")
+    .html("<div class='row'><div class='col-xs-2 text-center'><i class='ion-close-circled big-error-icon'></i></div><div class='col-xs-10 test-vertical-center test-output wrappable'>" + JSON.parse(data) + "</div></div><div class='ten-pixel-break'/>");
-    .prependTo($('#testSuite'))
+  $('#testSuite').append(testDoc);
 };
 var goodTests = 0;
 var testSuccess = function() {
@@ -99,6 +100,7 @@ var testSuccess = function() {
     showCompletion();
   }
 };
+
 var challengeSeed = challengeSeed || null;
 var allSeeds = '';
 (function() {

public/js/lib/coursewares/coursewaresJSFramework_0.0.5.js

@@ -183,7 +183,7 @@ var createTestDisplay = function() {
       console.log('Should be displaying bad tests');
       $(testDoc)
         .html("<div class='row'><div class='col-xs-2 text-center'><i class='ion-close-circled big-error-icon'></i></div><div class='col-xs-10 test-output wrappable test-vertical-center grayed-out-test-output'>" + test.text + "</div><div class='col-xs-10 test-output wrappable'>" + test.err + "</div></div><div class='ten-pixel-break'/>")
-        .prependTo($('#testSuite'))
+        .appendTo($('#testSuite'));
     } else {
       $(testDoc)
         .html("<div class='row'><div class='col-xs-2 text-center'><i class='ion-checkmark-circled big-success-icon'></i></div><div class='col-xs-10 test-output test-vertical-center wrappable grayed-out-test-output'>" + test.text + "</div></div><div class='ten-pixel-break'/>")

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

views/coursewares/showHTML.jade

@@ -94,4 +94,4 @@ block content
                                 span.completion-icon.ion-checkmark-circled.text-primary
                             a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress
     include ../partials/challenge-modals
-    script(src="/js/lib/coursewares/coursewaresHCJQFramework_0.1.7.js")
+    script(src="/js/lib/coursewares/coursewaresHCJQFramework_0.1.8.js")

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

views/field-guide/all-articles.jade

@@ -14,11 +14,11 @@ block content
                                             .hidden-xs.col-sm-3.col-md-2.text-primary.ion-checkmark-circled.padded-ionic-icon.text-center
                                             .col-xs-12.col-sm-9.col-md-10
                                                 li.faded
-                                                    a(href="/field-guide/#{fieldGuide.name}")= fieldGuide.name
+                                                    a(href="/field-guide/#{fieldGuide.dashedName}")= fieldGuide.name
                                     else
                                         .row
                                             .hidden-xs.col-sm-3.col-md-2
                                                 span
                                             .col-xs-12.col-sm-9.col-md-10
                                                 li
-                                                    a(href="/field-guide/#{fieldGuide.name}")= fieldGuide.name
+                                                    a(href="/field-guide/#{fieldGuide.dashedName}")= fieldGuide.name