From 2acf8b727c020e63bd6fda9c24e3c564a0013d54 Mon Sep 17 00:00:00 2001 From: Abhisek Pattnaik Date: Fri, 14 Aug 2015 12:31:58 +0530 Subject: [PATCH 001/134] Bonfire: Where art thou test case update Added further test cases to check for adhering to the instructions in bonfire properly. --- seed/challenges/basic-bonfires.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/seed/challenges/basic-bonfires.json b/seed/challenges/basic-bonfires.json index 6f1cf7b9d42..d027bfa3aef 100644 --- a/seed/challenges/basic-bonfires.json +++ b/seed/challenges/basic-bonfires.json @@ -582,7 +582,8 @@ ], "tests": [ "assert.deepEqual(where([{ first: 'Romeo', last: 'Montague' }, { first: 'Mercutio', last: null }, { first: 'Tybalt', last: 'Capulet' }], { last: 'Capulet' }), [{ first: 'Tybalt', last: 'Capulet' }], 'should return an array of objects');", - "assert.deepEqual(where([{ 'a': 1 }, { 'a': 1 }, { 'a': 1, 'b': 2 }], { 'a': 1 }), [{ 'a': 1 }, { 'a': 1 }, { 'a': 1, 'b': 2 }], 'should return with multiples');" + "assert.deepEqual(where([{ 'a': 1 }, { 'a': 1 }, { 'a': 1, 'b': 2 }], { 'a': 1 }), [{ 'a': 1 }, { 'a': 1 }, { 'a': 1, 'b': 2 }], 'should return with multiples');", + "assert.deepEqual(where([{ 'a': 5 }, { 'a': 5 }, { 'a': 5, 'b': 10 }], { 'a': 5, 'b': 10 }), [{ 'a': 5, 'b': 10 }], 'should return a single object in array');" ], "MDNlinks": [ "Global Object", From 6f7495e6cbbbfb432a6062bd48074fad70a9ea6d Mon Sep 17 00:00:00 2001 From: Abhisek Pattnaik Date: Mon, 17 Aug 2015 18:27:33 +0530 Subject: [PATCH 002/134] Added additional test case --- seed/challenges/basic-bonfires.json | 1 + 1 file changed, 1 insertion(+) diff --git a/seed/challenges/basic-bonfires.json b/seed/challenges/basic-bonfires.json index d027bfa3aef..845b55a1c83 100644 --- a/seed/challenges/basic-bonfires.json +++ b/seed/challenges/basic-bonfires.json @@ -583,6 +583,7 @@ "tests": [ "assert.deepEqual(where([{ first: 'Romeo', last: 'Montague' }, { first: 'Mercutio', last: null }, { first: 'Tybalt', last: 'Capulet' }], { last: 'Capulet' }), [{ first: 'Tybalt', last: 'Capulet' }], 'should return an array of objects');", "assert.deepEqual(where([{ 'a': 1 }, { 'a': 1 }, { 'a': 1, 'b': 2 }], { 'a': 1 }), [{ 'a': 1 }, { 'a': 1 }, { 'a': 1, 'b': 2 }], 'should return with multiples');", + "assert.deepEqual(where([{ 'a': 1, 'b': 2 }, { 'a': 1 }, { 'a': 1, 'b': 2, 'c': 2 }], { 'a': 1, 'b': 2 }), [{ 'a': 1, 'b': 2 }, { 'a': 1, 'b': 2, 'c': 2 }], 'should return two objects in array');", "assert.deepEqual(where([{ 'a': 5 }, { 'a': 5 }, { 'a': 5, 'b': 10 }], { 'a': 5, 'b': 10 }), [{ 'a': 5, 'b': 10 }], 'should return a single object in array');" ], "MDNlinks": [ From 666a0a2cf3636b7b38004b1b4d8e9a0f359c0c27 Mon Sep 17 00:00:00 2001 From: Matt Trifilo Date: Tue, 18 Aug 2015 00:43:28 -0500 Subject: [PATCH 003/134] Fixed: issue #2014 I changed "#button" to "button" in the example to target all buttons, and I changed the single quotes to double quotes in the description for consistency. --- seed/challenges/jquery.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/jquery.json b/seed/challenges/jquery.json index d6a6fa0fb00..166ff7f431d 100644 --- a/seed/challenges/jquery.json +++ b/seed/challenges/jquery.json @@ -415,7 +415,7 @@ "You can also change the non-CSS properties of HTML elements with jQuery. For example, you can disable buttons.", "When you disable a button, it will become grayed-out and can no longer be clicked.", "jQuery has a function called .prop() that allows you to adjust the properties of elements.", - "Here's how you would disable all buttons: $('#button').prop('disabled', true);", + "Here's how you would disable all buttons: $("button").prop("disabled", true);", "Disable only the target1 button." ], "tests": [ From 45bcd32c9c12fa073e40d8fa78e35c57f4af3bd8 Mon Sep 17 00:00:00 2001 From: Matt Trifilo Date: Wed, 19 Aug 2015 22:48:25 -0500 Subject: [PATCH 004/134] Edited Pull Request #2018 Escaped the double quotation marks on line 418. --- seed/challenges/jquery.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/jquery.json b/seed/challenges/jquery.json index 166ff7f431d..3bc98205b4a 100644 --- a/seed/challenges/jquery.json +++ b/seed/challenges/jquery.json @@ -415,7 +415,7 @@ "You can also change the non-CSS properties of HTML elements with jQuery. For example, you can disable buttons.", "When you disable a button, it will become grayed-out and can no longer be clicked.", "jQuery has a function called .prop() that allows you to adjust the properties of elements.", - "Here's how you would disable all buttons: $("button").prop("disabled", true);", + "Here's how you would disable all buttons: $(\"button\").prop(\"disabled\", true);", "Disable only the target1 button." ], "tests": [ From 3d16d96133e920be3979a2bad281fe8b0646f7e2 Mon Sep 17 00:00:00 2001 From: Arsen Melikyan Date: Fri, 21 Aug 2015 17:56:44 +0400 Subject: [PATCH 005/134] fixed #1064 --- seed/challenges/html5-and-css.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/html5-and-css.json b/seed/challenges/html5-and-css.json index e5e376317d3..006e812dd5d 100644 --- a/seed/challenges/html5-and-css.json +++ b/seed/challenges/html5-and-css.json @@ -1062,7 +1062,7 @@ ], "tests": [ "assert((/cat photos/gi).test($(\"a\").text()), 'Your a element should have the anchor text of \"cat photos\"')", - "assert(/http:\\/\\/catphotoapp\\.com/gi.test($(\"a\").attr(\"href\")), 'You need an a element that links to http://catphotoapp.com.')", + "assert(/http:\\/\\/catphotoapp\\.com/gi.test($(\"a\").attr(\"href\")), 'You need an a element that links to http://catphotoapp.com.')", "assert(editor.match(/<\\/a>/g) && editor.match(/<\\/a>/g).length === editor.match(/a element has a closing tag.')" ], "challengeSeed": [ From 24dbee7257b5de16aeb256743a8018f00aefcaab Mon Sep 17 00:00:00 2001 From: Arsen Melikyan Date: Fri, 21 Aug 2015 18:38:43 +0400 Subject: [PATCH 006/134] fixed missing URL scheme #1063 --- seed/challenges/html5-and-css.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/html5-and-css.json b/seed/challenges/html5-and-css.json index e5e376317d3..10d1302ef9c 100644 --- a/seed/challenges/html5-and-css.json +++ b/seed/challenges/html5-and-css.json @@ -750,7 +750,7 @@ "difficulty": 1.17, "description": [ "You can add images to your website by using the img element, and point to a specific image's URL using the src attribute.", - "An example of this would be <img src=\"www.your-image-source.com/your-image.jpg\">. Note that in most cases, img elements are self-closing.", + "An example of this would be <img src=\"http://www.your-image-source.com/your-image.jpg\">. Note that in most cases, img elements are self-closing.", "Try it with this image: https://bit.ly/fcc-relaxing-cat." ], "tests": [ From 37b4530df2b350378432efef1c12ff2807687a94 Mon Sep 17 00:00:00 2001 From: Arsen Melikyan Date: Sat, 22 Aug 2015 17:11:44 +0400 Subject: [PATCH 007/134] Fixes info buttons' text in Camper News search results In Camper News search results "more info..." buttons' text changes to "more info.more info...". This commit fixes that. --- server/views/stories/news-nav.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/views/stories/news-nav.jade b/server/views/stories/news-nav.jade index a3360dd45dc..af3e038143a 100644 --- a/server/views/stories/news-nav.jade +++ b/server/views/stories/news-nav.jade @@ -103,7 +103,7 @@ script. "" + "" + "
" + - "more info.more info... · " + + "more info... · " + rank + (rank > 1 ? " points" : " point") + " · posted " + moment(data[i].timePosted).fromNow() + " by @" + data[i].author.username + From 7fad44e648c318520b929129650f03fcf318071d Mon Sep 17 00:00:00 2001 From: waseem Date: Sat, 22 Aug 2015 22:21:15 +0800 Subject: [PATCH 008/134] Fixed grammar - replaced 'but' with 'by' --- seed/challenges/basic-javascript.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json index ac835890eaa..01144ee96b5 100644 --- a/seed/challenges/basic-javascript.json +++ b/seed/challenges/basic-javascript.json @@ -903,7 +903,7 @@ "tests":[ "assert(typeof(myFunction()) === \"number\", 'The result of myFunction should be a number');", "assert(editor.getValue().match(/Math.random/g), 'You should be using Math.random to create a random number');", - "assert(!(''+myFunction()).match(/\\./g), 'You should have multiplied the result of Math.random but 10 to make it a number that\\'s greater then zero');", + "assert(!(''+myFunction()).match(/\\./g), 'You should have multiplied the result of Math.random by 10 to make it a number that\\'s greater then zero');", "assert(editor.getValue().match(/Math.floor/g), 'You should use Math.floor to remove the decimal part of the number');" ], "challengeSeed":[ From 3ff2fc946c366573d4cecac83de00a394f2df44b Mon Sep 17 00:00:00 2001 From: Isabell Long Date: Sat, 22 Aug 2015 17:19:46 +0100 Subject: [PATCH 009/134] Add missing tags to form element bootstrap waypoint - Fixes #2409. --- seed/challenges/bootstrap.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/bootstrap.json b/seed/challenges/bootstrap.json index 34b54515720..ac60120ba5a 100644 --- a/seed/challenges/bootstrap.json +++ b/seed/challenges/bootstrap.json @@ -1532,7 +1532,7 @@ "difficulty": 2.17, "description": [ "Now let's get your form input and your submission button on the same line. We'll do this the same way we have previously: by using a div element with the class row, and other div elements within it using the col-xs-* class.", - "Nest both your form's text input and submit button within a div with the class row. Nest your form's text input within a div with the class of \"col-xs-7\". Nest your form's submit button in a div with the class col-xs-5.", + "Nest both your form's text input and submit button within a div with the class row. Nest your form's text input within a div with the class of col-xs-7. Nest your form's submit button in a div with the class col-xs-5.", "This is the last challenge we'll do for our Cat Photo App for now. We hope you've enjoyed learning Font Awesome, Bootstrap, and responsive design!" ], "tests": [ From a816dc5a19ac3ea8240c61df55b0a92a1d75627d Mon Sep 17 00:00:00 2001 From: Isabell Long Date: Sat, 22 Aug 2015 18:06:24 +0100 Subject: [PATCH 010/134] Add periods at the end of sentences in the Random Whole Number waypoint - Partially fixes #1991. --- seed/challenges/basic-javascript.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json index ac835890eaa..2558381f3fd 100644 --- a/seed/challenges/basic-javascript.json +++ b/seed/challenges/basic-javascript.json @@ -894,11 +894,11 @@ "difficulty":"9.9828", "description":[ "It's great that we can create random decimal numbers, but it's even more useful if we use it to generate a random whole number.", - "To achieve this we can multiply the random number by ten and use the Math.floor() to convert the decimal number to a whole number", - "This technique gives us a whole number between zero and nine", + "To achieve this we can multiply the random number by ten and use the Math.floor() to convert the decimal number to a whole number.", + "This technique gives us a whole number between zero and nine.", "Example:", "Math.floor(Math.random()*10);", - "Let's give this technique a go now" + "Let's give this technique a go now." ], "tests":[ "assert(typeof(myFunction()) === \"number\", 'The result of myFunction should be a number');", From ab35e566616fdefe5e1f25219c55fde75d385ddb Mon Sep 17 00:00:00 2001 From: Isabell Long Date: Sat, 22 Aug 2015 18:39:07 +0100 Subject: [PATCH 011/134] Target Parent jQuery: elements => element because we reference only one - Partially fixes #2392. --- seed/challenges/jquery.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/jquery.json b/seed/challenges/jquery.json index aecaf645a68..e3ed5de8164 100644 --- a/seed/challenges/jquery.json +++ b/seed/challenges/jquery.json @@ -617,7 +617,7 @@ "title": "Target the Parent of an Element Using jQuery", "difficulty": 3.13, "description": [ - "Every HTML elements has a parent element from which it inherits properties.", + "Every HTML element has a parent element from which it inherits properties.", "For example, your jQuery Playground h3 element has the parent element of <div class=\"container-fluid\">, which itself has the parent body.", "jQuery has a function called parent() that allows you to access the parent of whichever element you've selected.", "Give the parent of the #target1 element background-color of red.", From 3d818147a5e709af880503052113c8079105e717 Mon Sep 17 00:00:00 2001 From: Isabell Long Date: Sat, 22 Aug 2015 18:51:21 +0100 Subject: [PATCH 012/134] Spans for Inline Elements: remove "grow" as we already said "fill" - Fixes #2332. --- seed/challenges/bootstrap.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/bootstrap.json b/seed/challenges/bootstrap.json index ac60120ba5a..4211392b8a0 100644 --- a/seed/challenges/bootstrap.json +++ b/seed/challenges/bootstrap.json @@ -893,7 +893,7 @@ "title": "Use Spans for Inline Elements", "difficulty": 2.105, "description": [ - "You can use use spans to create inline elements. Remember when we used the btn-block class to make the button grow fill the entire row?", + "You can use use spans to create inline elements. Remember when we used the btn-block class to make the button fill the entire row?", "This image illustrates the difference between inline elements and block-level elements:", "\"An", "By using the span element, you can put several elements together, and even style different parts of the same element differently.", From e9050290eb17ac8f237a1173e5ad4b7c67a399df Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Sat, 22 Aug 2015 11:42:11 -0700 Subject: [PATCH 013/134] remove now unnecessary jquery functions --- public/js/main_0.0.3.js | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/public/js/main_0.0.3.js b/public/js/main_0.0.3.js index 35f34fbde3f..e52469bb2ce 100644 --- a/public/js/main_0.0.3.js +++ b/public/js/main_0.0.3.js @@ -242,20 +242,6 @@ $(document).ready(function() { window.location = '/challenges/' + (parseInt(l[l.length - 1]) + 1); }); - // Bonfire instructions functions - $('#more-info').unbind('click'); - $('#more-info').on('click', function() { - ga('send', 'event', 'Challenge', 'more-info', challengeName); - $('#brief-instructions').hide(); - $('#long-instructions').show().removeClass('hide'); - - }); - $('#less-info').unbind('click'); - $('#less-info').on('click', function() { - $('#brief-instructions').show(); - $('#long-instructions').hide(); - }); - $('#complete-courseware-dialog').on('hidden.bs.modal', function() { editor.focus(); }); From cd4823de76686a4b12948f070f5f0113ea01413f Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Sat, 22 Aug 2015 11:42:27 -0700 Subject: [PATCH 014/134] comment out a line that was causing JavaScript errors --- public/js/lib/coursewares/coursewaresHCJQFramework_0.1.9.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.9.js b/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.9.js index 658fbee226b..137425f318e 100644 --- a/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.9.js +++ b/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.9.js @@ -200,7 +200,7 @@ codeStorage.isAlive = function() { (val && val.length > 0); } codeStorage.updateStorage = function(){ - document.getElementById('scroll-locker').dispatchEvent(new CustomEvent('previewUpdateSpy', {'detail': $('.scroll-locker').scrollTop()})); + //document.getElementById('scroll-locker').dispatchEvent(new CustomEvent('previewUpdateSpy', {'detail': $('.scroll-locker').scrollTop()})); if(typeof(Storage) !== undefined) { var value = editor.getValue(); localStorage.setItem(codeStorage.keyValue, value); From 73eb6ec2d17d006d51d52aec53d0bb1405217b67 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Sat, 22 Aug 2015 12:10:08 -0700 Subject: [PATCH 015/134] kind of got the modals working - Ben will finish this --- .../coursewaresHCJQFramework_0.1.9.js | 4 +- .../coursewaresJSFramework_0.0.6.js | 1 - public/js/main_0.0.3.js | 62 ++----------------- server/views/partials/challenge-modals.jade | 4 +- 4 files changed, 8 insertions(+), 63 deletions(-) diff --git a/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.9.js b/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.9.js index 137425f318e..89dc0d9dd6e 100644 --- a/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.9.js +++ b/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.9.js @@ -198,9 +198,8 @@ codeStorage.isAlive = function() { return val !== 'null' && val !== 'undefined' && (val && val.length > 0); -} +}; codeStorage.updateStorage = function(){ - //document.getElementById('scroll-locker').dispatchEvent(new CustomEvent('previewUpdateSpy', {'detail': $('.scroll-locker').scrollTop()})); if(typeof(Storage) !== undefined) { var value = editor.getValue(); localStorage.setItem(codeStorage.keyValue, value); @@ -257,7 +256,6 @@ editor.setValue(editorValue.replace((/fccss/gi), '')); updatePreview(); codeStorage.updateStorage(); diff --git a/public/js/lib/coursewares/coursewaresJSFramework_0.0.6.js b/public/js/lib/coursewares/coursewaresJSFramework_0.0.6.js index ce34d777beb..ddeb9519f40 100644 --- a/public/js/lib/coursewares/coursewaresJSFramework_0.0.6.js +++ b/public/js/lib/coursewares/coursewaresJSFramework_0.0.6.js @@ -330,7 +330,6 @@ codeStorage.isAlive = function() { (val && val.length > 0); } codeStorage.updateStorage = function(){ - document.getElementById('scroll-locker').dispatchEvent(new CustomEvent('previewUpdateSpy', {'detail': $('.scroll-locker').scrollTop()})); if(typeof(Storage) !== undefined) { var value = editor.getValue(); localStorage.setItem(codeStorage.keyValue, value); diff --git a/public/js/main_0.0.3.js b/public/js/main_0.0.3.js index e52469bb2ce..cd126faaf68 100644 --- a/public/js/main_0.0.3.js +++ b/public/js/main_0.0.3.js @@ -59,44 +59,11 @@ $(document).ready(function() { function reBindModals(){ - $('#i-want-help').unbind('click'); - $('#i-want-help').on('click', function() { - $('#help-modal').modal('hide'); - var editorValue = editor.getValue(); - var currentLocation = window.location.href; - $.post( - '/get-help', - { - payload: { - code: editorValue, - challenge: currentLocation - } - }, - function(res) { - if (res) { - window.open('https://gitter.im/FreeCodeCamp/Help', '_blank') - } - } - ); - }); - - $('#i-want-help-editorless').unbind('click'); - $('#i-want-help-editorless').on('click', function() { - $('#help-editorless-modal').modal('hide'); - var currentLocation = window.location.href; - $.post( - '/get-help', - { - payload: { - challenge: currentLocation - } - }, - function(res) { - if (res) { - window.open('https://gitter.im/FreeCodeCamp/Help', '_blank') - } - } - ); + $('.close-modal').unbind('click'); + $('.close-modal').on('click', function(){ + setTimeout(function() { + $('#issue-modal').modal('hide'); + }, 2000); }); $('#report-issue').unbind('click'); @@ -105,25 +72,6 @@ $(document).ready(function() { window.open('https://github.com/freecodecamp/freecodecamp/issues/new?&body=Challenge '+ window.location.href +' has an issue. Please describe how to reproduce it, and include links to screenshots if possible.', '_blank') }); - $('#i-want-help').unbind('click'); - $('#i-want-to-pair').on('click', function() { - $('#pair-modal').modal('hide'); - var currentLocation = window.location.href; - $.post( - '/get-pair', - { - payload: { - challenge: currentLocation - } - }, - function(res) { - if (res) { - window.open('https://gitter.im/FreeCodeCamp/LetsPair', '_blank') - } - } - ); - }); - $('#completed-courseware').unbind('click'); $('#completed-courseware').on('click', function() { $('#complete-courseware-dialog').modal('show'); diff --git a/server/views/partials/challenge-modals.jade b/server/views/partials/challenge-modals.jade index 399cb4aab19..4046a74c544 100644 --- a/server/views/partials/challenge-modals.jade +++ b/server/views/partials/challenge-modals.jade @@ -30,11 +30,11 @@ a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') × .modal-body.text-center h3 Remember to use   - a(href='//github.com/FreeCodeCamp/freecodecamp/wiki/How-to-get-help-when-you-get-stuck' target='_blank') Read-Search-Ask + a(href='//github.com/FreeCodeCamp/freecodecamp/wiki/How-to-get-help-when-you-get-stuck', target='_blank') Read-Search-Ask | . h3 If you've already read the errors and searched Google, you should ask for help. h3 This will take you to our help room. - a.btn.btn-lg.btn-primary.btn-block(href='https://gitter.im/FreeCodeCamp/help', data-dismiss='modal', aria-hidden='true' target='_blank') Take me to the help room + a.btn.btn-lg.btn-primary.btn-block.close-modal(href='https://gitter.im/FreeCodeCamp/help', target='_blank') Take me to the help room a.btn.btn-lg.btn-info.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Cancel #reset-modal.modal(tabindex='-1') From 1206655940936a0c827d83d53fb755c24916f97e Mon Sep 17 00:00:00 2001 From: Isabell Long Date: Sat, 22 Aug 2015 20:26:36 +0100 Subject: [PATCH 016/134] In the while loop iterator section, advise while loops, not for loops - Fixes #2504. --- seed/challenges/basic-javascript.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json index 687b271a4f6..153b461e73d 100644 --- a/seed/challenges/basic-javascript.json +++ b/seed/challenges/basic-javascript.json @@ -843,7 +843,7 @@ "  ourArray.push(i);", "  i++;", "}", - "Let's try getting a for loop to work by pushing values to an array." + "Let's try getting a while loop to work by pushing values to an array." ], "tests":[ "assert(editor.getValue().match(/while/g), 'You should be using a while loop for this.');", From 99f285d2e499b1245b78ae64f117e8d7335cf7d7 Mon Sep 17 00:00:00 2001 From: ahstro Date: Sat, 22 Aug 2015 22:37:47 +0200 Subject: [PATCH 017/134] Added CONTRIBUTING.md --- CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000000..78e8e395da3 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,2 @@ +We're getting a lot of duplicate issues and bug reports that just aren't reporting actual bugs. +So, before you submit your issue, please read the [Help! I've Found a Bug](https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/Help!-I've-Found-a-Bug) wiki page. From c35fde061df7652a1043e3bf85baa84404fa8c27 Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Sat, 22 Aug 2015 22:51:48 +0100 Subject: [PATCH 018/134] Fixed help modal part 2 --- public/js/main_0.0.3.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/js/main_0.0.3.js b/public/js/main_0.0.3.js index cd126faaf68..a22435b8985 100644 --- a/public/js/main_0.0.3.js +++ b/public/js/main_0.0.3.js @@ -62,8 +62,8 @@ $(document).ready(function() { $('.close-modal').unbind('click'); $('.close-modal').on('click', function(){ setTimeout(function() { - $('#issue-modal').modal('hide'); - }, 2000); + $('#help-modal').modal('hide'); + }, 200); }); $('#report-issue').unbind('click'); From e87913edad7c6cb421b330b39b4b269a7064a2a7 Mon Sep 17 00:00:00 2001 From: Abhisek Pattnaik Date: Sun, 23 Aug 2015 03:22:05 +0530 Subject: [PATCH 019/134] Fix Add your JavaScript Slot Machine Instructions --- seed/challenges/basic-javascript.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json index 687b271a4f6..d12c94a6f31 100644 --- a/seed/challenges/basic-javascript.json +++ b/seed/challenges/basic-javascript.json @@ -1277,8 +1277,8 @@ "description":[ "Now that our slots will each generate random numbers, we need to check whether they've all returned the same number.", "If they have, we should notify our user that they've won.", - "Otherwise, we should return null, which is a JavaScript data structure that means nothing.", - "If all three numbers match, we should change the value of win to the number that we have three of or leave it as null.", + "Otherwise, we should return null, which is a JavaScript literal representing null or an "empty" value, i.e. no object value is present.", + "If all three numbers match, we should return the number that we have in three of slots or leave it as null.", "Let's create an if statement with multiple conditions in order to check whether all numbers are equal.", "if(slotOne !== slotTwo || slotTwo !== slotThree){", "  return(null);", From 3b6da88e7f2a7faa55c1944489cb501d5f7bd814 Mon Sep 17 00:00:00 2001 From: Abhisek Pattnaik Date: Sun, 23 Aug 2015 03:26:20 +0530 Subject: [PATCH 020/134] Fix error in string --- seed/challenges/basic-javascript.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json index d12c94a6f31..5ee5ee83d78 100644 --- a/seed/challenges/basic-javascript.json +++ b/seed/challenges/basic-javascript.json @@ -1277,7 +1277,7 @@ "description":[ "Now that our slots will each generate random numbers, we need to check whether they've all returned the same number.", "If they have, we should notify our user that they've won.", - "Otherwise, we should return null, which is a JavaScript literal representing null or an "empty" value, i.e. no object value is present.", + "Otherwise, we should return null, which is a JavaScript literal representing null or an \"empty\" value, i.e. no object value is present.", "If all three numbers match, we should return the number that we have in three of slots or leave it as null.", "Let's create an if statement with multiple conditions in order to check whether all numbers are equal.", "if(slotOne !== slotTwo || slotTwo !== slotThree){", From a1cd8c8720412c6eee771d2d7fa84e33e8cf9aee Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Sat, 22 Aug 2015 14:58:59 -0700 Subject: [PATCH 021/134] update the fcc-footer style slightly --- public/css/main.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/css/main.less b/public/css/main.less index 2deec50cca7..45cd2daed40 100644 --- a/public/css/main.less +++ b/public/css/main.less @@ -683,9 +683,9 @@ thead { margin-right: 0px; padding-left: 10px; padding-right: 10px; + padding-top: 14px; + padding-bottom: 12px; &:hover { - padding-top: 14px; - padding-bottom: 12px; color: #4a2b0f; background-color: #eee; text-decoration: none; From 38397fa5f76ff87d953aeb08e73af70b1e8cf29e Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Sat, 22 Aug 2015 23:18:10 +0100 Subject: [PATCH 022/134] Fixed help modal part 3: the modal strikes back --- public/js/main_0.0.3.js | 2 +- server/views/partials/challenge-modals.jade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/js/main_0.0.3.js b/public/js/main_0.0.3.js index a22435b8985..8a72664bbf7 100644 --- a/public/js/main_0.0.3.js +++ b/public/js/main_0.0.3.js @@ -62,7 +62,7 @@ $(document).ready(function() { $('.close-modal').unbind('click'); $('.close-modal').on('click', function(){ setTimeout(function() { - $('#help-modal').modal('hide'); + $('.close-modal').parent().parent().parent().parent().modal('hide'); }, 200); }); diff --git a/server/views/partials/challenge-modals.jade b/server/views/partials/challenge-modals.jade index 4046a74c544..21244c383d8 100644 --- a/server/views/partials/challenge-modals.jade +++ b/server/views/partials/challenge-modals.jade @@ -9,7 +9,7 @@ a(href='//github.com/FreeCodeCamp/freecodecamp/wiki/How-to-install-Screenhero' target='_blank') Screenhero | . h3 Other campers may then message you about pair programming. - a.btn.btn-lg.btn-primary.btn-block(href='https://gitter.im/FreeCodeCamp/LetsPair', data-dismiss='modal', aria-hidden='true' target='_blank') Take me to the pair programming room + a.btn.btn-lg.btn-primary.btn-block.close-modal(href='https://gitter.im/FreeCodeCamp/LetsPair', target='_blank') Take me to the pair programming room a.btn.btn-lg.btn-info.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Cancel #issue-modal.modal(tabindex='-1') From 9ae92c92b2a55de23307dfb6016adfbbcaa9cb82 Mon Sep 17 00:00:00 2001 From: Isabell Long Date: Sat, 22 Aug 2015 22:36:51 +0100 Subject: [PATCH 023/134] Target Even Numbered Elements: consistently use double quotes - Fixes #2528. --- seed/challenges/jquery.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/jquery.json b/seed/challenges/jquery.json index e3ed5de8164..8576e4bc0de 100644 --- a/seed/challenges/jquery.json +++ b/seed/challenges/jquery.json @@ -786,7 +786,7 @@ "difficulty": 3.16, "description": [ "You can also target all the even-numbered elements.", - "Here's how you would target all the odd-numbered elements with class target and give them classes: $('.target:odd').addClass('animated shake');", + "Here's how you would target all the odd-numbered elements with class target and give them classes: $(\".target:odd\").addClass(\"animated shake\");", "Try selecting all the even-numbered elements - that is, what your browser will consider even-numbered elements - and giving them the classes of animated and shake." ], "tests": [ From ebf1530d6fb5af835c4708fc0aa5aeeb5cb340b1 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Sat, 22 Aug 2015 17:40:59 -0700 Subject: [PATCH 024/134] update JavaScript copy from pull request --- seed/challenges/basic-javascript.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json index 5ee5ee83d78..cf16fb13dbb 100644 --- a/seed/challenges/basic-javascript.json +++ b/seed/challenges/basic-javascript.json @@ -1277,8 +1277,8 @@ "description":[ "Now that our slots will each generate random numbers, we need to check whether they've all returned the same number.", "If they have, we should notify our user that they've won.", - "Otherwise, we should return null, which is a JavaScript literal representing null or an \"empty\" value, i.e. no object value is present.", - "If all three numbers match, we should return the number that we have in three of slots or leave it as null.", + "Otherwise, we should return null, which is a JavaScript data structure that means nothing.", + "If all three numbers match, we should return the number that we have in three of slots or leave it as null.", "Let's create an if statement with multiple conditions in order to check whether all numbers are equal.", "if(slotOne !== slotTwo || slotTwo !== slotThree){", "  return(null);", From cbb0397dae3c56e9ed5b68df708922663d05ad58 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Sat, 22 Aug 2015 17:44:53 -0700 Subject: [PATCH 025/134] replace evernote links with more reliable imgur links --- seed/challenges/bootstrap.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/seed/challenges/bootstrap.json b/seed/challenges/bootstrap.json index 4211392b8a0..3f4d258a476 100644 --- a/seed/challenges/bootstrap.json +++ b/seed/challenges/bootstrap.json @@ -347,7 +347,7 @@ "description": [ "Normally, your button elements are only as wide as the text that they contain. By making them block elements, your button will stretch to fill your page's entire horizontal space.", "This image illustrates the difference between inline elements and block-level elements:", - "\"An", + "\"An", "Note that these buttons still need the btn class.", "Add Bootstrap's btn-block class to your Bootstrap button." ], @@ -700,7 +700,7 @@ "description": [ "Bootstrap uses a responsive grid system, which makes it easy to put elements into rows and specify each element's relative width. Most of Bootstrap's classes can be applied to a div element.", "Here's a diagram of how Bootstrap's 12-column grid layout works:", - "", + "\"an", "Note that in this illustration, the col-md-* class is being used. Here, md means medium, and * is a number specifying how many columns wide the element should be. In this case, the column width of an element on a medium-sized screen, such as a laptop, is being specified.", "In the Cat Photo App that we're building, we'll use col-xs-*, where xs means extra small (like an extra-small mobile phone screen), and * is the number of columns specifying how many columns wide the element should be.", "Put the Like, Info and Delete buttons side-by-side by nesting all three of them within one <div class=\"row\"> element, then each of them within a <div class=\"col-xs-4\"> element.", @@ -895,7 +895,7 @@ "description": [ "You can use use spans to create inline elements. Remember when we used the btn-block class to make the button fill the entire row?", "This image illustrates the difference between inline elements and block-level elements:", - "\"An", + "\"An", "By using the span element, you can put several elements together, and even style different parts of the same element differently.", "Nest the word \"love\" in your \"Things cats love\" element below within a span element. Then give that span the class text-danger to make the text red.", "Here's how you would do this with the \"Top 3 things cats hate\" element: <p>Top 3 things cats <span class = \"text-danger\">hate</span></p>" @@ -997,7 +997,7 @@ "We will make a simple heading for our Cat Photo App by putting them in the same row.", "Remember, Bootstrap uses a responsive grid system, which makes it easy to put elements into rows and specify each element's relative width. Most of Bootstrap's classes can be applied to a div element.", "Here's a diagram of how Bootstrap's 12-column grid layout works:", - "", + "\"an", "Note that in this illustration, the col-md-* class is being used. Here, md means medium, and * is a number specifying how many columns wide the element should be. In this case, the column width of an element on a medium-sized screen, such as a laptop, is being specified.", "In the Cat Photo App that we're building, we'll use col-xs-*, where xs means extra small (like an extra-small mobile phone screen), and * is the number of columns specifying how many columns wide the element should be.", "Nest your first image and your h2 element within a single <div class=\"row\"> element. Nest your h2 text within a <div class=\"col-xs-8\"> and your image in a <div class=\"col-xs-4\"> so that they are on the same line.", From 0107ec60064a3d1b762c094c971b419e4f1a4500 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Sat, 22 Aug 2015 17:47:52 -0700 Subject: [PATCH 026/134] replace other images with imgur images and turn one image into a code snippet --- seed/challenges/html5-and-css.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/seed/challenges/html5-and-css.json b/seed/challenges/html5-and-css.json index b93a1de494b..0949a05d518 100644 --- a/seed/challenges/html5-and-css.json +++ b/seed/challenges/html5-and-css.json @@ -428,8 +428,12 @@ "description": [ "Create a CSS class called red-text and apply it to your h2 element.", "Classes are reusable styles that can be added to HTML elements.", - "Here's the anatomy of a CSS class:", - "\"a", + "Here's an example CSS class declaration:", + "<style>", + "  .blue-text {", + "    color: blue;", + "  }", + "</style>", "You can see that we've created a CSS class called blue-text within the <style> tag.", "You can apply a class to an HTML element like this: <h2 class=\"blue-text\">CatPhotoApp</h2>.", "Note that in your CSS style element, classes should start with a period. In your HTML elements' class declarations, classes shouldn't start with a period.", @@ -1056,7 +1060,7 @@ "description": [ "a elements, also known as anchor elements, are used to link to content outside of the current page.", "Here's a diagram of an a element. In this case, the a element is used in the middle of a paragraph element, which means the link will appear in the middle of a sentence.", - "\"a", + "\"a", "Here's an example: <p>Here's a <a href=\"http://freecodecamp.com\"> link to Free Code Camp</a> for you to follow.</p>.", "Create an a element that links to http://catphotoapp.com and has \"cat photos\" as its anchor text." ], @@ -1126,7 +1130,7 @@ "difficulty": 1.23, "description": [ "Again, here's a diagram of an a element for your reference:", - "\"a", + "\"a", "Here's an example: <p>Here's a <a href=\"http://freecodecamp.com\"> link to Free Code Camp</a> for you to follow.</p>.", "Nesting just means putting one element inside of another element.", "Now nest your a element within a new p element so that the surrounding paragraph says \"click here for cat photos\", but where only \"cat photos\" is a link, and the rest of the text is rest is plain text." From 4cc423e488892c4d7b010cd21051db7eb1c33ff0 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Sat, 22 Aug 2015 18:07:29 -0700 Subject: [PATCH 027/134] possibly fix issue with bootstrap wells challenge --- seed/challenges/bootstrap.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/bootstrap.json b/seed/challenges/bootstrap.json index 3f4d258a476..6710afb1293 100644 --- a/seed/challenges/bootstrap.json +++ b/seed/challenges/bootstrap.json @@ -1770,7 +1770,7 @@ ], "tests": [ "assert($(\"div\").length > 4, 'Add a div element with the class well inside each of your div class=\"col-xs-6\"> elements')", - "assert($(\"div.col-xs-6\").children(\"div.well\").length > 1, 'Nest both of your div class=\"col-xs-6\" elements within your div class=\"row\" element.')", + "assert($(\"div.col-xs-6 div.well\").length > 1, 'Nest both of your div class=\"col-xs-6\" elements within your div class=\"row\" element.')", "assert(editor.match(/<\\/div>/g) && editor.match(/
/g).length === editor.match(/
div elements have closing tags.')" ], "challengeSeed": [ From fa31b38083419d45f28d3fc90a85f81d9034c91f Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Sat, 22 Aug 2015 22:09:49 -0700 Subject: [PATCH 028/134] Update README.md Added some additional steps for getting started with the repo --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index d62477d7bde..bf1b7a6679d 100644 --- a/README.md +++ b/README.md @@ -66,6 +66,8 @@ bower install # Create a .env file and populate it with the necessary API keys and secrets: touch .env +# Install Gulp globally +npm install -g gulp ``` Edit your .env file with the following API keys accordingly (if you only use email login, only the MONGOHQ_URL, SESSION_SECRET, MANDRILL_USER and MANDRILL_PASSWORD fields are necessary. Keep in mind if you want to use more services you'll have to get your own API keys for those services. @@ -112,6 +114,11 @@ DEBUG=true # Start the mongo server mongod +# Create your mongo database. +Type "mongo" in your terminal to access the mongo shell +run this command: use freecodecamp +then quit with control+d + # Seed your database with the challenges node seed/ From a6175aa47a6180646b4277cecfb2c3279c9328a6 Mon Sep 17 00:00:00 2001 From: Ben Schenker Date: Sun, 23 Aug 2015 07:19:21 +0000 Subject: [PATCH 029/134] Fix Link to Bug Reporting Guidelines in Contributing.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 78e8e395da3..ba4e245107f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,2 +1,2 @@ We're getting a lot of duplicate issues and bug reports that just aren't reporting actual bugs. -So, before you submit your issue, please read the [Help! I've Found a Bug](https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/Help!-I've-Found-a-Bug) wiki page. +So, before you submit your issue, please read the [Help I've Found a Bug](https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/Help-I've-Found-a-Bug) wiki page. From 7b53607492b6a767392976a12042b383614248d6 Mon Sep 17 00:00:00 2001 From: Aryan Jabbari Date: Sun, 23 Aug 2015 03:42:42 -0400 Subject: [PATCH 030/134] Fixes #1950 using @benschenker's suggested text. --- .../challenges/object-oriented-and-functional-programming.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/seed/challenges/object-oriented-and-functional-programming.json b/seed/challenges/object-oriented-and-functional-programming.json index c49dd082d8e..601ae4cc6f5 100644 --- a/seed/challenges/object-oriented-and-functional-programming.json +++ b/seed/challenges/object-oriented-and-functional-programming.json @@ -180,7 +180,8 @@ "  return(val+1);", "});", "", - "The map method is one of the easiest ways to iterate through an array or object there is. Let's use it now." + "The map method is one of the easiest ways to iterate through an array or object there is. Let's use it now.", + "Use the map function to add 3 to every value in the variable `array`" ], "tests":[ "assert.deepEqual(array, [4,5,6,7,8], 'You should have added three to each value in the array');", From 2d3c0c27802b8ad44a0b10817aa940a7e055dd02 Mon Sep 17 00:00:00 2001 From: Aryan Jabbari Date: Sun, 23 Aug 2015 03:47:13 -0400 Subject: [PATCH 031/134] Deleted tab --- seed/challenges/object-oriented-and-functional-programming.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/object-oriented-and-functional-programming.json b/seed/challenges/object-oriented-and-functional-programming.json index 601ae4cc6f5..a60fc9fa91c 100644 --- a/seed/challenges/object-oriented-and-functional-programming.json +++ b/seed/challenges/object-oriented-and-functional-programming.json @@ -181,7 +181,7 @@ "});", "", "The map method is one of the easiest ways to iterate through an array or object there is. Let's use it now.", - "Use the map function to add 3 to every value in the variable `array`" + "Use the map function to add 3 to every value in the variable `array`" ], "tests":[ "assert.deepEqual(array, [4,5,6,7,8], 'You should have added three to each value in the array');", From a8e3af20b07737796b2ccc15261178af28935529 Mon Sep 17 00:00:00 2001 From: Aryan Jabbari Date: Sun, 23 Aug 2015 05:03:52 -0400 Subject: [PATCH 032/134] Replaced backticks with --- seed/challenges/object-oriented-and-functional-programming.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/object-oriented-and-functional-programming.json b/seed/challenges/object-oriented-and-functional-programming.json index a60fc9fa91c..97d277c0035 100644 --- a/seed/challenges/object-oriented-and-functional-programming.json +++ b/seed/challenges/object-oriented-and-functional-programming.json @@ -181,7 +181,7 @@ "});", "", "The map method is one of the easiest ways to iterate through an array or object there is. Let's use it now.", - "Use the map function to add 3 to every value in the variable `array`" + "Use the map function to add 3 to every value in the variable array" ], "tests":[ "assert.deepEqual(array, [4,5,6,7,8], 'You should have added three to each value in the array');", From ba0ff4060446a7556dd264ea80766fd4e1e5c4e6 Mon Sep 17 00:00:00 2001 From: Aryan Jabbari Date: Sun, 23 Aug 2015 05:19:45 -0400 Subject: [PATCH 033/134] Fixed #1876; fixed some grammar issues; adhered to JS comment conventions --- seed/challenges/basic-javascript.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json index 5aeecfdae6d..5f6c1885553 100644 --- a/seed/challenges/basic-javascript.json +++ b/seed/challenges/basic-javascript.json @@ -670,8 +670,8 @@ "function functionName (a, b) {", "  return(a + b);", "}", - "We can \"call\" our function like this: functionName();, and it will run and return it's return value to us.", - "Create and call a function called myFunction." + "We can \"call\" our function like this: functionName();, and it will run and return its return value to us.", + "Create and call a function called myFunction that returns the sum of a and b." ], "tests":[ "assert((function(){if(typeof(f) !== \"undefined\" && typeof(f) === \"number\" && f === a + b && editor.getValue().match(/return/gi).length >= 1 && editor.getValue().match(/a/gi).length >= 1 && editor.getValue().match(/b/gi).length >= 1 && editor.getValue().match(/\\+/gi).length >= 1){return(true);}else{return(false);}})(), 'Your function should return the value of a + b');" @@ -684,9 +684,9 @@ " return a - b;", "};", "", - "//Don't modify above this line", - "//Create a function called myFunction that returns the value of a plus b.", - " // Only change code below this line.", + "// Don't modify above this line", + "// Create a function called myFunction that returns the value of a plus b.", + "// Only change code below this line.", "", "", "", From 7d1398d01db724399709ae2500e376aab7ca5d44 Mon Sep 17 00:00:00 2001 From: dokkillo Date: Sun, 23 Aug 2015 12:14:03 +0200 Subject: [PATCH 034/134] issue 2308 --- seed/challenges/bootstrap.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/bootstrap.json b/seed/challenges/bootstrap.json index 610919a2825..c8fa530760f 100644 --- a/seed/challenges/bootstrap.json +++ b/seed/challenges/bootstrap.json @@ -177,7 +177,7 @@ "difficulty": 2.03, "description": [ "Now that we're using Bootstrap, we can center our heading elements to make them look better. All we need to do is add the class text-center to our h1 and h2 elements.", - "Remember that you can add several classes to the same element by separating each of them with a space, like this: <h2 class=\"text-red text-center\">your text</h2>." + "Remember that you can add several classes to the same element by separating each of them with a space, like this: <h2 class=\"red-text text-center\">your text</h2>." ], "tests": [ "assert($(\"h2\").hasClass(\"text-center\"), 'Your h2 element should be centered by applying the class text-center')" From e960cbd9b103b05b113905930cc0d561dfe6612f Mon Sep 17 00:00:00 2001 From: Arsen Melikyan Date: Sun, 23 Aug 2015 16:38:38 +0400 Subject: [PATCH 035/134] Fixes a typo #2311 --- seed/challenges/html5-and-css.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/html5-and-css.json b/seed/challenges/html5-and-css.json index e5e376317d3..6067e2bb1e3 100644 --- a/seed/challenges/html5-and-css.json +++ b/seed/challenges/html5-and-css.json @@ -3281,7 +3281,7 @@ "Let's override your pink-text and blue-text classes, and make your h1 element orange, by giving the h1 element an id and then styling that id.", "Give your h1 element the id attribute of orange-text. Remember, id styles look like this: <h1 id=\"orange-text\">", "Leave the blue-text and pink-text classes on your h1 element.", - "Create a CSS declaration for your orange-text id in your style element. Here's and example of what this looks like: #brown-text { color: brown; }" + "Create a CSS declaration for your orange-text id in your style element. Here's an example of what this looks like: #brown-text { color: brown; }" ], "tests": [ "assert($(\"h1\").hasClass(\"pink-text\"), 'Your h1 element should have the class pink-text.')", From d85eded058b0f202c0333fead3987978a31eb2b5 Mon Sep 17 00:00:00 2001 From: Isabell Long Date: Sun, 23 Aug 2015 13:51:13 +0100 Subject: [PATCH 036/134] Consistently capitalize GitHub in the account settings text MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Also remove the capital D from Delete in the confirmation line—it's not the start of a sentence. --- server/views/account/account.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/views/account/account.jade b/server/views/account/account.jade index e6a8c961dfd..d4d00c46ce9 100644 --- a/server/views/account/account.jade +++ b/server/views/account/account.jade @@ -14,7 +14,7 @@ block content else a.btn.btn-lg.btn-block.btn-github.btn-link-social(href='/link/github') i.fa.fa-github - | Update my profile from Github + | Update my profile from GitHub if (!user.twitter) .col-xs-12 @@ -72,4 +72,4 @@ block content input(type='hidden', name='_csrf', value=_csrf) button.btn.btn-danger.btn-block(type='submit') span.ion-trash-b - | Yes, Delete my account + | Yes, delete my account From 84f976c0d85105bda95908fad1855f83719ba868 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Sun, 23 Aug 2015 08:18:40 -0700 Subject: [PATCH 037/134] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index bf1b7a6679d..dba50135403 100644 --- a/README.md +++ b/README.md @@ -115,9 +115,9 @@ DEBUG=true mongod # Create your mongo database. -Type "mongo" in your terminal to access the mongo shell -run this command: use freecodecamp -then quit with control+d +# Type "mongo" in your terminal to access the mongo shell +use freecodecamp +# Exit the mongo shell with control + d # Seed your database with the challenges node seed/ From 2cc09ce374e04965dadec43bec0732528ac5221f Mon Sep 17 00:00:00 2001 From: suhussai Date: Sun, 23 Aug 2015 12:20:28 -0600 Subject: [PATCH 038/134] Typo Fix. Closes #2592 Changed "greater then" to "greater than" in Waypoint 30, http://freecodecamp.com/challenges/waypoint-generate-random-whole-numbers-with-javascript --- seed/challenges/basic-javascript.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json index 5aeecfdae6d..dd7c322d9d3 100644 --- a/seed/challenges/basic-javascript.json +++ b/seed/challenges/basic-javascript.json @@ -903,7 +903,7 @@ "tests":[ "assert(typeof(myFunction()) === \"number\", 'The result of myFunction should be a number');", "assert(editor.getValue().match(/Math.random/g), 'You should be using Math.random to create a random number');", - "assert(!(''+myFunction()).match(/\\./g), 'You should have multiplied the result of Math.random by 10 to make it a number that\\'s greater then zero');", + "assert(!(''+myFunction()).match(/\\./g), 'You should have multiplied the result of Math.random by 10 to make it a number that\\'s greater than zero');", "assert(editor.getValue().match(/Math.floor/g), 'You should use Math.floor to remove the decimal part of the number');" ], "challengeSeed":[ From ede956e1d654da3097e55361f5e4e83184a06b9b Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Sun, 23 Aug 2015 21:59:29 +0100 Subject: [PATCH 039/134] Merge of the frameworks: an unexpected merge --- public/js/lib/coursewares/commonFrameWork.js | 469 ++++++++++++++++++ .../coursewaresHCJQFramework_0.1.9.js | 280 ----------- .../coursewaresJSFramework_0.0.6.js | 394 --------------- server/views/coursewares/showHTML.jade | 11 +- server/views/coursewares/showJS.jade | 4 +- 5 files changed, 479 insertions(+), 679 deletions(-) create mode 100644 public/js/lib/coursewares/commonFrameWork.js delete mode 100644 public/js/lib/coursewares/coursewaresHCJQFramework_0.1.9.js delete mode 100644 public/js/lib/coursewares/coursewaresJSFramework_0.0.6.js diff --git a/public/js/lib/coursewares/commonFrameWork.js b/public/js/lib/coursewares/commonFrameWork.js new file mode 100644 index 00000000000..a2717ca7e10 --- /dev/null +++ b/public/js/lib/coursewares/commonFrameWork.js @@ -0,0 +1,469 @@ +var editor; +var widgets = []; +editor = CodeMirror.fromTextArea(document.getElementById("codeEditor"), { + lineNumbers: true, + mode: "text", + theme: 'monokai', + runnable: true, + matchBrackets: true, + autoCloseBrackets: true, + scrollbarStyle: 'null', + lineWrapping: true, + gutters: ["CodeMirror-lint-markers"], + onKeyEvent: doLinting +}); + +var myCodeMirror = editor; + +var codeStorage = { + version: 0.01, + keyVersion:"saveVersion", + keyValue: null,//where the value of the editor is saved + updateWait: 2000,// 2 seconds + updateTimeoutId: null, + eventArray: []//for firing saves +}; +codeStorage.hasSaved = function(){ + return ( updateTimeoutId === null ); +}; +codeStorage.onSave = function(func){ + codeStorage.eventArray.push(func); +}; +codeStorage.setSaveKey = function(key){ + codeStorage.keyValue = key + 'Val'; +}; +codeStorage.getEditorValue = function(){ + return ('' + localStorage.getItem(codeStorage.keyValue)); +}; + +codeStorage.isAlive = function() { + var val = this.getEditorValue(); + return val !== 'null' && + val !== 'undefined' && + (val && val.length > 0); +}; +codeStorage.updateStorage = function(){ + if(typeof(Storage) !== undefined) { + var value = editor.getValue(); + localStorage.setItem(codeStorage.keyValue, value); + } else { + var debugging = false; + if( debugging ){ + console.log('no web storage'); + } + } + codeStorage.updateTimeoutId = null; + codeStorage.eventArray.forEach(function(func){ + func(); + }); +}; +(function(){ + var savedVersion = localStorage.getItem('saveVersion'); + if( savedVersion === null ){ + localStorage.setItem(codeStorage.keyVersion, codeStorage.version);//just write current version + }else{ + if( savedVersion !== codeStorage.version ){ + //Update version + } + } +})(); +codeStorage.setSaveKey(challenge_Name); +editor.on('keyup', function(){ + window.clearTimeout(codeStorage.updateTimeoutId); + codeStorage.updateTimeoutId = window.setTimeout(codeStorage.updateStorage, codeStorage.updateWait); +}); +var editorValue; +var challengeSeed = challengeSeed || null; +var tests = tests || []; +var allSeeds = ''; +(function() { + challengeSeed.forEach(function(elem) { + allSeeds += elem + '\n'; + }); +})(); + +function doLinting() { + editor.operation(function() { + for (var i = 0; i < widgets.length; ++i) + editor.removeLineWidget(widgets[i]); + widgets.length = 0; + JSHINT(editor.getValue()); + for (var i = 0; i < JSHINT.errors.length; ++i) { + var err = JSHINT.errors[i]; + if (!err) continue; + var msg = document.createElement("div"); + var icon = msg.appendChild(document.createElement("span")); + icon.innerHTML = "!!"; + icon.className = "lint-error-icon"; + msg.appendChild(document.createTextNode(err.reason)); + msg.className = "lint-error"; + widgets.push(editor.addLineWidget(err.line - 1, msg, { + coverGutter: false, + noHScroll: true + })); + } + }); +} + +/*var defaultKeymap = { + 'Cmd-E': 'emmet.expand_abbreviation', + 'Tab': 'emmet.expand_abbreviation_with_tab', + 'Enter': 'emmet.insert_formatted_line_break_only' + }; + + emmetCodeMirror(editor, defaultKeymap);*/ + +// Hijack tab key to insert two spaces instead +editor.setOption("extraKeys", { + Tab: function(cm) { + if (cm.somethingSelected()){ + cm.indentSelection("add"); + } else { + var spaces = Array(cm.getOption("indentUnit") + 1).join(" "); + cm.replaceSelection(spaces); + } + }, + "Shift-Tab": function(cm) { + if (cm.somethingSelected()){ + cm.indentSelection("subtract"); + } else { + var spaces = Array(cm.getOption("indentUnit") + 1).join(" "); + cm.replaceSelection(spaces); + } + }, + "Ctrl-Enter": function() { + bonfireExecute(); + return false; + } +}); + +editor.setSize("100%", "auto"); + +var libraryIncludes = "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + ""; + + +var editorValueForIFrame; +var iFrameScript = ""; + +var delay; +// Initialize CodeMirror editor with a nice html5 canvas demo. +editor.on("keyup", function () { + clearTimeout(delay); + delay = setTimeout(updatePreview, 300); +}); + +if(typeof prodOrDev !== 'undefined') { + var nodeEnv = prodOrDev === 'production' ? 'http://www.freecodecamp.com' : 'http://localhost:3001'; + + function updatePreview() { + editorValueForIFrame = editor.getValue(); + var failedCommentTest = false; + if (editorValueForIFrame.match(/\<\!\-\-/gi) && editorValueForIFrame.match(/\-\-\>/gi) == null) { + failedCommentTest = true; + } + else if (editorValueForIFrame.match(/\<\!\-\-/gi) && editorValueForIFrame.match(/\<\!\-\-/gi).length > editorValueForIFrame.match(/\-\-\>/gi).length) { + failedCommentTest = true; + } + if (failedCommentTest) { + editor.setValue(editor.getValue() + "-->"); + editorValueForIFrame = editorValueForIFrame + "-->"; + } + goodTests = 0; + var previewFrame = document.getElementById('preview'); + var preview = previewFrame.contentDocument || previewFrame.contentWindow.document; + preview.open(); + preview.write(libraryIncludes + editor.getValue()); + codeStorage.updateStorage(); + preview.close(); + + } + + setTimeout(updatePreview, 300); +} +/** + * "post" methods + */ + +var testResults = []; +var postSuccess = function(data) { + var testDoc = document.createElement("div"); + $(testDoc) + .html("
" + JSON.parse(data) + "
"); + $('#testSuite').append(testDoc); + testSuccess(); +}; + +var postError = function(data) { + var testDoc = document.createElement("div"); + $(testDoc) + .html("
" + JSON.parse(data) + "
"); + $('#testSuite').append(testDoc); +}; +var goodTests = 0; +var testSuccess = function() { + goodTests++; + if (goodTests === tests.length) { + showCompletion(); + } +}; + +function showCompletion() { + var time = Math.floor(Date.now()) - started; + ga('send', 'event', 'Challenge', 'solved', challenge_Name + ', Time: ' + time + + ', Attempts: ' + attempts); + var bonfireSolution = myCodeMirror.getValue(); + var didCompleteWith = $('#completed-with').val() || null; + $.post( + '/completed-bonfire/', { + challengeInfo: { + challengeId: challenge_Id, + challengeName: challenge_Name, + completedWith: didCompleteWith, + challengeType: challengeType, + solution: bonfireSolution + } + }, + function(res) { + if (res) { + $('#complete-courseware-dialog').modal('show'); + $('#complete-courseware-dialog').keydown(function(e) { + if (e.ctrlKey && e.keyCode == 13) { + $('#next-courseware-button').click(); + } + }); + } + } + ); +} + +var resetEditor = function resetEditor() { + editor.setValue(allSeeds.replace((/fccss/gi), '')); + updatePreview(); + codeStorage.updateStorage(); +}; + +var attempts = 0; +if (attempts) { + attempts = 0; +} + +console.log(challengeType); +if(challengeType !== "0") { + var codeOutput = CodeMirror.fromTextArea(document.getElementById("codeOutput"), { + lineNumbers: false, + mode: "text", + theme: 'monokai', + readOnly: 'nocursor', + lineWrapping: true + }); + + codeOutput.setValue('/**\n' + + ' * Your output will go here.\n' + ' * Console.log() -type statements\n' + + ' * will appear in your browser\'s\n' + ' * DevTools JavaScript console.\n' + + ' */'); + codeOutput.setSize("100%", "100%"); +} +var info = editor.getScrollInfo(); +var after = editor.charCoords({ + line: editor.getCursor().line + 1, + ch: 0 +}, "local").top; +if (info.top + info.clientHeight < after) + editor.scrollTo(null, after - info.clientHeight + 3); + +var userTests; +var testSalt = Math.random(); + + +var scrapeTests = function(userJavaScript) { + + // insert tests from mongo + for (var i = 0; i < tests.length; i++) { + userJavaScript += '\n' + tests[i]; + } + + var counter = 0; + var regex = new RegExp( + /(expect(\s+)?\(.*\;)|(assert(\s+)?\(.*\;)|(assert\.\w.*\;)|(.*\.should\..*\;)/ + ); + var match = regex.exec(userJavaScript); + while (match != null) { + var replacement = '//' + counter + testSalt; + userJavaScript = userJavaScript.substring(0, match.index) + replacement + + userJavaScript.substring(match.index + match[0].length); + + if (!userTests) { + userTests = []; + } + userTests.push({ + "text": match[0], + "line": counter, + "err": null + }); + counter++; + match = regex.exec(userJavaScript); + } + + return userJavaScript; +}; + +function removeComments(userJavaScript) { + var regex = new RegExp(/(\/\*[^(\*\/)]*\*\/)|\/\/[^\n]*/g); + return userJavaScript.replace(regex, ''); +} + +function removeLogs(userJavaScript) { + return userJavaScript.replace(/(console\.[\w]+\s*\(.*\;)/g, ''); +} + +var pushed = false; +var createTestDisplay = function() { + if (pushed) { + userTests.pop(); + } + for (var i = 0; i < userTests.length; i++) { + var test = userTests[i]; + var testDoc = document.createElement("div"); + if (test.err != null) { + console.log('Should be displaying bad tests'); + $(testDoc) + .html( + "
" + + test.text + "
" + + test.err + "
") + .appendTo($('#testSuite')); + } else { + $(testDoc) + .html( + "
" + + test.text + "
") + .appendTo($('#testSuite')); + } + }; +}; + +var expect = chai.expect; +var assert = chai.assert; +var should = chai.should(); + + +var reassembleTest = function(test, data) { + var lineNum = test.line; + var regexp = new RegExp("\/\/" + lineNum + testSalt); + return data.input.replace(regexp, test.text); +}; + +var runTests = function(err, data) { + //userTests = userTests ? null : []; + var allTestsPassed = true; + pushed = false; + $('#testSuite').children().remove(); + if (err && userTests.length > 0) { + userTests = [{ + text: "Program Execution Failure", + err: "No user tests were run." + }]; + createTestDisplay(); + } + //Add blocks to test exploits here! + else if(editorValue.match(/if\s\(null\)\sconsole\.log\(1\);/gi)){ + allTestsPassed = false; + userTests = [{ + text: "Program Execution Failure", + err: "Invalid if (null) console.log(1); detected" + }]; + createTestDisplay(); + } + else if (userTests) { + userTests.push(false); + pushed = true; + userTests.forEach(function(chaiTestFromJSON, indexOfTestArray, + __testArray) { + try { + if (chaiTestFromJSON) { + var output = eval(reassembleTest(chaiTestFromJSON, data)); + } + } catch (error) { + allTestsPassed = false; + __testArray[indexOfTestArray].err = error.message; + } finally { + if (!chaiTestFromJSON) { + createTestDisplay(); + } + } + }); + + if (allTestsPassed) { + allTestsPassed = false; + showCompletion(); + } + + } +}; + +function bonfireExecute() { + attempts++; + ga('send', 'event', 'Challenge', 'ran-code', challenge_Name); + userTests = null; + if(challengeType === "0"){ + $('#testSuite').empty(); + + editorValueForIFrame = editor.getValue(); + goodTests = 0; + var previewFrame = document.getElementById('preview'); + var preview = previewFrame.contentDocument || previewFrame.contentWindow.document; + preview.open(); + preview.write(libraryIncludes + editor.getValue() + ""); + codeStorage.updateStorage(); + preview.close(); + } + else { + var userJavaScript = myCodeMirror.getValue(); + var failedCommentTest = false; + if (userJavaScript.match(/\/\*/gi) && userJavaScript.match(/\*\//gi) == null) { + failedCommentTest = true; + } + else if (!failedCommentTest && userJavaScript.match(/\/\*/gi) && userJavaScript.match(/\/\*/gi).length > userJavaScript.match(/\*\//gi).length) { + failedCommentTest = true; + } + userJavaScript = removeComments(userJavaScript); + userJavaScript = scrapeTests(userJavaScript); + // simple fix in case the user forgets to invoke their function + + submit(userJavaScript, function (cls, message) { + if (failedCommentTest) { + myCodeMirror.setValue(myCodeMirror.getValue() + "*/"); + console.log('Caught Unfinished Comment'); + codeOutput.setValue("Unfinished mulit-line comment"); + failedCommentTest = false; + } + else if (cls) { + codeOutput.setValue(message.error); + runTests('Error', null); + } else { + codeOutput.setValue(message.output); + codeOutput.setValue(codeOutput.getValue().replace(/\\\"/gi, '')); + message.input = removeLogs(message.input); + runTests(null, message); + } + }); + } +} + +$('#submitButton').on('click', function() { + bonfireExecute(); +}); + +$(document).ready(function(){ + editorValue = (codeStorage.isAlive())? codeStorage.getEditorValue() : allSeeds; + myCodeMirror.setValue(editorValue); + bonfireExecute(); +}); diff --git a/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.9.js b/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.9.js deleted file mode 100644 index 89dc0d9dd6e..00000000000 --- a/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.9.js +++ /dev/null @@ -1,280 +0,0 @@ -/** - * Created by nathanleniz on 2/2/15. - */ - -var widgets = []; -var editor = CodeMirror.fromTextArea(document.getElementById("codeEditor"), { - lineNumbers: true, - mode: "text/html", - theme: 'monokai', - runnable: true, - matchBrackets: true, - autoCloseBrackets: true, - scrollbarStyle: 'null', - lineWrapping: true, - gutters: ["CodeMirror-lint-markers"], - onKeyEvent: doLinting -}); - -var defaultKeymap = { - 'Cmd-E': 'emmet.expand_abbreviation', - 'Tab': 'emmet.expand_abbreviation_with_tab', - 'Enter': 'emmet.insert_formatted_line_break_only' -}; - -emmetCodeMirror(editor, defaultKeymap); - - -// Hijack tab key to insert two spaces instead -editor.setOption("extraKeys", { - Tab: function(cm) { - if (cm.somethingSelected()){ - cm.indentSelection("add"); - } else { - var spaces = Array(cm.getOption("indentUnit") + 1).join(" "); - cm.replaceSelection(spaces); - } - }, - "Shift-Tab": function(cm) { - if (cm.somethingSelected()){ - cm.indentSelection("subtract"); - } else { - var spaces = Array(cm.getOption("indentUnit") + 1).join(" "); - cm.replaceSelection(spaces); - } - } -}); - -editor.setSize("100%", "auto"); - -var libraryIncludes = "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - ""; - - -var editorValueForIFrame; -var iFrameScript = ""; - -var delay; -// Initialize CodeMirror editor with a nice html5 canvas demo. -editor.on("keyup", function () { - clearTimeout(delay); - delay = setTimeout(updatePreview, 300); -}); - -var nodeEnv = prodOrDev === 'production' ? 'http://www.freecodecamp.com' : 'http://localhost:3001'; -function updatePreview() { - editorValueForIFrame = editor.getValue(); - var failedCommentTest = false; - if(editorValueForIFrame.match(/\<\!\-\-/gi) && editorValueForIFrame.match(/\-\-\>/gi) == null){ - failedCommentTest = true; - } - else if(editorValueForIFrame.match(/\<\!\-\-/gi) && editorValueForIFrame.match(/\<\!\-\-/gi).length > editorValueForIFrame.match(/\-\-\>/gi).length){ - failedCommentTest = true; - } - if(failedCommentTest){ - editor.setValue(editor.getValue()+ "-->"); - editorValueForIFrame = editorValueForIFrame + "-->"; - } - goodTests = 0; - var previewFrame = document.getElementById('preview'); - var preview = previewFrame.contentDocument || previewFrame.contentWindow.document; - preview.open(); - $('#testSuite').empty(); - preview.write(libraryIncludes + editor.getValue() + iFrameScript); - codeStorage.updateStorage(); - preview.close(); - -} -setTimeout(updatePreview, 300); - -/** - * "post" methods - */ - -var testResults = []; -var postSuccess = function(data) { - var testDoc = document.createElement("div"); - $(testDoc) - .html("
" + JSON.parse(data) + "
"); - $('#testSuite').append(testDoc); - testSuccess(); -}; - -var postError = function(data) { - var testDoc = document.createElement("div"); - $(testDoc) - .html("
" + JSON.parse(data) + "
"); - $('#testSuite').append(testDoc); -}; -var goodTests = 0; -var testSuccess = function() { - goodTests++; - if (goodTests === tests.length) { - showCompletion(); - } -}; - -function doLinting () { - editor.operation(function () { - for (var i = 0; i < widgets.length; ++i) - editor.removeLineWidget(widgets[i]); - widgets.length = 0; - JSHINT(editor.getValue()); - for (var i = 0; i < JSHINT.errors.length; ++i) { - var err = JSHINT.errors[i]; - if (!err) continue; - var msg = document.createElement("div"); - var icon = msg.appendChild(document.createElement("span")); - icon.innerHTML = "!!"; - icon.className = "lint-error-icon"; - msg.appendChild(document.createTextNode(err.reason)); - msg.className = "lint-error"; - widgets.push(editor.addLineWidget(err.line - 1, msg, { - coverGutter: false, - noHScroll: true - })); - } - }); -}; - -//$('#testSuite').empty(); -function showCompletion() { - var time = Math.floor(Date.now()) - started; - ga('send', 'event', 'Challenge', 'solved', challenge_Name + ', Time: ' + time); - $('#next-courseware-button').removeAttr('disabled'); - $('#next-courseware-button').addClass('animated tada'); - if (!userLoggedIn) { - $('#complete-courseware-dialog').modal('show'); - } - $('body').keydown(function(e) { - if (e.ctrlKey && e.keyCode == 13) { - $('#next-courseware-button').click(); - $('#next-courseware-button').unbind('click'); - } - }); -} - -/* - Local Storage Update System By Andrew Cay(Resto) - codeStorage: singleton object that contains properties and methods related to - dealing with the localStorage system. - The keys work off of the variable challenge_name to make unique identifiers per bonfire - - Two extra functionalities: - Added anonymous version checking system incase of future updates to the system - Added keyup listener to editor(myCodeMirror) so the last update has been saved to storage - */ -var codeStorage = { - version: 0.01, - keyVersion:"saveVersion", - keyValue: null,//where the value of the editor is saved - updateWait: 2000,// 2 seconds - updateTimeoutId: null, - eventArray: []//for firing saves -}; -// Returns true if the editor code was saved since last key press (use this if you want to make a "saved" notification somewhere") -codeStorage.hasSaved = function(){ - return ( updateTimeoutId === null ); -}; -codeStorage.onSave = function(func){ - codeStorage.eventArray.push(func); -}; -codeStorage.setSaveKey = function(key){ - codeStorage.keyValue = key + 'Val'; -}; -codeStorage.getEditorValue = function(){ - return ('' + localStorage.getItem(codeStorage.keyValue)); -}; - -codeStorage.isAlive = function() { - var val = this.getEditorValue() - return val !== 'null' && - val !== 'undefined' && - (val && val.length > 0); -}; -codeStorage.updateStorage = function(){ - if(typeof(Storage) !== undefined) { - var value = editor.getValue(); - localStorage.setItem(codeStorage.keyValue, value); - } else { - var debugging = false; - if( debugging ){ - console.log('no web storage'); - } - } - codeStorage.updateTimeoutId = null; - codeStorage.eventArray.forEach(function(func){ - func(); - }); -}; -//Update Version -(function(){ - var savedVersion = localStorage.getItem('saveVersion'); - if( savedVersion === null ){ - localStorage.setItem(codeStorage.keyVersion, codeStorage.version);//just write current version - }else{ - if( savedVersion !== codeStorage.version ){ - //Update version - } - } -})(); - - - -///Set everything up one page -/// Update local save when editor has changed -codeStorage.setSaveKey(challenge_Name); -editor.on('keyup', function(){ - window.clearTimeout(codeStorage.updateTimeoutId); - codeStorage.updateTimeoutId = window.setTimeout(codeStorage.updateStorage, codeStorage.updateWait); -}); - -var editorValue; - - -var challengeSeed = challengeSeed || null; -var tests = tests || []; - - -var allSeeds = ''; -(function() { - challengeSeed.forEach(function(elem) { - allSeeds += elem + '\n'; - }); -})(); - -editorValue = (codeStorage.isAlive())? codeStorage.getEditorValue() : allSeeds; - -editor.setValue(editorValue.replace((/fccss/gi), '')); -editor.refresh(); - -var resetEditor = function resetEditor() { - editor.setValue(allSeeds.replace((/fccss/gi), '')); - updatePreview(); - codeStorage.updateStorage(); -}; - - - -/* -var challengeSeed = challengeSeed || null; -var allSeeds = ''; -(function() { - challengeSeed.forEach(function(elem) { - allSeeds += elem.replace(/fccss/g, '') + '\n'; - }); - editor.setValue(allSeeds); - (function() { - setTimeout(function() { - editor.refresh(); - }, 200); - })(); -})(); -*/ diff --git a/public/js/lib/coursewares/coursewaresJSFramework_0.0.6.js b/public/js/lib/coursewares/coursewaresJSFramework_0.0.6.js deleted file mode 100644 index ddeb9519f40..00000000000 --- a/public/js/lib/coursewares/coursewaresJSFramework_0.0.6.js +++ /dev/null @@ -1,394 +0,0 @@ -var widgets = []; -var myCodeMirror = CodeMirror.fromTextArea(document.getElementById("codeEditor"), { - lineNumbers: true, - mode: "javascript", - theme: 'monokai', - runnable: true, - lint: true, - matchBrackets: true, - autoCloseBrackets: true, - scrollbarStyle: 'null', - lineWrapping: true, - gutters: ["CodeMirror-lint-markers"], - onKeyEvent: doLinting -}); -var editor = myCodeMirror; -editor.setSize("100%", "auto"); - -// Hijack tab key to enter two spaces intead -editor.setOption("extraKeys", { - Tab: function(cm) { - if (cm.somethingSelected()) { - cm.indentSelection("add"); - } else { - var spaces = Array(cm.getOption("indentUnit") + 1).join(" "); - cm.replaceSelection(spaces); - } - }, - "Shift-Tab": function(cm) { - if (cm.somethingSelected()) { - cm.indentSelection("subtract"); - } else { - var spaces = Array(cm.getOption("indentUnit") + 1).join(" "); - cm.replaceSelection(spaces); - } - }, - "Ctrl-Enter": function() { - bonfireExecute(); - return false; - } -}); - - -var attempts = 0; -if (attempts) { - attempts = 0; -} - - -var codeOutput = CodeMirror.fromTextArea(document.getElementById("codeOutput"), { - lineNumbers: false, - mode: "text", - theme: 'monokai', - readOnly: 'nocursor', - lineWrapping: true -}); - -codeOutput.setValue('/**\n' + - ' * Your output will go here.\n' + ' * Console.log() -type statements\n' + - ' * will appear in your browser\'s\n' + ' * DevTools JavaScript console.\n' + - ' */'); -codeOutput.setSize("100%", "100%"); -var info = editor.getScrollInfo(); -var after = editor.charCoords({ - line: editor.getCursor().line + 1, - ch: 0 -}, "local").top; -if (info.top + info.clientHeight < after) - editor.scrollTo(null, after - info.clientHeight + 3); - -function doLinting() { - editor.operation(function() { - for (var i = 0; i < widgets.length; ++i) - editor.removeLineWidget(widgets[i]); - widgets.length = 0; - JSHINT(editor.getValue()); - for (var i = 0; i < JSHINT.errors.length; ++i) { - var err = JSHINT.errors[i]; - if (!err) continue; - var msg = document.createElement("div"); - var icon = msg.appendChild(document.createElement("span")); - icon.innerHTML = "!!"; - icon.className = "lint-error-icon"; - msg.appendChild(document.createTextNode(err.reason)); - msg.className = "lint-error"; - widgets.push(editor.addLineWidget(err.line - 1, msg, { - coverGutter: false, - noHScroll: true - })); - } - }); -} - -$('#submitButton').on('click', function() { - bonfireExecute(); -}); - -function bonfireExecute() { - attempts++; - ga('send', 'event', 'Challenge', 'ran-code', challenge_Name); - userTests = null; - $('#codeOutput').empty(); - var userJavaScript = myCodeMirror.getValue(); - var failedCommentTest = false; - if(userJavaScript.match(/\/\*/gi) && userJavaScript.match(/\*\//gi) == null){ - failedCommentTest = true; - } - else if(!failedCommentTest && userJavaScript.match(/\/\*/gi) && userJavaScript.match(/\/\*/gi).length > userJavaScript.match(/\*\//gi).length){ - failedCommentTest = true; - } - userJavaScript = removeComments(userJavaScript); - userJavaScript = scrapeTests(userJavaScript); - // simple fix in case the user forgets to invoke their function - - submit(userJavaScript, function(cls, message) { - if(failedCommentTest){ - myCodeMirror.setValue(myCodeMirror.getValue() + "*/"); - console.log('Caught Unfinished Comment'); - codeOutput.setValue("Unfinished mulit-line comment"); - failedCommentTest = false; - } - else if (cls) { - codeOutput.setValue(message.error); - runTests('Error', null); - } else { - codeOutput.setValue(message.output); - codeOutput.setValue(codeOutput.getValue().replace(/\\\"/gi,'')); - message.input = removeLogs(message.input); - runTests(null, message); - } - }); -} - - -var userTests; -var testSalt = Math.random(); - - -var scrapeTests = function(userJavaScript) { - - // insert tests from mongo - for (var i = 0; i < tests.length; i++) { - userJavaScript += '\n' + tests[i]; - } - - var counter = 0; - var regex = new RegExp( - /(expect(\s+)?\(.*\;)|(assert(\s+)?\(.*\;)|(assert\.\w.*\;)|(.*\.should\..*\;)/ - ); - var match = regex.exec(userJavaScript); - while (match != null) { - var replacement = '//' + counter + testSalt; - userJavaScript = userJavaScript.substring(0, match.index) + replacement + - userJavaScript.substring(match.index + match[0].length); - - if (!userTests) { - userTests = []; - } - userTests.push({ - "text": match[0], - "line": counter, - "err": null - }); - counter++; - match = regex.exec(userJavaScript); - } - - return userJavaScript; -}; - -function removeComments(userJavaScript) { - var regex = new RegExp(/(\/\*[^(\*\/)]*\*\/)|\/\/[^\n]*/g); - return userJavaScript.replace(regex, ''); -} - -function removeLogs(userJavaScript) { - return userJavaScript.replace(/(console\.[\w]+\s*\(.*\;)/g, ''); -} - -var pushed = false; -var createTestDisplay = function() { - if (pushed) { - userTests.pop(); - } - for (var i = 0; i < userTests.length; i++) { - var test = userTests[i]; - var testDoc = document.createElement("div"); - if (test.err != null) { - console.log('Should be displaying bad tests'); - $(testDoc) - .html( - "
" + - test.text + "
" + - test.err + "
") - .appendTo($('#testSuite')); - } else { - $(testDoc) - .html( - "
" + - test.text + "
") - .appendTo($('#testSuite')); - } - }; -}; - -var expect = chai.expect; -var assert = chai.assert; -var should = chai.should(); - - -var reassembleTest = function(test, data) { - var lineNum = test.line; - var regexp = new RegExp("\/\/" + lineNum + testSalt); - return data.input.replace(regexp, test.text); -}; - -var runTests = function(err, data) { - var allTestsPassed = true; - pushed = false; - $('#testSuite').children().remove(); - if (err && userTests.length > 0) { - userTests = [{ - text: "Program Execution Failure", - err: "No user tests were run." - }]; - createTestDisplay(); - } - //Add blocks to test exploits here! - else if(editorValue.match(/if\s\(null\)\sconsole\.log\(1\);/gi)){ - allTestsPassed = false; - userTests = [{ - text: "Program Execution Failure", - err: "Invalid if (null) console.log(1); detected" - }]; - createTestDisplay(); - } - else if (userTests) { - userTests.push(false); - pushed = true; - userTests.forEach(function(chaiTestFromJSON, indexOfTestArray, - __testArray) { - try { - if (chaiTestFromJSON) { - var output = eval(reassembleTest(chaiTestFromJSON, data)); - } - } catch (error) { - allTestsPassed = false; - __testArray[indexOfTestArray].err = error.message; - } finally { - if (!chaiTestFromJSON) { - createTestDisplay(); - } - } - }); - - if (allTestsPassed) { - allTestsPassed = false; - showCompletion(); - } - - } -}; - -function showCompletion() { - var time = Math.floor(Date.now()) - started; - ga('send', 'event', 'Challenge', 'solved', challenge_Name + ', Time: ' + time + - ', Attempts: ' + attempts); - var bonfireSolution = myCodeMirror.getValue(); - var didCompleteWith = $('#completed-with').val() || null; - $.post( - '/completed-bonfire/', { - challengeInfo: { - challengeId: challenge_Id, - challengeName: challenge_Name, - completedWith: didCompleteWith, - challengeType: challengeType, - solution: bonfireSolution - } - }, - function(res) { - if (res) { - $('#complete-courseware-dialog').modal('show'); - $('#complete-courseware-dialog').keydown(function(e) { - if (e.ctrlKey && e.keyCode == 13) { - $('#next-courseware-button').click(); - } - }); - } - } - ); - -} - - -/* - Local Storage Update System By Andrew Cay(Resto) - codeStorage: singleton object that contains properties and methods related to - dealing with the localStorage system. - The keys work off of the variable challenge_name to make unique identifiers per bonfire - - Two extra functionalities: - Added anonymous version checking system incase of future updates to the system - Added keyup listener to editor(myCodeMirror) so the last update has been saved to storage - */ -var codeStorage = { - version: 0.01, - keyVersion:"saveVersion", - keyValue: null,//where the value of the editor is saved - updateWait: 2000,// 2 seconds - updateTimeoutId: null, - eventArray: []//for firing saves -}; -// Returns true if the editor code was saved since last key press (use this if you want to make a "saved" notification somewhere") -codeStorage.hasSaved = function(){ - return ( updateTimeoutId === null ); -}; -codeStorage.onSave = function(func){ - codeStorage.eventArray.push(func); -}; -codeStorage.setSaveKey = function(key){ - codeStorage.keyValue = key + 'Val'; -}; -codeStorage.getEditorValue = function(){ - return ('' + localStorage.getItem(codeStorage.keyValue)); -}; - -codeStorage.isAlive = function() { - var val = this.getEditorValue() - return val !== 'null' && - val !== 'undefined' && - (val && val.length > 0); -} -codeStorage.updateStorage = function(){ - if(typeof(Storage) !== undefined) { - var value = editor.getValue(); - localStorage.setItem(codeStorage.keyValue, value); - } else { - var debugging = false; - if( debugging ){ - console.log('no web storage'); - } - } - codeStorage.updateTimeoutId = null; - codeStorage.eventArray.forEach(function(func){ - func(); - }); -}; -//Update Version -(function(){ - var savedVersion = localStorage.getItem('saveVersion'); - if( savedVersion === null ){ - localStorage.setItem(codeStorage.keyVersion, codeStorage.version);//just write current version - }else{ - if( savedVersion !== codeStorage.version ){ - //Update version - } - } -})(); - - - -///Set everything up one page -/// Update local save when editor has changed -codeStorage.setSaveKey(challenge_Name); -editor.on('keyup', function(){ - window.clearTimeout(codeStorage.updateTimeoutId); - codeStorage.updateTimeoutId = window.setTimeout(codeStorage.updateStorage, codeStorage.updateWait); -}); - -var editorValue; - - -var challengeSeed = challengeSeed || null; -var tests = tests || []; - - -var allSeeds = ''; -(function() { - challengeSeed.forEach(function(elem) { - allSeeds += elem + '\n'; - }); -})(); - -editorValue = (codeStorage.isAlive())? codeStorage.getEditorValue() : allSeeds; - -myCodeMirror.setValue(editorValue); - -var resetEditor = function resetEditor() { - editor.setValue(allSeeds); - codeStorage.updateStorage(); -}; - -$(document).ready(function(){ - bonfireExecute(); -}); diff --git a/server/views/coursewares/showHTML.jade b/server/views/coursewares/showHTML.jade index 85970895f9b..f22fbdfb76e 100644 --- a/server/views/coursewares/showHTML.jade +++ b/server/views/coursewares/showHTML.jade @@ -31,10 +31,11 @@ block content for sentence in details p.wrappable.negative-10!= sentence .negative-bottom-margin-30 + label.negative-10.btn.btn-primary.btn-block#submitButton + i.fa.fa-play + |   Run code (ctrl + enter) + br if (user) - label.btn.btn-primary.btn-block.negative-10#next-courseware-button - .ion-checkmark-circled - |   Go to my next challenge (ctrl + enter) .button-spacer .btn-group.input-group.btn-group-justified label.btn.btn-success#trigger-reset-modal @@ -71,6 +72,9 @@ block content form.code .codeMirrorView textarea#codeEditor(autofocus=true, style='display: none;') + script(src = '/js/lib/coursewares/commonFrameWork.js') + script. + editor.setOption("mode", "text/html"); .col-md-4.col-lg-3 .hidden-xs.hidden-sm img.iphone-position.iframe-scroll(src="https://s3.amazonaws.com/freecodecamp/iphone6-frame.png", style = "z-index: -2;") @@ -88,4 +92,3 @@ 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.9.js") diff --git a/server/views/coursewares/showJS.jade b/server/views/coursewares/showJS.jade index 85ab33adaaf..2d8acf85a3b 100644 --- a/server/views/coursewares/showJS.jade +++ b/server/views/coursewares/showJS.jade @@ -72,7 +72,9 @@ block content form.code .codeMirrorView textarea#codeEditor(autofocus=true, style='display: none;') - script(src='/js/lib/coursewares/coursewaresJSFramework_0.0.6.js') + script(src = '/js/lib/coursewares/commonFrameWork.js') + script. + editor.setOption("mode", "javascript"); #complete-courseware-dialog.modal(tabindex='-1') .modal-dialog.animated.zoomIn.fast-animation .modal-content From 1477f56f97e309ad78ef947a9690ed72d4e46652 Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Sun, 23 Aug 2015 22:26:02 +0100 Subject: [PATCH 040/134] Merge of the frameworks: the desolation of the views --- server/views/coursewares/showHTML.jade | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/views/coursewares/showHTML.jade b/server/views/coursewares/showHTML.jade index f22fbdfb76e..65659f2f9cb 100644 --- a/server/views/coursewares/showHTML.jade +++ b/server/views/coursewares/showHTML.jade @@ -90,5 +90,8 @@ block content .text-center .animated.zoomInDown.delay-half 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 + if(user) + a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block(href='/challenges/next-challenge') Go to the next challenge + else + a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress include ../partials/challenge-modals From 390469a1b64edc8d4af58fdcd5f0cd6d635c5603 Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Sun, 23 Aug 2015 22:45:28 +0100 Subject: [PATCH 041/134] Framework work not working - in progress --- public/js/lib/coursewares/commonFrameWork.js | 85 +++++++++++--------- 1 file changed, 45 insertions(+), 40 deletions(-) diff --git a/public/js/lib/coursewares/commonFrameWork.js b/public/js/lib/coursewares/commonFrameWork.js index a2717ca7e10..bfaba9dc936 100644 --- a/public/js/lib/coursewares/commonFrameWork.js +++ b/public/js/lib/coursewares/commonFrameWork.js @@ -176,14 +176,15 @@ if(typeof prodOrDev !== 'undefined') { editor.setValue(editor.getValue() + "-->"); editorValueForIFrame = editorValueForIFrame + "-->"; } - goodTests = 0; var previewFrame = document.getElementById('preview'); var preview = previewFrame.contentDocument || previewFrame.contentWindow.document; + + //Here is the issue + preview.open(); - preview.write(libraryIncludes + editor.getValue()); + //preview.write(libraryIncludes + editor.getValue()); codeStorage.updateStorage(); preview.close(); - } setTimeout(updatePreview, 300); @@ -405,6 +406,20 @@ var runTests = function(err, data) { allTestsPassed = false; showCompletion(); } + else{ + if(challengeType === "0"){ + $('#testSuite').empty(); + + editorValueForIFrame = editor.getValue(); + goodTests = 0; + var previewFrame = document.getElementById('preview'); + var preview = previewFrame.contentDocument || previewFrame.contentWindow.document; + preview.open(); + preview.write(libraryIncludes + editor.getValue() + ""); + codeStorage.updateStorage(); + preview.close(); + } + } } }; @@ -413,49 +428,39 @@ function bonfireExecute() { attempts++; ga('send', 'event', 'Challenge', 'ran-code', challenge_Name); userTests = null; - if(challengeType === "0"){ - $('#testSuite').empty(); - - editorValueForIFrame = editor.getValue(); - goodTests = 0; - var previewFrame = document.getElementById('preview'); - var preview = previewFrame.contentDocument || previewFrame.contentWindow.document; - preview.open(); - preview.write(libraryIncludes + editor.getValue() + ""); - codeStorage.updateStorage(); - preview.close(); + var userJavaScript = myCodeMirror.getValue(); + var failedCommentTest = false; + if (userJavaScript.match(/\/\*/gi) && userJavaScript.match(/\*\//gi) == null) { + failedCommentTest = true; } - else { - var userJavaScript = myCodeMirror.getValue(); - var failedCommentTest = false; - if (userJavaScript.match(/\/\*/gi) && userJavaScript.match(/\*\//gi) == null) { - failedCommentTest = true; - } - else if (!failedCommentTest && userJavaScript.match(/\/\*/gi) && userJavaScript.match(/\/\*/gi).length > userJavaScript.match(/\*\//gi).length) { - failedCommentTest = true; - } - userJavaScript = removeComments(userJavaScript); - userJavaScript = scrapeTests(userJavaScript); - // simple fix in case the user forgets to invoke their function + else if (!failedCommentTest && userJavaScript.match(/\/\*/gi) && userJavaScript.match(/\/\*/gi).length > userJavaScript.match(/\*\//gi).length) { + failedCommentTest = true; + } + userJavaScript = removeComments(userJavaScript); + userJavaScript = scrapeTests(userJavaScript); + // simple fix in case the user forgets to invoke their function - submit(userJavaScript, function (cls, message) { - if (failedCommentTest) { - myCodeMirror.setValue(myCodeMirror.getValue() + "*/"); - console.log('Caught Unfinished Comment'); + submit(userJavaScript, function (cls, message) { + if (failedCommentTest) { + myCodeMirror.setValue(myCodeMirror.getValue() + "*/"); + console.log('Caught Unfinished Comment'); + if(challengeType !== 0) codeOutput.setValue("Unfinished mulit-line comment"); - failedCommentTest = false; - } - else if (cls) { + failedCommentTest = false; + } + else if (cls) { + if(challengeType !== 0) codeOutput.setValue(message.error); - runTests('Error', null); - } else { + runTests('Error', null); + } else { + if(challengeType !== 0) codeOutput.setValue(message.output); + if(challengeType !== 0) codeOutput.setValue(codeOutput.getValue().replace(/\\\"/gi, '')); - message.input = removeLogs(message.input); - runTests(null, message); - } - }); - } + message.input = removeLogs(message.input); + runTests(null, message); + } + }); } $('#submitButton').on('click', function() { From 8136443f8708a83e3c9e37289d27ff080dcd9fee Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Mon, 24 Aug 2015 00:22:35 +0100 Subject: [PATCH 042/134] Fix #2605 --- seed/challenges/basic-javascript.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json index 5aeecfdae6d..ea4ec2a0e7d 100644 --- a/seed/challenges/basic-javascript.json +++ b/seed/challenges/basic-javascript.json @@ -606,7 +606,7 @@ "Take the myArray array and shift() the first value off of it." ], "tests": [ - "assert((function(d){if(d[0] == 23 && d[1][0] == 'dog' && d[1][1] == 3 && d[2] == undefined){return(true);}else{return(false);}})(myArray), 'myArray should only have the first two values left([\"John\", 23])');", + "assert((function(d){if(d[0] == 23 && d[1][0] == 'dog' && d[1][1] == 3 && d[2] == undefined){return(true);}else{return(false);}})(myArray), 'myArray should only have the last two values left([23, [\"dog\", 3]])');", "assert((function(d){if(d === 'John' && typeof(myRemoved) === 'string'){return(true);}else{return(false);}})(myRemoved), 'myRemoved should contain \"John\"');" ], "challengeSeed": [ From f0a783c9df58189627700409293fc579d032d617 Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Mon, 24 Aug 2015 00:29:34 +0100 Subject: [PATCH 043/134] Added some leniency to the test so that it doesn't require a new line --- seed/challenges/jquery.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/jquery.json b/seed/challenges/jquery.json index 8576e4bc0de..54d1ea88a94 100644 --- a/seed/challenges/jquery.json +++ b/seed/challenges/jquery.json @@ -17,7 +17,7 @@ "assert(editor.match(/"); - codeStorage.updateStorage(); - preview.close(); - } - } - } }; @@ -484,6 +469,7 @@ function bonfireExecute() { attempts++; ga('send', 'event', 'Challenge', 'ran-code', challenge_Name); userTests = null; + $('#testSuite').empty(); if(challengeType !== "0"){ var userJavaScript = myCodeMirror.getValue(); var failedCommentTest = false; From e2c3ff08a8cc5c83b8b6ef4b7b413413a159cf48 Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Tue, 25 Aug 2015 14:46:23 +0100 Subject: [PATCH 062/134] Fixed the goodTests var not resetting --- public/js/lib/coursewares/commonFrameWork.js | 1 + 1 file changed, 1 insertion(+) diff --git a/public/js/lib/coursewares/commonFrameWork.js b/public/js/lib/coursewares/commonFrameWork.js index 935d560ed9e..c2bdd3c56d6 100644 --- a/public/js/lib/coursewares/commonFrameWork.js +++ b/public/js/lib/coursewares/commonFrameWork.js @@ -466,6 +466,7 @@ var runTests = function(err, data) { }; function bonfireExecute() { + goodTests = 0; attempts++; ga('send', 'event', 'Challenge', 'ran-code', challenge_Name); userTests = null; From 57c32614154e10088abd512d5b936a3896834b21 Mon Sep 17 00:00:00 2001 From: Aniruddh Agarwal Date: Tue, 25 Aug 2015 22:42:58 +0800 Subject: [PATCH 063/134] replaced + by . --- seed/challenges/basic-javascript.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json index dbc5eed779a..3465c9dcb15 100644 --- a/seed/challenges/basic-javascript.json +++ b/seed/challenges/basic-javascript.json @@ -1007,7 +1007,7 @@ "g means that we want to search the entire string for this pattern.", "i means that we want to ignore the case (uppercase or lowercase) when searching for the pattern.", "Regular expressions are usually surrounded by / symbols.", - "Let's try selecting all the occurrences of the word and in the string George Boole and Alan Turing went to the shop and got some milk. We can do this by replacing the + part of our regular expression with the word and." + "Let's try selecting all the occurrences of the word and in the string George Boole and Alan Turing went to the shop and got some milk. We can do this by replacing the . part of our regular expression with the word and." ], "tests":[ "assert(test==2, 'Your regular expression should find two occurrences of the word and');", From 1133aeda9b71d2c15b38df541d17d53225ea5c39 Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Tue, 25 Aug 2015 16:10:11 +0100 Subject: [PATCH 064/134] Stopped the scripts needed for the preview being loaded on each keyDown --- public/js/lib/coursewares/commonFrameWork.js | 42 ++++++++++++++++---- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/public/js/lib/coursewares/commonFrameWork.js b/public/js/lib/coursewares/commonFrameWork.js index c2bdd3c56d6..e2db213effb 100644 --- a/public/js/lib/coursewares/commonFrameWork.js +++ b/public/js/lib/coursewares/commonFrameWork.js @@ -1,4 +1,6 @@ var editor; +var blockRender = true; +var allowCompletetion = false; var widgets = []; editor = CodeMirror.fromTextArea(document.getElementById("codeEditor"), { lineNumbers: true, @@ -139,7 +141,33 @@ editor.setOption("extraKeys", { editor.setSize("100%", "auto"); -var libraryIncludes = "" + +if(challengeType === "0") { + var libraryIncludes = ""; + + $.getScript('/js/lib/jquery-2.1.1.min.js', function (scriptOne) { + $.getScript('/js/lib/chai/chai.js', function (scriptTwo) { + $.getScript('/js/lib/chai/chai-jquery.js', function (scriptThree) { + $.getScript('//cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.min.js', function (scriptFour) { + libraryIncludes = "" + "" + + "" + + "" + + "" + + ""; + blockRender = false; + editorValue = (codeStorage.isAlive()) ? codeStorage.getEditorValue() : allSeeds; + myCodeMirror.setValue(editorValue); + setTimeout(function () { + $(document).ready(function () { + bonfireExecute(); + }); + }, 100); + }); + }); + }); + }); +} + +/*var libraryIncludes = "" + "" + "" + "" + @@ -147,7 +175,7 @@ var libraryIncludes = ""; + "";*/ var editorValueForIFrame; @@ -466,6 +494,9 @@ var runTests = function(err, data) { }; function bonfireExecute() { + if(!blockRender){ + + } goodTests = 0; attempts++; ga('send', 'event', 'Challenge', 'ran-code', challenge_Name); @@ -523,10 +554,5 @@ function bonfireExecute() { $('#submitButton').on('click', function() { bonfireExecute(); -}); - -$(document).ready(function(){ - editorValue = (codeStorage.isAlive())? codeStorage.getEditorValue() : allSeeds; - myCodeMirror.setValue(editorValue); - bonfireExecute(); + allowCompletetion = true; }); From 50f1705cbcec9dbc08c7a3a0aa5e038f441d4968 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Tue, 25 Aug 2015 08:59:42 -0700 Subject: [PATCH 065/134] start updating alt text --- server/views/resources/get-started.jade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/views/resources/get-started.jade b/server/views/resources/get-started.jade index 66ea1c2d35d..5246a7b86ce 100644 --- a/server/views/resources/get-started.jade +++ b/server/views/resources/get-started.jade @@ -6,25 +6,25 @@ block content | It will help you get the most out of Free Code Camp. .thumbnail - img.gif-block.img-center.img-responsive.thumbnail(src='http://i.imgur.com/RlEk2IF.jpg' alt='a gif showing how to install this') + img.gif-block.img-center.img-responsive.thumbnail(src='http://i.imgur.com/RlEk2IF.jpg' alt="a picture of Free Code Camp's 4 benefits: Get connected, Learn JavaScript, Build your Portfolio, Help nonprofits") .caption p.large-p Welcome to Free Code Camp. We're an open source community of busy people who learn to code, then practice by building projects for nonprofits. .big-spacer .thumbnail - img.gif-block.img-center.img-responsive(src='http://i.imgur.com/pYsTbjI.jpg' alt='a gif showing how to install this') + img.gif-block.img-center.img-responsive(src='http://i.imgur.com/pYsTbjI.jpg' alt='a screenshot of our curriculum alongside a screenshot of our chat room') .caption p.large-p Learning to code is hard. To succeed, you'll need lots practice and support. That's why we've created a rigorous curriculum and supportive community. .big-spacer .thumbnail - img.gif-block.img-center.img-responsive(src='http://i.imgur.com/D7Y5luw.jpg' alt='a gif showing how to install this') + img.gif-block.img-center.img-responsive(src='http://i.imgur.com/D7Y5luw.jpg' alt='A graph of the rate of job growth against growth in computer science degree graduates. There are 1.4 million jobs and only 400 million people to fill them.') .caption p.large-p If you can finish Free Code Camp, you will be able to get a coding job. There are thousands of coding jobs currently going unfilled, and the demand for coders grows every year. .big-spacer .thumbnail - img.gif-block.img-center.img-responsive(src='http://i.imgur.com/dLx8nrg.jpg' alt='a gif showing how to install this') + img.gif-block.img-center.img-responsive(src='http://i.imgur.com/dLx8nrg.jpg' alt='An illustration showing that you will learn HTML5, CSS3, JavaScript, Databases, Git, Node.js, Angular.js and Agile.') .caption p.large-p During the first 800 hours of Free Code Camp, you'll learn technologies like HTML5, Node.js and databases. From 14cc6a7cefc778625dd0e190e9f5a881971c64b6 Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Tue, 25 Aug 2015 19:28:13 +0100 Subject: [PATCH 066/134] Final touch up to the framework before merge --- public/js/lib/chai/chai.js | 4 +- public/js/lib/coursewares/commonFrameWork.js | 96 ++++++++++++-------- server/views/coursewares/showBonfire.jade | 4 +- 3 files changed, 61 insertions(+), 43 deletions(-) diff --git a/public/js/lib/chai/chai.js b/public/js/lib/chai/chai.js index 77451223e09..4191939dfa7 100644 --- a/public/js/lib/chai/chai.js +++ b/public/js/lib/chai/chai.js @@ -1,5 +1,5 @@ -;(function(){ +(function(){ /** * Require the module at `name`. @@ -4797,4 +4797,4 @@ } else { (this || window)["chai"] = require("chai"); } -})() \ No newline at end of file +})(); diff --git a/public/js/lib/coursewares/commonFrameWork.js b/public/js/lib/coursewares/commonFrameWork.js index c2c461500aa..22294f92657 100644 --- a/public/js/lib/coursewares/commonFrameWork.js +++ b/public/js/lib/coursewares/commonFrameWork.js @@ -150,6 +150,7 @@ var libraryIncludes = ""; @@ -160,25 +161,41 @@ editor.on("keyup", function () { delay = setTimeout(updatePreview, 300); }); +function workerError(error){ + var display = $('.runTimeError'); + var housing = $('#testSuite'); + if(display.html() != error){ + display.remove(); + housing.prepend("
" + error + "
"); + display.hide().fadeIn(function(){ + setTimeout(function(){ + display.fadeOut(function(){ + display.remove(); + }); + }, 1000) + }); + } +} + +function scopejQuery(s){ + return(s.replace(/\$/gi, "j$").replace(/document/gi, "jdocument").replace(/jQuery/gi, "jjQuery")); +} + function safeHTMLRun(test){ var previewFrame = document.getElementById('preview'); var preview = previewFrame.contentDocument || previewFrame.contentWindow.document; if(editor.getValue().match(/\/gi) !== null) { var s = editor.getValue().split(/\<\s?script\s?\>/gi)[1].split(/\<\s?\/\s?script\s?\>/gi)[0]; + s = "var document = \"\"; var $ = function(){return(new function(){this.add=function(){return(null);};this.addBack=function(){return(null);};this.addClass=function(){return(null);};this.after=function(){return(null);};this.ajaxComplete=function(){return(null);};this.ajaxError=function(){return(null);};this.ajaxSend=function(){return(null);};this.ajaxStart=function(){return(null);};this.ajaxStop=function(){return(null);};this.ajaxSuccess=function(){return(null);};this.andSelf=function(){return(null);};this.animate=function(){return(null);};this.append=function(){return(null);};this.appendTo=function(){return(null);};this.attr=function(){return(null);};this.before=function(){return(null);};this.bind=function(){return(null);};this.blur=function(){return(null);};this.callbacksadd=function(){return(null);};this.callbacksdisable=function(){return(null);};this.callbacksdisabled=function(){return(null);};this.callbacksempty=function(){return(null);};this.callbacksfire=function(){return(null);};this.callbacksfired=function(){return(null);};this.callbacksfireWith=function(){return(null);};this.callbackshas=function(){return(null);};this.callbackslock=function(){return(null);};this.callbackslocked=function(){return(null);};this.callbacksremove=function(){return(null);};this.change=function(){return(null);};this.children=function(){return(null);};this.clearQueue=function(){return(null);};this.click=function(){return(null);};this.clone=function(){return(null);};this.closest=function(){return(null);};this.contents=function(){return(null);};this.context=function(){return(null);};this.css=function(){return(null);};this.data=function(){return(null);};this.dblclick=function(){return(null);};this.deferredalways=function(){return(null);};this.deferreddone=function(){return(null);};this.deferredfail=function(){return(null);};this.deferredisRejected=function(){return(null);};this.deferredisResolved=function(){return(null);};this.deferrednotify=function(){return(null);};this.deferrednotifyWith=function(){return(null);};this.deferredpipe=function(){return(null);};this.deferredprogress=function(){return(null);};this.deferredpromise=function(){return(null);};this.deferredreject=function(){return(null);};this.deferredrejectWith=function(){return(null);};this.deferredresolve=function(){return(null);};this.deferredresolveWith=function(){return(null);};this.deferredstate=function(){return(null);};this.deferredthen=function(){return(null);};this.delay=function(){return(null);};this.delegate=function(){return(null);};this.dequeue=function(){return(null);};this.detach=function(){return(null);};this.die=function(){return(null);};this.each=function(){return(null);};this.empty=function(){return(null);};this.end=function(){return(null);};this.eq=function(){return(null);};this.error=function(){return(null);};this.eventcurrentTarget=function(){return(null);};this.eventdata=function(){return(null);};this.eventdelegateTarget=function(){return(null);};this.eventisDefaultPrevented=function(){return(null);};this.eventisImmediatePropagationStopped=function(){return(null);};this.eventisPropagationStopped=function(){return(null);};this.eventmetaKey=function(){return(null);};this.eventnamespace=function(){return(null);};this.eventpageX=function(){return(null);};this.eventpageY=function(){return(null);};this.eventpreventDefault=function(){return(null);};this.eventrelatedTarget=function(){return(null);};this.eventresult=function(){return(null);};this.eventstopImmediatePropagation=function(){return(null);};this.eventstopPropagation=function(){return(null);};this.eventtarget=function(){return(null);};this.eventtimeStamp=function(){return(null);};this.eventtype=function(){return(null);};this.eventwhich=function(){return(null);};this.fadeIn=function(){return(null);};this.fadeOut=function(){return(null);};this.fadeTo=function(){return(null);};this.fadeToggle=function(){return(null);};this.filter=function(){return(null);};this.find=function(){return(null);};this.finish=function(){return(null);};this.first=function(){return(null);};this.focus=function(){return(null);};this.focusin=function(){return(null);};this.focusout=function(){return(null);};this.get=function(){return(null);};this.has=function(){return(null);};this.hasClass=function(){return(null);};this.height=function(){return(null);};this.hide=function(){return(null);};this.hover=function(){return(null);};this.html=function(){return(null);};this.index=function(){return(null);};this.innerHeight=function(){return(null);};this.innerWidth=function(){return(null);};this.insertAfter=function(){return(null);};this.insertBefore=function(){return(null);};this.is=function(){return(null);};this.jQuery=function(){return(null);};this.jquery=function(){return(null);};this.jQueryajax=function(){return(null);};this.jQueryajaxPrefilter=function(){return(null);};this.jQueryajaxSetup=function(){return(null);};this.jQueryajaxTransport=function(){return(null);};this.jQueryboxModel=function(){return(null);};this.jQuerybrowser=function(){return(null);};this.jQueryCallbacks=function(){return(null);};this.jQuerycontains=function(){return(null);};this.jQuerycssHooks=function(){return(null);};this.jQuerycssNumber=function(){return(null);};this.jQuerydata=function(){return(null);};this.jQueryDeferred=function(){return(null);};this.jQuerydequeue=function(){return(null);};this.jQueryeach=function(){return(null);};this.jQueryerror=function(){return(null);};this.jQueryextend=function(){return(null);};this.jQueryfnextend=function(){return(null);};this.jQueryfxinterval=function(){return(null);};this.jQueryfxoff=function(){return(null);};this.jQueryget=function(){return(null);};this.jQuerygetJSON=function(){return(null);};this.jQuerygetScript=function(){return(null);};this.jQueryglobalEval=function(){return(null);};this.jQuerygrep=function(){return(null);};this.jQueryhasData=function(){return(null);};this.jQueryholdReady=function(){return(null);};this.jQueryinArray=function(){return(null);};this.jQueryisArray=function(){return(null);};this.jQueryisEmptyObject=function(){return(null);};this.jQueryisFunction=function(){return(null);};this.jQueryisNumeric=function(){return(null);};this.jQueryisPlainObject=function(){return(null);};this.jQueryisWindow=function(){return(null);};this.jQueryisXMLDoc=function(){return(null);};this.jQuerymakeArray=function(){return(null);};this.jQuerymap=function(){return(null);};this.jQuerymerge=function(){return(null);};this.jQuerynoConflict=function(){return(null);};this.jQuerynoop=function(){return(null);};this.jQuerynow=function(){return(null);};this.jQueryparam=function(){return(null);};this.jQueryparseHTML=function(){return(null);};this.jQueryparseJSON=function(){return(null);};this.jQueryparseXML=function(){return(null);};this.jQuerypost=function(){return(null);};this.jQueryproxy=function(){return(null);};this.jQueryqueue=function(){return(null);};this.jQueryremoveData=function(){return(null);};this.jQuerysub=function(){return(null);};this.jQuerysupport=function(){return(null);};this.jQuerytrim=function(){return(null);};this.jQuerytype=function(){return(null);};this.jQueryunique=function(){return(null);};this.jQuerywhen=function(){return(null);};this.keydown=function(){return(null);};this.keypress=function(){return(null);};this.keyup=function(){return(null);};this.last=function(){return(null);};this.length=function(){return(null);};this.live=function(){return(null);};this.load=function(){return(null);};this.load=function(){return(null);};this.map=function(){return(null);};this.mousedown=function(){return(null);};this.mouseenter=function(){return(null);};this.mouseleave=function(){return(null);};this.mousemove=function(){return(null);};this.mouseout=function(){return(null);};this.mouseover=function(){return(null);};this.mouseup=function(){return(null);};this.next=function(){return(null);};this.nextAll=function(){return(null);};this.nextUntil=function(){return(null);};this.not=function(){return(null);};this.off=function(){return(null);};this.offset=function(){return(null);};this.offsetParent=function(){return(null);};this.on=function(){return(null);};this.one=function(){return(null);};this.outerHeight=function(){return(null);};this.outerWidth=function(){return(null);};this.parent=function(){return(null);};this.parents=function(){return(null);};this.parentsUntil=function(){return(null);};this.position=function(){return(null);};this.prepend=function(){return(null);};this.prependTo=function(){return(null);};this.prev=function(){return(null);};this.prevAll=function(){return(null);};this.prevUntil=function(){return(null);};this.promise=function(){return(null);};this.prop=function(){return(null);};this.pushStack=function(){return(null);};this.queue=function(){return(null);};this.ready=function(){return(null);};this.remove=function(){return(null);};this.removeAttr=function(){return(null);};this.removeClass=function(){return(null);};this.removeData=function(){return(null);};this.removeProp=function(){return(null);};this.replaceAll=function(){return(null);};this.replaceWith=function(){return(null);};this.resize=function(){return(null);};this.scroll=function(){return(null);};this.scrollLeft=function(){return(null);};this.scrollTop=function(){return(null);};this.select=function(){return(null);};this.selector=function(){return(null);};this.serialize=function(){return(null);};this.serializeArray=function(){return(null);};this.show=function(){return(null);};this.siblings=function(){return(null);};this.size=function(){return(null);};this.slice=function(){return(null);};this.slideDown=function(){return(null);};this.slideToggle=function(){return(null);};this.slideUp=function(){return(null);};this.stop=function(){return(null);};this.submit=function(){return(null);};this.text=function(){return(null);};this.toArray=function(){return(null);};this.toggle=function(){return(null);};this.toggle=function(){return(null);};this.toggleClass=function(){return(null);};this.trigger=function(){return(null);};this.triggerHandler=function(){return(null);};this.unbind=function(){return(null);};this.undelegate=function(){return(null);};this.unload=function(){return(null);};this.unwrap=function(){return(null);};this.val=function(){return(null);};this.width=function(){return(null);};this.wrap=function(){return(null);};this.wrapAll=function(){return(null);};this.wrapInner=function(){return(null);}});};"+s; submit( - s, function (cls, message) { + scopejQuery(s), function (cls, message) { if (cls) { console.log(message.error); - $('#mainEditorPanel').html("
" + message.error + "
" + $('#mainEditorPanel').html()); - $('.runTimeError').hide().fadeIn(function(){ - setTimeout(function(){ - $(this).remove(); - }, 3000) - }); + workerError(message.error); } else { if(test){ preview.open(); - preview.write(libraryIncludes + editor.getValue() +iFrameScript); + preview.write(libraryIncludes + editor.getValue() + iFrameScript); codeStorage.updateStorage(); preview.close(); } @@ -191,6 +208,7 @@ function safeHTMLRun(test){ } } ); + } else { if(test){ @@ -225,7 +243,9 @@ if(typeof prodOrDev !== 'undefined') { editor.setValue(editor.getValue() + "-->"); editorValueForIFrame = editorValueForIFrame + "-->"; } - safeHTMLRun(false); + if(!editor.getValue().match(/\$\(\$\)/gi) ) { + safeHTMLRun(false); + } } setTimeout(updatePreview, 300); @@ -447,28 +467,15 @@ var runTests = function(err, data) { allTestsPassed = false; showCompletion(); } - else{ - if(challengeType === "0"){ - $('#testSuite').empty(); - - editorValueForIFrame = editor.getValue(); - goodTests = 0; - var previewFrame = document.getElementById('preview'); - var preview = previewFrame.contentDocument || previewFrame.contentWindow.document; - preview.open(); - preview.write(libraryIncludes + editor.getValue() + ""); - codeStorage.updateStorage(); - preview.close(); - } - } - } }; function bonfireExecute() { + goodTests = 0; attempts++; ga('send', 'event', 'Challenge', 'ran-code', challenge_Name); userTests = null; + $('#testSuite').empty(); if(challengeType !== "0"){ var userJavaScript = myCodeMirror.getValue(); var failedCommentTest = false; @@ -482,23 +489,30 @@ function bonfireExecute() { userJavaScript = scrapeTests(userJavaScript); // simple fix in case the user forgets to invoke their function - submit(userJavaScript, function (cls, message) { - if (failedCommentTest) { - myCodeMirror.setValue(myCodeMirror.getValue() + "*/"); - console.log('Caught Unfinished Comment'); - codeOutput.setValue("Unfinished mulit-line comment"); - failedCommentTest = false; + 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() + "*/"); + console.log('Caught Unfinished Comment'); + codeOutput.setValue("Unfinished mulit-line comment"); + failedCommentTest = false; + } + else if (cls) { + codeOutput.setValue(message.error); + runTests('Error', null); + } else { + codeOutput.setValue(message.output); + codeOutput.setValue(codeOutput.getValue().replace(/\\\"/gi, '')); + message.input = removeLogs(message.input); + runTests(null, message); + } + }); } - else if (cls) { - codeOutput.setValue(message.error); - runTests('Error', null); - } else { - codeOutput.setValue(message.output); - codeOutput.setValue(codeOutput.getValue().replace(/\\\"/gi, '')); - message.input = removeLogs(message.input); - runTests(null, message); + else{ + codeOutput.setValue("Unsafe or Unfinished function declaration"); } - }); + } } else { editorValueForIFrame = editor.getValue(); @@ -506,7 +520,9 @@ function bonfireExecute() { editor.setValue(editor.getValue() + "-->"); editorValueForIFrame = editorValueForIFrame + "-->"; } - safeHTMLRun(true); + if(!editor.getValue().match(/\$\(\$\)/gi) && challengeType === "0") { + safeHTMLRun(true); + } } } diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade index 769311c29cc..58a00b5f54e 100644 --- a/server/views/coursewares/showBonfire.jade +++ b/server/views/coursewares/showBonfire.jade @@ -123,7 +123,9 @@ block content form.code .form-group.codeMirrorView textarea#codeEditor(autofocus=true, style='display: none;') - script(src='/js/lib/coursewares/coursewaresJSFramework_0.0.6.js') + script(src='/js/lib/coursewares/commonFrameWork.js') + script. + editor.setOption("mode", "javascript"); #complete-courseware-dialog.modal(tabindex='-1') .modal-dialog.animated.zoomIn.fast-animation From 7f467dbb8d1f4caf8225299f20fd8c34d73549b3 Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Tue, 25 Aug 2015 20:23:47 +0100 Subject: [PATCH 067/134] Fixed scoped jQuery showing up in error messages and jQuery methods and chaining in spoofed jQuery --- public/js/lib/coursewares/commonFrameWork.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/js/lib/coursewares/commonFrameWork.js b/public/js/lib/coursewares/commonFrameWork.js index 22294f92657..0cdac5519fb 100644 --- a/public/js/lib/coursewares/commonFrameWork.js +++ b/public/js/lib/coursewares/commonFrameWork.js @@ -166,7 +166,7 @@ function workerError(error){ var housing = $('#testSuite'); if(display.html() != error){ display.remove(); - housing.prepend("
" + error + "
"); + housing.prepend("
" + error.replace(/j\$/gi, "$").replace(/jdocument/gi, "document").replace(/jjQuery/gi, "jQuery") + "
"); display.hide().fadeIn(function(){ setTimeout(function(){ display.fadeOut(function(){ @@ -186,7 +186,7 @@ function safeHTMLRun(test){ var preview = previewFrame.contentDocument || previewFrame.contentWindow.document; if(editor.getValue().match(/\/gi) !== null) { var s = editor.getValue().split(/\<\s?script\s?\>/gi)[1].split(/\<\s?\/\s?script\s?\>/gi)[0]; - s = "var document = \"\"; var $ = function(){return(new function(){this.add=function(){return(null);};this.addBack=function(){return(null);};this.addClass=function(){return(null);};this.after=function(){return(null);};this.ajaxComplete=function(){return(null);};this.ajaxError=function(){return(null);};this.ajaxSend=function(){return(null);};this.ajaxStart=function(){return(null);};this.ajaxStop=function(){return(null);};this.ajaxSuccess=function(){return(null);};this.andSelf=function(){return(null);};this.animate=function(){return(null);};this.append=function(){return(null);};this.appendTo=function(){return(null);};this.attr=function(){return(null);};this.before=function(){return(null);};this.bind=function(){return(null);};this.blur=function(){return(null);};this.callbacksadd=function(){return(null);};this.callbacksdisable=function(){return(null);};this.callbacksdisabled=function(){return(null);};this.callbacksempty=function(){return(null);};this.callbacksfire=function(){return(null);};this.callbacksfired=function(){return(null);};this.callbacksfireWith=function(){return(null);};this.callbackshas=function(){return(null);};this.callbackslock=function(){return(null);};this.callbackslocked=function(){return(null);};this.callbacksremove=function(){return(null);};this.change=function(){return(null);};this.children=function(){return(null);};this.clearQueue=function(){return(null);};this.click=function(){return(null);};this.clone=function(){return(null);};this.closest=function(){return(null);};this.contents=function(){return(null);};this.context=function(){return(null);};this.css=function(){return(null);};this.data=function(){return(null);};this.dblclick=function(){return(null);};this.deferredalways=function(){return(null);};this.deferreddone=function(){return(null);};this.deferredfail=function(){return(null);};this.deferredisRejected=function(){return(null);};this.deferredisResolved=function(){return(null);};this.deferrednotify=function(){return(null);};this.deferrednotifyWith=function(){return(null);};this.deferredpipe=function(){return(null);};this.deferredprogress=function(){return(null);};this.deferredpromise=function(){return(null);};this.deferredreject=function(){return(null);};this.deferredrejectWith=function(){return(null);};this.deferredresolve=function(){return(null);};this.deferredresolveWith=function(){return(null);};this.deferredstate=function(){return(null);};this.deferredthen=function(){return(null);};this.delay=function(){return(null);};this.delegate=function(){return(null);};this.dequeue=function(){return(null);};this.detach=function(){return(null);};this.die=function(){return(null);};this.each=function(){return(null);};this.empty=function(){return(null);};this.end=function(){return(null);};this.eq=function(){return(null);};this.error=function(){return(null);};this.eventcurrentTarget=function(){return(null);};this.eventdata=function(){return(null);};this.eventdelegateTarget=function(){return(null);};this.eventisDefaultPrevented=function(){return(null);};this.eventisImmediatePropagationStopped=function(){return(null);};this.eventisPropagationStopped=function(){return(null);};this.eventmetaKey=function(){return(null);};this.eventnamespace=function(){return(null);};this.eventpageX=function(){return(null);};this.eventpageY=function(){return(null);};this.eventpreventDefault=function(){return(null);};this.eventrelatedTarget=function(){return(null);};this.eventresult=function(){return(null);};this.eventstopImmediatePropagation=function(){return(null);};this.eventstopPropagation=function(){return(null);};this.eventtarget=function(){return(null);};this.eventtimeStamp=function(){return(null);};this.eventtype=function(){return(null);};this.eventwhich=function(){return(null);};this.fadeIn=function(){return(null);};this.fadeOut=function(){return(null);};this.fadeTo=function(){return(null);};this.fadeToggle=function(){return(null);};this.filter=function(){return(null);};this.find=function(){return(null);};this.finish=function(){return(null);};this.first=function(){return(null);};this.focus=function(){return(null);};this.focusin=function(){return(null);};this.focusout=function(){return(null);};this.get=function(){return(null);};this.has=function(){return(null);};this.hasClass=function(){return(null);};this.height=function(){return(null);};this.hide=function(){return(null);};this.hover=function(){return(null);};this.html=function(){return(null);};this.index=function(){return(null);};this.innerHeight=function(){return(null);};this.innerWidth=function(){return(null);};this.insertAfter=function(){return(null);};this.insertBefore=function(){return(null);};this.is=function(){return(null);};this.jQuery=function(){return(null);};this.jquery=function(){return(null);};this.jQueryajax=function(){return(null);};this.jQueryajaxPrefilter=function(){return(null);};this.jQueryajaxSetup=function(){return(null);};this.jQueryajaxTransport=function(){return(null);};this.jQueryboxModel=function(){return(null);};this.jQuerybrowser=function(){return(null);};this.jQueryCallbacks=function(){return(null);};this.jQuerycontains=function(){return(null);};this.jQuerycssHooks=function(){return(null);};this.jQuerycssNumber=function(){return(null);};this.jQuerydata=function(){return(null);};this.jQueryDeferred=function(){return(null);};this.jQuerydequeue=function(){return(null);};this.jQueryeach=function(){return(null);};this.jQueryerror=function(){return(null);};this.jQueryextend=function(){return(null);};this.jQueryfnextend=function(){return(null);};this.jQueryfxinterval=function(){return(null);};this.jQueryfxoff=function(){return(null);};this.jQueryget=function(){return(null);};this.jQuerygetJSON=function(){return(null);};this.jQuerygetScript=function(){return(null);};this.jQueryglobalEval=function(){return(null);};this.jQuerygrep=function(){return(null);};this.jQueryhasData=function(){return(null);};this.jQueryholdReady=function(){return(null);};this.jQueryinArray=function(){return(null);};this.jQueryisArray=function(){return(null);};this.jQueryisEmptyObject=function(){return(null);};this.jQueryisFunction=function(){return(null);};this.jQueryisNumeric=function(){return(null);};this.jQueryisPlainObject=function(){return(null);};this.jQueryisWindow=function(){return(null);};this.jQueryisXMLDoc=function(){return(null);};this.jQuerymakeArray=function(){return(null);};this.jQuerymap=function(){return(null);};this.jQuerymerge=function(){return(null);};this.jQuerynoConflict=function(){return(null);};this.jQuerynoop=function(){return(null);};this.jQuerynow=function(){return(null);};this.jQueryparam=function(){return(null);};this.jQueryparseHTML=function(){return(null);};this.jQueryparseJSON=function(){return(null);};this.jQueryparseXML=function(){return(null);};this.jQuerypost=function(){return(null);};this.jQueryproxy=function(){return(null);};this.jQueryqueue=function(){return(null);};this.jQueryremoveData=function(){return(null);};this.jQuerysub=function(){return(null);};this.jQuerysupport=function(){return(null);};this.jQuerytrim=function(){return(null);};this.jQuerytype=function(){return(null);};this.jQueryunique=function(){return(null);};this.jQuerywhen=function(){return(null);};this.keydown=function(){return(null);};this.keypress=function(){return(null);};this.keyup=function(){return(null);};this.last=function(){return(null);};this.length=function(){return(null);};this.live=function(){return(null);};this.load=function(){return(null);};this.load=function(){return(null);};this.map=function(){return(null);};this.mousedown=function(){return(null);};this.mouseenter=function(){return(null);};this.mouseleave=function(){return(null);};this.mousemove=function(){return(null);};this.mouseout=function(){return(null);};this.mouseover=function(){return(null);};this.mouseup=function(){return(null);};this.next=function(){return(null);};this.nextAll=function(){return(null);};this.nextUntil=function(){return(null);};this.not=function(){return(null);};this.off=function(){return(null);};this.offset=function(){return(null);};this.offsetParent=function(){return(null);};this.on=function(){return(null);};this.one=function(){return(null);};this.outerHeight=function(){return(null);};this.outerWidth=function(){return(null);};this.parent=function(){return(null);};this.parents=function(){return(null);};this.parentsUntil=function(){return(null);};this.position=function(){return(null);};this.prepend=function(){return(null);};this.prependTo=function(){return(null);};this.prev=function(){return(null);};this.prevAll=function(){return(null);};this.prevUntil=function(){return(null);};this.promise=function(){return(null);};this.prop=function(){return(null);};this.pushStack=function(){return(null);};this.queue=function(){return(null);};this.ready=function(){return(null);};this.remove=function(){return(null);};this.removeAttr=function(){return(null);};this.removeClass=function(){return(null);};this.removeData=function(){return(null);};this.removeProp=function(){return(null);};this.replaceAll=function(){return(null);};this.replaceWith=function(){return(null);};this.resize=function(){return(null);};this.scroll=function(){return(null);};this.scrollLeft=function(){return(null);};this.scrollTop=function(){return(null);};this.select=function(){return(null);};this.selector=function(){return(null);};this.serialize=function(){return(null);};this.serializeArray=function(){return(null);};this.show=function(){return(null);};this.siblings=function(){return(null);};this.size=function(){return(null);};this.slice=function(){return(null);};this.slideDown=function(){return(null);};this.slideToggle=function(){return(null);};this.slideUp=function(){return(null);};this.stop=function(){return(null);};this.submit=function(){return(null);};this.text=function(){return(null);};this.toArray=function(){return(null);};this.toggle=function(){return(null);};this.toggle=function(){return(null);};this.toggleClass=function(){return(null);};this.trigger=function(){return(null);};this.triggerHandler=function(){return(null);};this.unbind=function(){return(null);};this.undelegate=function(){return(null);};this.unload=function(){return(null);};this.unwrap=function(){return(null);};this.val=function(){return(null);};this.width=function(){return(null);};this.wrap=function(){return(null);};this.wrapAll=function(){return(null);};this.wrapInner=function(){return(null);}});};"+s; + s = "var document = \"\"; var $ = function(){return(new function(){this.add=function(){return(this);};this.addBack=function(){return(this);};this.addClass=function(){return(this);};this.after=function(){return(this);};this.ajaxComplete=function(){return(this);};this.ajaxError=function(){return(this);};this.ajaxSend=function(){return(this);};this.ajaxStart=function(){return(this);};this.ajaxStop=function(){return(this);};this.ajaxSuccess=function(){return(this);};this.andSelf=function(){return(this);};this.animate=function(){return(this);};this.append=function(){return(this);};this.appendTo=function(){return(this);};this.attr=function(){return(this);};this.before=function(){return(this);};this.bind=function(){return(this);};this.blur=function(){return(this);};this.callbacksadd=function(){return(this);};this.callbacksdisable=function(){return(this);};this.callbacksdisabled=function(){return(this);};this.callbacksempty=function(){return(this);};this.callbacksfire=function(){return(this);};this.callbacksfired=function(){return(this);};this.callbacksfireWith=function(){return(this);};this.callbackshas=function(){return(this);};this.callbackslock=function(){return(this);};this.callbackslocked=function(){return(this);};this.callbacksremove=function(){return(this);};this.change=function(){return(this);};this.children=function(){return(this);};this.clearQueue=function(){return(this);};this.click=function(){return(this);};this.clone=function(){return(this);};this.closest=function(){return(this);};this.contents=function(){return(this);};this.context=function(){return(this);};this.css=function(){return(this);};this.data=function(){return(this);};this.dblclick=function(){return(this);};this.delay=function(){return(this);};this.delegate=function(){return(this);};this.dequeue=function(){return(this);};this.detach=function(){return(this);};this.die=function(){return(this);};this.each=function(){return(this);};this.empty=function(){return(this);};this.end=function(){return(this);};this.eq=function(){return(this);};this.error=function(){return(this);};this.fadeIn=function(){return(this);};this.fadeOut=function(){return(this);};this.fadeTo=function(){return(this);};this.fadeToggle=function(){return(this);};this.filter=function(){return(this);};this.find=function(){return(this);};this.finish=function(){return(this);};this.first=function(){return(this);};this.focus=function(){return(this);};this.focusin=function(){return(this);};this.focusout=function(){return(this);};this.get=function(){return(this);};this.has=function(){return(this);};this.hasClass=function(){return(this);};this.height=function(){return(this);};this.hide=function(){return(this);};this.hover=function(){return(this);};this.html=function(){return(this);};this.index=function(){return(this);};this.innerHeight=function(){return(this);};this.innerWidth=function(){return(this);};this.insertAfter=function(){return(this);};this.insertBefore=function(){return(this);};this.is=function(){return(this);};this.jQuery=function(){return(this);};this.jquery=function(){return(this);};this.keydown=function(){return(this);};this.keypress=function(){return(this);};this.keyup=function(){return(this);};this.last=function(){return(this);};this.length=function(){return(this);};this.live=function(){return(this);};this.load=function(){return(this);};this.load=function(){return(this);};this.map=function(){return(this);};this.mousedown=function(){return(this);};this.mouseenter=function(){return(this);};this.mouseleave=function(){return(this);};this.mousemove=function(){return(this);};this.mouseout=function(){return(this);};this.mouseover=function(){return(this);};this.mouseup=function(){return(this);};this.next=function(){return(this);};this.nextAll=function(){return(this);};this.nextUntil=function(){return(this);};this.not=function(){return(this);};this.off=function(){return(this);};this.offset=function(){return(this);};this.offsetParent=function(){return(this);};this.on=function(){return(this);};this.one=function(){return(this);};this.outerHeight=function(){return(this);};this.outerWidth=function(){return(this);};this.parent=function(){return(this);};this.parents=function(){return(this);};this.parentsUntil=function(){return(this);};this.position=function(){return(this);};this.prepend=function(){return(this);};this.prependTo=function(){return(this);};this.prev=function(){return(this);};this.prevAll=function(){return(this);};this.prevUntil=function(){return(this);};this.promise=function(){return(this);};this.prop=function(){return(this);};this.pushStack=function(){return(this);};this.queue=function(){return(this);};this.ready=function(){return(this);};this.remove=function(){return(this);};this.removeAttr=function(){return(this);};this.removeClass=function(){return(this);};this.removeData=function(){return(this);};this.removeProp=function(){return(this);};this.replaceAll=function(){return(this);};this.replaceWith=function(){return(this);};this.resize=function(){return(this);};this.scroll=function(){return(this);};this.scrollLeft=function(){return(this);};this.scrollTop=function(){return(this);};this.select=function(){return(this);};this.selector=function(){return(this);};this.serialize=function(){return(this);};this.serializeArray=function(){return(this);};this.show=function(){return(this);};this.siblings=function(){return(this);};this.size=function(){return(this);};this.slice=function(){return(this);};this.slideDown=function(){return(this);};this.slideToggle=function(){return(this);};this.slideUp=function(){return(this);};this.stop=function(){return(this);};this.submit=function(){return(this);};this.text=function(){return(this);};this.toArray=function(){return(this);};this.toggle=function(){return(this);};this.toggle=function(){return(this);};this.toggleClass=function(){return(this);};this.trigger=function(){return(this);};this.triggerHandler=function(){return(this);};this.unbind=function(){return(this);};this.undelegate=function(){return(this);};this.unload=function(){return(this);};this.unwrap=function(){return(this);};this.val=function(){return(this);};this.width=function(){return(this);};this.wrap=function(){return(this);};this.wrapAll=function(){return(this);};this.wrapInner=function(){return(this);}});};$.ajax=function(){return($);};$.ajaxPrefilter=function(){return($);};$.ajaxSetup=function(){return($);};$.ajaxTransport=function(){return($);};$.boxModel=function(){return($);};$.browser=function(){return($);};$.Callbacks=function(){return($);};$.contains=function(){return($);};$.cssHooks=function(){return($);};$.cssNumber=function(){return($);};$.data=function(){return($);};$.Deferred=function(){return($);};$.dequeue=function(){return($);};$.each=function(){return($);};$.error=function(){return($);};$.extend=function(){return($);};$.fnextend=function(){return($);};$.fxinterval=function(){return($);};$.fxoff=function(){return($);};$.get=function(){return($);};$.getJSON=function(){return($);};$.getScript=function(){return($);};$.globalEval=function(){return($);};$.grep=function(){return($);};$.hasData=function(){return($);};$.holdReady=function(){return($);};$.inArray=function(){return($);};$.isArray=function(){return($);};$.isEmptyObject=function(){return($);};$.isFunction=function(){return($);};$.isNumeric=function(){return($);};$.isPlainObject=function(){return($);};$.isWindow=function(){return($);};$.isXMLDoc=function(){return($);};$.makeArray=function(){return($);};$.map=function(){return($);};$.merge=function(){return($);};$.noConflict=function(){return($);};$.noop=function(){return($);};$.now=function(){return($);};$.param=function(){return($);};$.parseHTML=function(){return($);};$.parseJSON=function(){return($);};$.parseXML=function(){return($);};$.post=function(){return($);};$.proxy=function(){return($);};$.queue=function(){return($);};$.removeData=function(){return($);};$.sub=function(){return($);};$.support=function(){return($);};$.trim=function(){return($);};$.type=function(){return($);};$.unique=function(){return($);};$.when=function(){return($);};$.always=function(){return($);};$.done=function(){return($);};$.fail=function(){return($);};$.isRejected=function(){return($);};$.isResolved=function(){return($);};$.notify=function(){return($);};$.notifyWith=function(){return($);};$.pipe=function(){return($);};$.progress=function(){return($);};$.promise=function(){return($);};$.reject=function(){return($);};$.rejectWith=function(){return($);};$.resolve=function(){return($);};$.resolveWith=function(){return($);};$.state=function(){return($);};$.then=function(){return($);};$.currentTarget=function(){return($);};$.data=function(){return($);};$.delegateTarget=function(){return($);};$.isDefaultPrevented=function(){return($);};$.isImmediatePropagationStopped=function(){return($);};$.isPropagationStopped=function(){return($);};$.metaKey=function(){return($);};$.namespace=function(){return($);};$.pageX=function(){return($);};$.pageY=function(){return($);};$.preventDefault=function(){return($);};$.relatedTarget=function(){return($);};$.result=function(){return($);};$.stopImmediatePropagation=function(){return($);};$.stopPropagation=function(){return($);};$.target=function(){return($);};$.timeStamp=function(){return($);};$.type=function(){return($);};$.which=function(){return($);};"+s; submit( scopejQuery(s), function (cls, message) { if (cls) { From f3d4e7dec8965ff3540aa90139f2f3e05cc362d0 Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Tue, 25 Aug 2015 20:47:37 +0100 Subject: [PATCH 068/134] Fixed stupid fccss and fcces not replacing :p --- public/js/lib/coursewares/commonFrameWork.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/lib/coursewares/commonFrameWork.js b/public/js/lib/coursewares/commonFrameWork.js index 0cdac5519fb..09b3061d4b3 100644 --- a/public/js/lib/coursewares/commonFrameWork.js +++ b/public/js/lib/coursewares/commonFrameWork.js @@ -532,6 +532,6 @@ $('#submitButton').on('click', function() { $(document).ready(function(){ editorValue = (codeStorage.isAlive())? codeStorage.getEditorValue() : allSeeds; - myCodeMirror.setValue(editorValue); + myCodeMirror.setValue(editorValue.replace(/fccsss/gi, '")); bonfireExecute(); }); From 5441c5848ea9ba49f63a189cccebd42591f14b8a Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Tue, 25 Aug 2015 20:48:46 +0100 Subject: [PATCH 069/134] I can't spell --- public/js/lib/coursewares/commonFrameWork.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/lib/coursewares/commonFrameWork.js b/public/js/lib/coursewares/commonFrameWork.js index 09b3061d4b3..6070ec0248e 100644 --- a/public/js/lib/coursewares/commonFrameWork.js +++ b/public/js/lib/coursewares/commonFrameWork.js @@ -532,6 +532,6 @@ $('#submitButton').on('click', function() { $(document).ready(function(){ editorValue = (codeStorage.isAlive())? codeStorage.getEditorValue() : allSeeds; - myCodeMirror.setValue(editorValue.replace(/fccsss/gi, '")); + myCodeMirror.setValue(editorValue.replace(/fccss/gi, '")); bonfireExecute(); }); From 16cd733dd33842291e59ef630dc121b0b4f3b97e Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Tue, 25 Aug 2015 20:55:19 +0100 Subject: [PATCH 070/134] Fixed RegEx to be super accurate --- public/js/lib/coursewares/commonFrameWork.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/lib/coursewares/commonFrameWork.js b/public/js/lib/coursewares/commonFrameWork.js index 6070ec0248e..1696b87f3a9 100644 --- a/public/js/lib/coursewares/commonFrameWork.js +++ b/public/js/lib/coursewares/commonFrameWork.js @@ -243,7 +243,7 @@ if(typeof prodOrDev !== 'undefined') { editor.setValue(editor.getValue() + "-->"); editorValueForIFrame = editorValueForIFrame + "-->"; } - if(!editor.getValue().match(/\$\(\$\)/gi) ) { + if(!editor.getValue().match(/\$\s*?\(\s*?\$\s*?\)/gi) ) { safeHTMLRun(false); } } From 8509197b6db77b7d645b8ea400dd63f2234a4743 Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Tue, 25 Aug 2015 21:03:50 +0100 Subject: [PATCH 071/134] Fixed RegEx to be super accurate again --- public/js/lib/coursewares/commonFrameWork.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/js/lib/coursewares/commonFrameWork.js b/public/js/lib/coursewares/commonFrameWork.js index 1696b87f3a9..0ef7987724b 100644 --- a/public/js/lib/coursewares/commonFrameWork.js +++ b/public/js/lib/coursewares/commonFrameWork.js @@ -243,7 +243,7 @@ if(typeof prodOrDev !== 'undefined') { editor.setValue(editor.getValue() + "-->"); editorValueForIFrame = editorValueForIFrame + "-->"; } - if(!editor.getValue().match(/\$\s*?\(\s*?\$\s*?\)/gi) ) { + if(!editor.getValue().match(/\$\s*?\(\s*?\$\s*?\)/gi)){ safeHTMLRun(false); } } @@ -476,7 +476,7 @@ function bonfireExecute() { ga('send', 'event', 'Challenge', 'ran-code', challenge_Name); userTests = null; $('#testSuite').empty(); - if(challengeType !== "0"){ + if(challengeType !== "0" && !editor.getValue().match(/\$\s*?\(\s*?\$\s*?\)/gi)){ var userJavaScript = myCodeMirror.getValue(); var failedCommentTest = false; if (userJavaScript.match(/\/\*/gi) && userJavaScript.match(/\*\//gi) == null) { @@ -520,7 +520,7 @@ function bonfireExecute() { editor.setValue(editor.getValue() + "-->"); editorValueForIFrame = editorValueForIFrame + "-->"; } - if(!editor.getValue().match(/\$\(\$\)/gi) && challengeType === "0") { + if(!editor.getValue().match(/\$\s*?\(\s*?\$\s*?\)/gi) && challengeType === "0") { safeHTMLRun(true); } } From c9113faee50f8e6e34fe618e904acd388c35e4c0 Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Tue, 25 Aug 2015 21:07:36 +0100 Subject: [PATCH 072/134] added error to the $($) blocker --- public/js/lib/coursewares/commonFrameWork.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/public/js/lib/coursewares/commonFrameWork.js b/public/js/lib/coursewares/commonFrameWork.js index 0ef7987724b..78ac7f0bfaa 100644 --- a/public/js/lib/coursewares/commonFrameWork.js +++ b/public/js/lib/coursewares/commonFrameWork.js @@ -246,6 +246,9 @@ if(typeof prodOrDev !== 'undefined') { if(!editor.getValue().match(/\$\s*?\(\s*?\$\s*?\)/gi)){ safeHTMLRun(false); } + else{ + workerError("Unsafe $($)"); + } } setTimeout(updatePreview, 300); @@ -523,6 +526,9 @@ function bonfireExecute() { if(!editor.getValue().match(/\$\s*?\(\s*?\$\s*?\)/gi) && challengeType === "0") { safeHTMLRun(true); } + else{ + workerError("Unsafe $($)"); + } } } From a6153c86e49d617c96ab4a8d0393f3ef31dbe59c Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Tue, 25 Aug 2015 21:48:15 +0100 Subject: [PATCH 073/134] Tweak function declaration checker --- public/js/lib/coursewares/commonFrameWork.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/lib/coursewares/commonFrameWork.js b/public/js/lib/coursewares/commonFrameWork.js index 78ac7f0bfaa..ad8eea6c722 100644 --- a/public/js/lib/coursewares/commonFrameWork.js +++ b/public/js/lib/coursewares/commonFrameWork.js @@ -493,7 +493,7 @@ function bonfireExecute() { // simple fix in case the user forgets to invoke their function if(userJavaScript.match(/function/gi)){ - if(userJavaScript.match(/function\s+?\(|function\s+\w+\s*?\(/gi)){ + if(userJavaScript.match(/function\s*?\(|function\s+\w+\s*?\(/gi)){ submit(userJavaScript, function (cls, message) { if (failedCommentTest) { myCodeMirror.setValue(myCodeMirror.getValue() + "*/"); From 56b18f313bee6d3dfcbe44de9d19653f4e99e488 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Tue, 25 Aug 2015 14:23:47 -0700 Subject: [PATCH 074/134] update get-started alt text --- server/views/resources/get-started.jade | 48 ++++++++++++------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/server/views/resources/get-started.jade b/server/views/resources/get-started.jade index 5246a7b86ce..2640acffbf2 100644 --- a/server/views/resources/get-started.jade +++ b/server/views/resources/get-started.jade @@ -12,7 +12,7 @@ block content .big-spacer .thumbnail - img.gif-block.img-center.img-responsive(src='http://i.imgur.com/pYsTbjI.jpg' alt='a screenshot of our curriculum alongside a screenshot of our chat room') + img.gif-block.img-center.img-responsive(src='http://i.imgur.com/pYsTbjI.jpg' alt='a screenshot of our curriculum alongside a screenshot of our chat room.') .caption p.large-p Learning to code is hard. To succeed, you'll need lots practice and support. That's why we've created a rigorous curriculum and supportive community. @@ -30,19 +30,19 @@ block content .big-spacer .thumbnail - img.gif-block.img-center.img-responsive(src='http://i.imgur.com/yXyxbDd.jpg' alt='a gif showing how to install this') + img.gif-block.img-center.img-responsive(src='http://i.imgur.com/yXyxbDd.jpg' alt='a screen shot of our nonprofit project directory.') .caption p.large-p During the last 800 hours, you'll build several real-life projects for nonprofits. By the time you finish, you'll have a job-winning portfolio of real apps that people use every day. .big-spacer .thumbnail - img.gif-block.img-center.img-responsive(src='http://i.imgur.com/EAR7Lvh.jpg' alt='a gif showing how to install this') + img.gif-block.img-center.img-responsive(src='http://i.imgur.com/EAR7Lvh.jpg' alt='a screenshot of our one of our Gitter chat rooms.') .caption p.large-p Now let's join Free Code Camp's chat rooms. You can come here any time of day to hang out, ask questions, or find another camper to pair program with. First you'll need a GitHub account. .big-spacer .thumbnail - img.gif-block.img-center.img-responsive(src='http://i.imgur.com/FEImaEN.gif' alt='a gif showing how to install this') + img.gif-block.img-center.img-responsive(src='http://i.imgur.com/FEImaEN.gif' alt='A gif showing you to click the link below to go to GitHub. Fill in the necessary fields and click submit.') .caption p.large-p Try this:  a(href='https://github.com/join' target='_blank') Create an account with GitHub @@ -50,14 +50,14 @@ block content .big-spacer .thumbnail - img.gif-block.img-center.img-responsive(src='http://i.imgur.com/ALN6zPK.gif' alt='a gif showing how to install this') + img.gif-block.img-center.img-responsive(src='http://i.imgur.com/ALN6zPK.gif' alt='A gif showing you how to click the profile image in the upper right hand corner of GitHub. Upload a photo of yourself or you will continue to use the automatically generated pixel art. Then fill in the remaining form fields and click submit.') .caption p.large-p Try this:  | Click the pixel art in the upper right hand corner of GitHub, then choose settings. Upload a picture of yourself. A picture of your face works best. This is how your fellow campers will see you in our chat rooms, so put your best foot forward. You can add your city and your name if you want. .big-spacer .thumbnail - img.gif-block.img-center.img-responsive(src='http://i.imgur.com/OXL3G3n.gif' alt='a gif showing how to install this') + img.gif-block.img-center.img-responsive(src='http://i.imgur.com/OXL3G3n.gif' alt="Click the link below to navigate to Free Code Camp's open-source repository. In the upper right hand corner, you can click the \"star\" button to star this repository.") .caption p.large-p Try this:  a(href='//github.com/freecodecamp/freecodecamp' target='_blank') Go to Free Code Camp's open-source repository @@ -65,7 +65,7 @@ block content .big-spacer .thumbnail - img.gif-block.img-center.img-responsive(src='http://i.imgur.com/EZHzKCV.gif' alt='a gif showing how to install this') + img.gif-block.img-center.img-responsive(src='http://i.imgur.com/EZHzKCV.gif' alt='A gif showing you how to click the link below to go to our chat room and click the \"sign in with GitHub\" button. Then you can click into the text input field and type a message to your fellow campers.') .caption p.large-p Try this:  | Now that you have a GitHub account, you can  @@ -74,26 +74,26 @@ block content .big-spacer .thumbnail - img.gif-block.img-center.img-responsive(src='http://i.imgur.com/Ecs5XAd.gif' alt='a gif showing how to install this') + img.gif-block.img-center.img-responsive(src='http://i.imgur.com/Ecs5XAd.gif' alt='A gif showing you how you can click the settings button in the upper right hand corner and modify your notification settings.') .caption p.large-p Try this:  | Our chat rooms are extremely active. You should change your settings so you're only notified if someone mentions you. .big-spacer .thumbnail - img.gif-block.img-center.img-responsive(src='http://i.imgur.com/T0bGJPe.gif' alt='a gif showing how to install this') + img.gif-block.img-center.img-responsive(src='http://i.imgur.com/T0bGJPe.gif' alt='A gif showing how you can click on a user profile image to initiate a private message with that user.') .caption p.large-p Please note that all of our chat rooms are visible to the public. If you need to share sensitive information, such as an email address or phone number, do it in a private message. .big-spacer .thumbnail - img.gif-block.img-center.img-responsive(src='http://i.imgur.com/vDTMJSh.gif' alt='a gif showing how to install this') + img.gif-block.img-center.img-responsive(src='http://i.imgur.com/vDTMJSh.gif' alt='A gif showing that you can tab back and forth between challenges and our chat rooms.') .caption p.large-p Keep our chat room open while you work through our challenges. That way, you can ask for help if you get stuck. You can also socialize with other campers when you feel like taking a break. .big-spacer .thumbnail - img.gif-block.img-center.img-responsive(src='http://i.imgur.com/SLQ27Gr.gif' alt='a gif showing how to install this') + img.gif-block.img-center.img-responsive(src='http://i.imgur.com/SLQ27Gr.gif' alt='A gif showing how you can click the link below to download a native chat room app for your computer.') .caption p.large-p You can also  a(href='https://gitter.im/apps' target='_blank') download the chat room app @@ -101,38 +101,38 @@ block content .big-spacer .thumbnail - img.gif-block.img-center.img-responsive(src='http://i.imgur.com/DoOqkNW.gif' alt='a gif showing how to install this') + img.gif-block.img-center.img-responsive(src='http://i.imgur.com/DoOqkNW.gif' alt='A gif showing how you can click the "Wiki" button in your upper-right corner to access the wiki.') .caption p.large-p Try this: Click the "Wiki" button in your upper right hand corner. Our community has contributed lots of useful information to this searchable wiki. .big-spacer .thumbnail - img.gif-block.img-center.img-responsive(src='http://i.imgur.com/FkEzbto.gif' alt='a gif showing how to install this') + img.gif-block.img-center.img-responsive(src='http://i.imgur.com/FkEzbto.gif' alt='A gif showing how you can click your profile image in your upper right hand corner to access the account page and connect GitHub.') .caption p.large-p Try this: Check out your portfolio page. Click your picture your upper right hand corner. To activate your portfolio page, you'll need to link your GitHub account with Free Code Camp. .big-spacer .thumbnail - img.gif-block.img-center.img-responsive(src='http://i.imgur.com/WKzEr1q.gif' alt='a gif showing how to install this') + img.gif-block.img-center.img-responsive(src='http://i.imgur.com/WKzEr1q.gif' alt='A gif showing how you can access your profile page and hover over different days to see how many brownie points you got on those days.') .caption p.large-p Your portfolio page shows your progress and how many Brownie Points you have. You can get Brownie Points by completing challenges and by helping other campers in our chat rooms. If you get Brownie Points on several days in a row, you'll get a streak. .big-spacer .thumbnail - img.gif-block.img-center.img-responsive(src='http://i.imgur.com/nmSiMy1.gif' alt='a gif showing how to install this') + img.gif-block.img-center.img-responsive(src='http://i.imgur.com/nmSiMy1.gif' alt='A gif showing how you can access our Camper News page and click the "upvote" button to upvote a story.') .caption p.large-p Try this:  | Click the "News" button in your upper right hand corner. You can browse links on Camper News and upvote ones that you enjoy. .big-spacer .thumbnail - img.gif-block.img-center.img-responsive(src='http://i.imgur.com/Elb3dfj.jpg' alt='a gif showing how to install this') + img.gif-block.img-center.img-responsive(src='http://i.imgur.com/Elb3dfj.jpg' alt='A picture of some of our campers meeting in a local cafe. 3 men and 3 women are sitting around a table with laptops out, and are smiling and coding.') .caption p.large-p Our Campsites help you code with campers in your city. You can coordinate study groups or attend local coding events together. .big-spacer .thumbnail - img.gif-block.img-center.img-responsive(src='http://i.imgur.com/EZHzKCV.gif' alt='a gif showing how to install this') + img.gif-block.img-center.img-responsive(src='http://i.imgur.com/EZHzKCV.gif' alt="A gif showing how you can click the link below, find your city on the list of Campsites, then click on the Facebook link for your city and join your city's Facebook group.") .caption p.large-p Try this:  a(href='https://github.com/FreeCodeCamp/freecodecamp/wiki/List-of-Free-Code-Camp-city-based-Campsites' target='_blank') Find your city on this list @@ -142,7 +142,7 @@ block content .big-spacer .thumbnail - img.gif-block.img-center.img-responsive(src='http://i.imgur.com/3AgvJQg.gif' alt='a gif showing how to install this') + img.gif-block.img-center.img-responsive(src='http://i.imgur.com/3AgvJQg.gif' alt="A gif showing how click the link below, find your city, and click the \"Gitter\" button to join your city's Gitter chat room") .caption p.large-p Try this:  a(href='https://github.com/FreeCodeCamp/freecodecamp/wiki/List-of-Free-Code-Camp-city-based-Campsites' target='_blank') Go back to our list of Campsites  @@ -150,7 +150,7 @@ block content .big-spacer .thumbnail - img.gif-block.img-center.img-responsive(src='http://i.imgur.com/P7qfJXt.gif' alt='a gif showing how to install this') + img.gif-block.img-center.img-responsive(src='http://i.imgur.com/P7qfJXt.gif' alt='A gif showing how you can click the link below and fill in the necessary fields to add your Free Code Camp studies to your LinkedIn profile.') .caption p.large-p You can  a(href='https://www.linkedin.com/profile/edit-education?school=Free+Code+Camp' target='_blank') add Free Code Camp to your LinkedIn education background @@ -158,25 +158,25 @@ block content .big-spacer .thumbnail - img.gif-block.img-center.img-responsive(src='http://i.imgur.com/EWWZBag.jpg' alt='a gif showing how to install this') + img.gif-block.img-center.img-responsive(src='http://i.imgur.com/EWWZBag.jpg' alt='An image with the text \"1. Read the error 2. Search Google 3. Ask for help.') .caption p.large-p Let's cover one last thing before you start working through our challenges: how to get help. Any time you get stuck or don't know what to do next: Read-Search-Ask. .big-spacer .thumbnail - img.gif-block.img-center.img-responsive(src='http://i.imgur.com/99BfAcK.jpg' alt='a gif showing how to install this') + img.gif-block.img-center.img-responsive(src='http://i.imgur.com/99BfAcK.jpg' alt='An image showing jQuery documentation') .caption p.large-p First, read the documentation or error message. A key skill that good coders have is the ability to interpret and then follow instructions. .big-spacer .thumbnail - img.gif-block.img-center.img-responsive(src='http://i.imgur.com/GxvrsFb.gif' alt='a gif showing how to install this') + img.gif-block.img-center.img-responsive(src='http://i.imgur.com/GxvrsFb.gif' alt="A gif showing you how to do an advanced Google search. First, we enter the query \"jquery doesn't run when my page loads\". Then we click search tools button and change the \"Any time\" select box to \"within the last year\". Then we click on a result and read through the article and find our answer.") .caption p.large-p If that didn't help, search Google. Good Google queries take a lot of practice. When you search Google, you usually want to include the language or framework you're using. You also want to limit the results to a recent period. .big-spacer .thumbnail - img.gif-block.img-center.img-responsive(src='http://i.imgur.com/LZYU7p2.gif' alt='a gif showing how to install this') + img.gif-block.img-center.img-responsive(src='http://i.imgur.com/LZYU7p2.gif' alt="A gif showing us following the link below to go to the help chat room and ask \"jquery doesn't run when my page loads\".") .caption p.large-p If that didn't help, ask your friends. If you have trouble, you can ask your fellow campers in our  a(href='https://gitter.im/FreeCodeCamp/Help' target='_blank') help chat room @@ -184,6 +184,6 @@ block content .big-spacer .thumbnail - img.gif-block.img-center.img-responsive(src='http://i.imgur.com/WsfzvVo.gif' alt='a gif showing how to install this') + img.gif-block.img-center.img-responsive(src='http://i.imgur.com/WsfzvVo.gif' alt='A gif showing us clicking the \"map\" button in our upper right hand corner and browsing our challenge map.') .caption p.large-p Now you're ready to start coding! Click the "Map" button in your upper right hand corner. Our map shows all our coding challenges. We recommend that you complete these from top to bottom, at a sustainable pace. From b1b07a5b9e44efbb0e312710813d3aaf52a61354 Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Tue, 25 Aug 2015 22:25:00 +0100 Subject: [PATCH 075/134] Fixed major Fudge up with challenges without functions --- public/js/lib/coursewares/commonFrameWork.js | 93 +++++---- server/views/coursewares/showBonfire.jade | 192 +++++++++---------- server/views/coursewares/showHTML.jade | 88 ++++----- server/views/coursewares/showJS.jade | 98 +++++----- 4 files changed, 246 insertions(+), 225 deletions(-) diff --git a/public/js/lib/coursewares/commonFrameWork.js b/public/js/lib/coursewares/commonFrameWork.js index ad8eea6c722..1a40d2f1f4d 100644 --- a/public/js/lib/coursewares/commonFrameWork.js +++ b/public/js/lib/coursewares/commonFrameWork.js @@ -182,46 +182,48 @@ function scopejQuery(s){ } function safeHTMLRun(test){ - var previewFrame = document.getElementById('preview'); - var preview = previewFrame.contentDocument || previewFrame.contentWindow.document; - if(editor.getValue().match(/\/gi) !== null) { - var s = editor.getValue().split(/\<\s?script\s?\>/gi)[1].split(/\<\s?\/\s?script\s?\>/gi)[0]; - s = "var document = \"\"; var $ = function(){return(new function(){this.add=function(){return(this);};this.addBack=function(){return(this);};this.addClass=function(){return(this);};this.after=function(){return(this);};this.ajaxComplete=function(){return(this);};this.ajaxError=function(){return(this);};this.ajaxSend=function(){return(this);};this.ajaxStart=function(){return(this);};this.ajaxStop=function(){return(this);};this.ajaxSuccess=function(){return(this);};this.andSelf=function(){return(this);};this.animate=function(){return(this);};this.append=function(){return(this);};this.appendTo=function(){return(this);};this.attr=function(){return(this);};this.before=function(){return(this);};this.bind=function(){return(this);};this.blur=function(){return(this);};this.callbacksadd=function(){return(this);};this.callbacksdisable=function(){return(this);};this.callbacksdisabled=function(){return(this);};this.callbacksempty=function(){return(this);};this.callbacksfire=function(){return(this);};this.callbacksfired=function(){return(this);};this.callbacksfireWith=function(){return(this);};this.callbackshas=function(){return(this);};this.callbackslock=function(){return(this);};this.callbackslocked=function(){return(this);};this.callbacksremove=function(){return(this);};this.change=function(){return(this);};this.children=function(){return(this);};this.clearQueue=function(){return(this);};this.click=function(){return(this);};this.clone=function(){return(this);};this.closest=function(){return(this);};this.contents=function(){return(this);};this.context=function(){return(this);};this.css=function(){return(this);};this.data=function(){return(this);};this.dblclick=function(){return(this);};this.delay=function(){return(this);};this.delegate=function(){return(this);};this.dequeue=function(){return(this);};this.detach=function(){return(this);};this.die=function(){return(this);};this.each=function(){return(this);};this.empty=function(){return(this);};this.end=function(){return(this);};this.eq=function(){return(this);};this.error=function(){return(this);};this.fadeIn=function(){return(this);};this.fadeOut=function(){return(this);};this.fadeTo=function(){return(this);};this.fadeToggle=function(){return(this);};this.filter=function(){return(this);};this.find=function(){return(this);};this.finish=function(){return(this);};this.first=function(){return(this);};this.focus=function(){return(this);};this.focusin=function(){return(this);};this.focusout=function(){return(this);};this.get=function(){return(this);};this.has=function(){return(this);};this.hasClass=function(){return(this);};this.height=function(){return(this);};this.hide=function(){return(this);};this.hover=function(){return(this);};this.html=function(){return(this);};this.index=function(){return(this);};this.innerHeight=function(){return(this);};this.innerWidth=function(){return(this);};this.insertAfter=function(){return(this);};this.insertBefore=function(){return(this);};this.is=function(){return(this);};this.jQuery=function(){return(this);};this.jquery=function(){return(this);};this.keydown=function(){return(this);};this.keypress=function(){return(this);};this.keyup=function(){return(this);};this.last=function(){return(this);};this.length=function(){return(this);};this.live=function(){return(this);};this.load=function(){return(this);};this.load=function(){return(this);};this.map=function(){return(this);};this.mousedown=function(){return(this);};this.mouseenter=function(){return(this);};this.mouseleave=function(){return(this);};this.mousemove=function(){return(this);};this.mouseout=function(){return(this);};this.mouseover=function(){return(this);};this.mouseup=function(){return(this);};this.next=function(){return(this);};this.nextAll=function(){return(this);};this.nextUntil=function(){return(this);};this.not=function(){return(this);};this.off=function(){return(this);};this.offset=function(){return(this);};this.offsetParent=function(){return(this);};this.on=function(){return(this);};this.one=function(){return(this);};this.outerHeight=function(){return(this);};this.outerWidth=function(){return(this);};this.parent=function(){return(this);};this.parents=function(){return(this);};this.parentsUntil=function(){return(this);};this.position=function(){return(this);};this.prepend=function(){return(this);};this.prependTo=function(){return(this);};this.prev=function(){return(this);};this.prevAll=function(){return(this);};this.prevUntil=function(){return(this);};this.promise=function(){return(this);};this.prop=function(){return(this);};this.pushStack=function(){return(this);};this.queue=function(){return(this);};this.ready=function(){return(this);};this.remove=function(){return(this);};this.removeAttr=function(){return(this);};this.removeClass=function(){return(this);};this.removeData=function(){return(this);};this.removeProp=function(){return(this);};this.replaceAll=function(){return(this);};this.replaceWith=function(){return(this);};this.resize=function(){return(this);};this.scroll=function(){return(this);};this.scrollLeft=function(){return(this);};this.scrollTop=function(){return(this);};this.select=function(){return(this);};this.selector=function(){return(this);};this.serialize=function(){return(this);};this.serializeArray=function(){return(this);};this.show=function(){return(this);};this.siblings=function(){return(this);};this.size=function(){return(this);};this.slice=function(){return(this);};this.slideDown=function(){return(this);};this.slideToggle=function(){return(this);};this.slideUp=function(){return(this);};this.stop=function(){return(this);};this.submit=function(){return(this);};this.text=function(){return(this);};this.toArray=function(){return(this);};this.toggle=function(){return(this);};this.toggle=function(){return(this);};this.toggleClass=function(){return(this);};this.trigger=function(){return(this);};this.triggerHandler=function(){return(this);};this.unbind=function(){return(this);};this.undelegate=function(){return(this);};this.unload=function(){return(this);};this.unwrap=function(){return(this);};this.val=function(){return(this);};this.width=function(){return(this);};this.wrap=function(){return(this);};this.wrapAll=function(){return(this);};this.wrapInner=function(){return(this);}});};$.ajax=function(){return($);};$.ajaxPrefilter=function(){return($);};$.ajaxSetup=function(){return($);};$.ajaxTransport=function(){return($);};$.boxModel=function(){return($);};$.browser=function(){return($);};$.Callbacks=function(){return($);};$.contains=function(){return($);};$.cssHooks=function(){return($);};$.cssNumber=function(){return($);};$.data=function(){return($);};$.Deferred=function(){return($);};$.dequeue=function(){return($);};$.each=function(){return($);};$.error=function(){return($);};$.extend=function(){return($);};$.fnextend=function(){return($);};$.fxinterval=function(){return($);};$.fxoff=function(){return($);};$.get=function(){return($);};$.getJSON=function(){return($);};$.getScript=function(){return($);};$.globalEval=function(){return($);};$.grep=function(){return($);};$.hasData=function(){return($);};$.holdReady=function(){return($);};$.inArray=function(){return($);};$.isArray=function(){return($);};$.isEmptyObject=function(){return($);};$.isFunction=function(){return($);};$.isNumeric=function(){return($);};$.isPlainObject=function(){return($);};$.isWindow=function(){return($);};$.isXMLDoc=function(){return($);};$.makeArray=function(){return($);};$.map=function(){return($);};$.merge=function(){return($);};$.noConflict=function(){return($);};$.noop=function(){return($);};$.now=function(){return($);};$.param=function(){return($);};$.parseHTML=function(){return($);};$.parseJSON=function(){return($);};$.parseXML=function(){return($);};$.post=function(){return($);};$.proxy=function(){return($);};$.queue=function(){return($);};$.removeData=function(){return($);};$.sub=function(){return($);};$.support=function(){return($);};$.trim=function(){return($);};$.type=function(){return($);};$.unique=function(){return($);};$.when=function(){return($);};$.always=function(){return($);};$.done=function(){return($);};$.fail=function(){return($);};$.isRejected=function(){return($);};$.isResolved=function(){return($);};$.notify=function(){return($);};$.notifyWith=function(){return($);};$.pipe=function(){return($);};$.progress=function(){return($);};$.promise=function(){return($);};$.reject=function(){return($);};$.rejectWith=function(){return($);};$.resolve=function(){return($);};$.resolveWith=function(){return($);};$.state=function(){return($);};$.then=function(){return($);};$.currentTarget=function(){return($);};$.data=function(){return($);};$.delegateTarget=function(){return($);};$.isDefaultPrevented=function(){return($);};$.isImmediatePropagationStopped=function(){return($);};$.isPropagationStopped=function(){return($);};$.metaKey=function(){return($);};$.namespace=function(){return($);};$.pageX=function(){return($);};$.pageY=function(){return($);};$.preventDefault=function(){return($);};$.relatedTarget=function(){return($);};$.result=function(){return($);};$.stopImmediatePropagation=function(){return($);};$.stopPropagation=function(){return($);};$.target=function(){return($);};$.timeStamp=function(){return($);};$.type=function(){return($);};$.which=function(){return($);};"+s; - submit( - scopejQuery(s), function (cls, message) { - if (cls) { - console.log(message.error); - workerError(message.error); - } else { - if(test){ - preview.open(); - preview.write(libraryIncludes + editor.getValue() + iFrameScript); - codeStorage.updateStorage(); - preview.close(); - } - else{ - preview.open(); - preview.write(libraryIncludes + editor.getValue()); - codeStorage.updateStorage(); - preview.close(); + if(challengeType === "0"){ + var previewFrame = document.getElementById('preview'); + var preview = previewFrame.contentDocument || previewFrame.contentWindow.document; + if(editor.getValue().match(/\/gi) !== null) { + var s = editor.getValue().split(/\<\s?script\s?\>/gi)[1].split(/\<\s?\/\s?script\s?\>/gi)[0]; + s = "var document = \"\"; var $ = function(){return(new function(){this.add=function(){return(this);};this.addBack=function(){return(this);};this.addClass=function(){return(this);};this.after=function(){return(this);};this.ajaxComplete=function(){return(this);};this.ajaxError=function(){return(this);};this.ajaxSend=function(){return(this);};this.ajaxStart=function(){return(this);};this.ajaxStop=function(){return(this);};this.ajaxSuccess=function(){return(this);};this.andSelf=function(){return(this);};this.animate=function(){return(this);};this.append=function(){return(this);};this.appendTo=function(){return(this);};this.attr=function(){return(this);};this.before=function(){return(this);};this.bind=function(){return(this);};this.blur=function(){return(this);};this.callbacksadd=function(){return(this);};this.callbacksdisable=function(){return(this);};this.callbacksdisabled=function(){return(this);};this.callbacksempty=function(){return(this);};this.callbacksfire=function(){return(this);};this.callbacksfired=function(){return(this);};this.callbacksfireWith=function(){return(this);};this.callbackshas=function(){return(this);};this.callbackslock=function(){return(this);};this.callbackslocked=function(){return(this);};this.callbacksremove=function(){return(this);};this.change=function(){return(this);};this.children=function(){return(this);};this.clearQueue=function(){return(this);};this.click=function(){return(this);};this.clone=function(){return(this);};this.closest=function(){return(this);};this.contents=function(){return(this);};this.context=function(){return(this);};this.css=function(){return(this);};this.data=function(){return(this);};this.dblclick=function(){return(this);};this.delay=function(){return(this);};this.delegate=function(){return(this);};this.dequeue=function(){return(this);};this.detach=function(){return(this);};this.die=function(){return(this);};this.each=function(){return(this);};this.empty=function(){return(this);};this.end=function(){return(this);};this.eq=function(){return(this);};this.error=function(){return(this);};this.fadeIn=function(){return(this);};this.fadeOut=function(){return(this);};this.fadeTo=function(){return(this);};this.fadeToggle=function(){return(this);};this.filter=function(){return(this);};this.find=function(){return(this);};this.finish=function(){return(this);};this.first=function(){return(this);};this.focus=function(){return(this);};this.focusin=function(){return(this);};this.focusout=function(){return(this);};this.get=function(){return(this);};this.has=function(){return(this);};this.hasClass=function(){return(this);};this.height=function(){return(this);};this.hide=function(){return(this);};this.hover=function(){return(this);};this.html=function(){return(this);};this.index=function(){return(this);};this.innerHeight=function(){return(this);};this.innerWidth=function(){return(this);};this.insertAfter=function(){return(this);};this.insertBefore=function(){return(this);};this.is=function(){return(this);};this.jQuery=function(){return(this);};this.jquery=function(){return(this);};this.keydown=function(){return(this);};this.keypress=function(){return(this);};this.keyup=function(){return(this);};this.last=function(){return(this);};this.length=function(){return(this);};this.live=function(){return(this);};this.load=function(){return(this);};this.load=function(){return(this);};this.map=function(){return(this);};this.mousedown=function(){return(this);};this.mouseenter=function(){return(this);};this.mouseleave=function(){return(this);};this.mousemove=function(){return(this);};this.mouseout=function(){return(this);};this.mouseover=function(){return(this);};this.mouseup=function(){return(this);};this.next=function(){return(this);};this.nextAll=function(){return(this);};this.nextUntil=function(){return(this);};this.not=function(){return(this);};this.off=function(){return(this);};this.offset=function(){return(this);};this.offsetParent=function(){return(this);};this.on=function(){return(this);};this.one=function(){return(this);};this.outerHeight=function(){return(this);};this.outerWidth=function(){return(this);};this.parent=function(){return(this);};this.parents=function(){return(this);};this.parentsUntil=function(){return(this);};this.position=function(){return(this);};this.prepend=function(){return(this);};this.prependTo=function(){return(this);};this.prev=function(){return(this);};this.prevAll=function(){return(this);};this.prevUntil=function(){return(this);};this.promise=function(){return(this);};this.prop=function(){return(this);};this.pushStack=function(){return(this);};this.queue=function(){return(this);};this.ready=function(){return(this);};this.remove=function(){return(this);};this.removeAttr=function(){return(this);};this.removeClass=function(){return(this);};this.removeData=function(){return(this);};this.removeProp=function(){return(this);};this.replaceAll=function(){return(this);};this.replaceWith=function(){return(this);};this.resize=function(){return(this);};this.scroll=function(){return(this);};this.scrollLeft=function(){return(this);};this.scrollTop=function(){return(this);};this.select=function(){return(this);};this.selector=function(){return(this);};this.serialize=function(){return(this);};this.serializeArray=function(){return(this);};this.show=function(){return(this);};this.siblings=function(){return(this);};this.size=function(){return(this);};this.slice=function(){return(this);};this.slideDown=function(){return(this);};this.slideToggle=function(){return(this);};this.slideUp=function(){return(this);};this.stop=function(){return(this);};this.submit=function(){return(this);};this.text=function(){return(this);};this.toArray=function(){return(this);};this.toggle=function(){return(this);};this.toggle=function(){return(this);};this.toggleClass=function(){return(this);};this.trigger=function(){return(this);};this.triggerHandler=function(){return(this);};this.unbind=function(){return(this);};this.undelegate=function(){return(this);};this.unload=function(){return(this);};this.unwrap=function(){return(this);};this.val=function(){return(this);};this.width=function(){return(this);};this.wrap=function(){return(this);};this.wrapAll=function(){return(this);};this.wrapInner=function(){return(this);}});};$.ajax=function(){return($);};$.ajaxPrefilter=function(){return($);};$.ajaxSetup=function(){return($);};$.ajaxTransport=function(){return($);};$.boxModel=function(){return($);};$.browser=function(){return($);};$.Callbacks=function(){return($);};$.contains=function(){return($);};$.cssHooks=function(){return($);};$.cssNumber=function(){return($);};$.data=function(){return($);};$.Deferred=function(){return($);};$.dequeue=function(){return($);};$.each=function(){return($);};$.error=function(){return($);};$.extend=function(){return($);};$.fnextend=function(){return($);};$.fxinterval=function(){return($);};$.fxoff=function(){return($);};$.get=function(){return($);};$.getJSON=function(){return($);};$.getScript=function(){return($);};$.globalEval=function(){return($);};$.grep=function(){return($);};$.hasData=function(){return($);};$.holdReady=function(){return($);};$.inArray=function(){return($);};$.isArray=function(){return($);};$.isEmptyObject=function(){return($);};$.isFunction=function(){return($);};$.isNumeric=function(){return($);};$.isPlainObject=function(){return($);};$.isWindow=function(){return($);};$.isXMLDoc=function(){return($);};$.makeArray=function(){return($);};$.map=function(){return($);};$.merge=function(){return($);};$.noConflict=function(){return($);};$.noop=function(){return($);};$.now=function(){return($);};$.param=function(){return($);};$.parseHTML=function(){return($);};$.parseJSON=function(){return($);};$.parseXML=function(){return($);};$.post=function(){return($);};$.proxy=function(){return($);};$.queue=function(){return($);};$.removeData=function(){return($);};$.sub=function(){return($);};$.support=function(){return($);};$.trim=function(){return($);};$.type=function(){return($);};$.unique=function(){return($);};$.when=function(){return($);};$.always=function(){return($);};$.done=function(){return($);};$.fail=function(){return($);};$.isRejected=function(){return($);};$.isResolved=function(){return($);};$.notify=function(){return($);};$.notifyWith=function(){return($);};$.pipe=function(){return($);};$.progress=function(){return($);};$.promise=function(){return($);};$.reject=function(){return($);};$.rejectWith=function(){return($);};$.resolve=function(){return($);};$.resolveWith=function(){return($);};$.state=function(){return($);};$.then=function(){return($);};$.currentTarget=function(){return($);};$.data=function(){return($);};$.delegateTarget=function(){return($);};$.isDefaultPrevented=function(){return($);};$.isImmediatePropagationStopped=function(){return($);};$.isPropagationStopped=function(){return($);};$.metaKey=function(){return($);};$.namespace=function(){return($);};$.pageX=function(){return($);};$.pageY=function(){return($);};$.preventDefault=function(){return($);};$.relatedTarget=function(){return($);};$.result=function(){return($);};$.stopImmediatePropagation=function(){return($);};$.stopPropagation=function(){return($);};$.target=function(){return($);};$.timeStamp=function(){return($);};$.type=function(){return($);};$.which=function(){return($);};"+s; + submit( + scopejQuery(s), function (cls, message) { + if (cls) { + console.log(message.error); + workerError(message.error); + } else { + if(test){ + preview.open(); + preview.write(libraryIncludes + editor.getValue() + iFrameScript); + codeStorage.updateStorage(); + preview.close(); + } + else{ + preview.open(); + preview.write(libraryIncludes + editor.getValue()); + codeStorage.updateStorage(); + preview.close(); + } } } - } - ); + ); - } - else { - if(test){ - preview.open(); - preview.write(libraryIncludes + editor.getValue() +iFrameScript); - codeStorage.updateStorage(); - preview.close(); } - else{ - preview.open(); - preview.write(libraryIncludes + editor.getValue()); - codeStorage.updateStorage(); - preview.close(); + else { + if(test){ + preview.open(); + preview.write(libraryIncludes + editor.getValue() +iFrameScript); + codeStorage.updateStorage(); + preview.close(); + } + else{ + preview.open(); + preview.write(libraryIncludes + editor.getValue()); + codeStorage.updateStorage(); + preview.close(); + } } } } @@ -516,6 +518,25 @@ function bonfireExecute() { codeOutput.setValue("Unsafe or Unfinished function declaration"); } } + else{ + submit(userJavaScript, function (cls, message) { + if (failedCommentTest) { + myCodeMirror.setValue(myCodeMirror.getValue() + "*/"); + console.log('Caught Unfinished Comment'); + codeOutput.setValue("Unfinished mulit-line comment"); + failedCommentTest = false; + } + else if (cls) { + codeOutput.setValue(message.error); + runTests('Error', null); + } else { + codeOutput.setValue(message.output); + codeOutput.setValue(codeOutput.getValue().replace(/\\\"/gi, '')); + message.input = removeLogs(message.input); + runTests(null, message); + } + }); + } } else { editorValueForIFrame = editor.getValue(); diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade index 58a00b5f54e..2b99885971e 100644 --- a/server/views/coursewares/showBonfire.jade +++ b/server/views/coursewares/showBonfire.jade @@ -18,104 +18,104 @@ block content .row(ng-controller="pairedWithController") .col-xs-12.col-sm-12.col-md-4.col-lg-3 - //.scroll-locker(id = "scroll-locker") - #testCreatePanel.well - h3.text-center.negative-10= name - .positive-15.positive-15-bottom - h4.text-center.bonfire-flames Difficulty:  - if (difficulty == "0") - i.ion-ios-flame-outline - i.ion-ios-flame-outline - i.ion-ios-flame-outline - i.ion-ios-flame-outline - i.ion-ios-flame-outline - if (difficulty == "1") - i.ion-ios-flame - i.ion-ios-flame-outline - i.ion-ios-flame-outline - i.ion-ios-flame-outline - i.ion-ios-flame-outline - if (difficulty == "2") - i.ion-ios-flame - i.ion-ios-flame - i.ion-ios-flame-outline - i.ion-ios-flame-outline - i.ion-ios-flame-outline - if (difficulty == "3") - i.ion-ios-flame - i.ion-ios-flame - i.ion-ios-flame - i.ion-ios-flame-outline - i.ion-ios-flame-outline - if (difficulty == "4") - i.ion-ios-flame - i.ion-ios-flame - i.ion-ios-flame - i.ion-ios-flame - i.ion-ios-flame-outline - if (difficulty == "5") - i.ion-ios-flame - i.ion-ios-flame - i.ion-ios-flame - i.ion-ios-flame - i.ion-ios-flame - .row - .col-xs-12 - .bonfire-instructions - for sentence in details - p.wrappable.negative-10!= sentence - .negative-bottom-margin-30 - #MDN-links - p.negative-10 Here are some helpful links: - for link, index in MDNlinks - .negative-10 - ul: li: a(href=""+link, target="_blank") !{MDNkeys[index]} - - if (user) - form.form-horizontal(novalidate='novalidate', name='completedWithForm') - .form-group.text-center.negative-10 + .scroll-locker(id = "scroll-locker") + #testCreatePanel.well + h3.text-center.negative-10= name + .positive-15.positive-15-bottom + h4.text-center.bonfire-flames Difficulty:  + if (difficulty == "0") + i.ion-ios-flame-outline + i.ion-ios-flame-outline + i.ion-ios-flame-outline + i.ion-ios-flame-outline + i.ion-ios-flame-outline + if (difficulty == "1") + i.ion-ios-flame + i.ion-ios-flame-outline + i.ion-ios-flame-outline + i.ion-ios-flame-outline + i.ion-ios-flame-outline + if (difficulty == "2") + i.ion-ios-flame + i.ion-ios-flame + i.ion-ios-flame-outline + i.ion-ios-flame-outline + i.ion-ios-flame-outline + if (difficulty == "3") + i.ion-ios-flame + i.ion-ios-flame + i.ion-ios-flame + i.ion-ios-flame-outline + i.ion-ios-flame-outline + if (difficulty == "4") + i.ion-ios-flame + i.ion-ios-flame + i.ion-ios-flame + i.ion-ios-flame + i.ion-ios-flame-outline + if (difficulty == "5") + i.ion-ios-flame + i.ion-ios-flame + i.ion-ios-flame + i.ion-ios-flame + i.ion-ios-flame + .row .col-xs-12 - // extra field to distract password tools like lastpass from injecting css into our username field - input.form-control(ng-show="false") - input.form-control#completed-with(name="existingUser", placeholder="Your pair's username if pairing", existing-username='', ng-model="existingUser") - .col-xs-12(ng-cloak, ng-show="completedWithForm.$error.exists && !completedWithForm.existingUser.$pristine && existingUser.length > 0") - alert(type='danger') - span.ion-close-circled - | Username not found - label.negative-10.btn.btn-primary.btn-block#submitButton - i.fa.fa-play - |   Run code (ctrl + enter) - .button-spacer - .btn-group.input-group.btn-group-justified - label.btn.btn-success#trigger-reset-modal - i.fa.fa-refresh - |   Reset - label.btn.btn-success#trigger-help-modal - i.fa.fa-medkit - |   Help - label.btn.btn-success#trigger-pair-modal - i.fa.fa-user-plus - |   Pair - label.btn.btn-success#trigger-issue-modal - i.fa.fa-bug - |   Bug - .button-spacer + .bonfire-instructions + for sentence in details + p.wrappable.negative-10!= sentence + .negative-bottom-margin-30 + #MDN-links + p.negative-10 Here are some helpful links: + for link, index in MDNlinks + .negative-10 + ul: li: a(href=""+link, target="_blank") !{MDNkeys[index]} - form.code - .form-group.codeMirrorView - textarea#codeOutput(style='display: none;') - br - #testSuite.negative-10 - br - script(type="text/javascript"). - var tests = !{JSON.stringify(tests)}; - var challengeSeed = !{JSON.stringify(challengeSeed)}; - var challenge_Id = !{JSON.stringify(challengeId)}; - var challenge_Name = !{JSON.stringify(name)}; - var started = Math.floor(Date.now()); - var challengeType = !{JSON.stringify(challengeType)}; - var _ = R; - var dashed = !{JSON.stringify(dashedName)}; + if (user) + form.form-horizontal(novalidate='novalidate', name='completedWithForm') + .form-group.text-center.negative-10 + .col-xs-12 + // extra field to distract password tools like lastpass from injecting css into our username field + input.form-control(ng-show="false") + input.form-control#completed-with(name="existingUser", placeholder="Your pair's username if pairing", existing-username='', ng-model="existingUser") + .col-xs-12(ng-cloak, ng-show="completedWithForm.$error.exists && !completedWithForm.existingUser.$pristine && existingUser.length > 0") + alert(type='danger') + span.ion-close-circled + | Username not found + label.negative-10.btn.btn-primary.btn-block#submitButton + i.fa.fa-play + |   Run code (ctrl + enter) + .button-spacer + .btn-group.input-group.btn-group-justified + label.btn.btn-success#trigger-reset-modal + i.fa.fa-refresh + |   Reset + label.btn.btn-success#trigger-help-modal + i.fa.fa-medkit + |   Help + label.btn.btn-success#trigger-pair-modal + i.fa.fa-user-plus + |   Pair + label.btn.btn-success#trigger-issue-modal + i.fa.fa-bug + |   Bug + .button-spacer + + form.code + .form-group.codeMirrorView + textarea#codeOutput(style='display: none;') + br + #testSuite.negative-10 + br + script(type="text/javascript"). + var tests = !{JSON.stringify(tests)}; + var challengeSeed = !{JSON.stringify(challengeSeed)}; + var challenge_Id = !{JSON.stringify(challengeId)}; + var challenge_Name = !{JSON.stringify(name)}; + var started = Math.floor(Date.now()); + var challengeType = !{JSON.stringify(challengeType)}; + var _ = R; + var dashed = !{JSON.stringify(dashedName)}; .col-xs-12.col-sm-12.col-md-8 .editorScrollDiv(style = "overflow-y: auto; overflow-x: hidden;") diff --git a/server/views/coursewares/showHTML.jade b/server/views/coursewares/showHTML.jade index 65659f2f9cb..4f81c31e852 100644 --- a/server/views/coursewares/showHTML.jade +++ b/server/views/coursewares/showHTML.jade @@ -21,51 +21,51 @@ block content script(src='/js/lib/codemirror/addon/emmet/emmet.js') .row.courseware-height .col-xs-12.col-sm-12.col-md-3.col-lg-3 - //.scroll-locker(id = "scroll-locker") - .innerMarginFix(style = "width: 99%;") - .well - .row - .col-xs-12 - h3.text-center.negative-10= name - .bonfire-instructions - for sentence in details - p.wrappable.negative-10!= sentence - .negative-bottom-margin-30 - label.negative-10.btn.btn-primary.btn-block#submitButton - i.fa.fa-play - |   Run code (ctrl + enter) - br - if (user) - .button-spacer - .btn-group.input-group.btn-group-justified - label.btn.btn-success#trigger-reset-modal - i.fa.fa-refresh - |   Reset - label.btn.btn-success#trigger-help-modal - i.fa.fa-medkit - |   Help - label.btn.btn-success#trigger-issue-modal - i.fa.fa-bug - |   Bug - script. - var userLoggedIn = true; - else - .button-spacer - a.btn.signup-btn.btn-block.btn-block.negative-15(href='/login') Sign in so you can save your progress + .scroll-locker(id = "scroll-locker") + .innerMarginFix(style = "width: 99%;") + .well + .row + .col-xs-12 + h3.text-center.negative-10= name + .bonfire-instructions + for sentence in details + p.wrappable.negative-10!= sentence + .negative-bottom-margin-30 + label.negative-10.btn.btn-primary.btn-block#submitButton + i.fa.fa-play + |   Run code (ctrl + enter) + br + if (user) + .button-spacer + .btn-group.input-group.btn-group-justified + label.btn.btn-success#trigger-reset-modal + i.fa.fa-refresh + |   Reset + label.btn.btn-success#trigger-help-modal + i.fa.fa-medkit + |   Help + label.btn.btn-success#trigger-issue-modal + i.fa.fa-bug + |   Bug script. - var userLoggedIn = false; - .button-spacer - ul#testSuite.list-group - br - script(type="text/javascript"). - $('#next-courseware-button').attr('disabled', 'disabled'); - var tests = !{JSON.stringify(tests)}; - var challengeSeed = !{JSON.stringify(challengeSeed)}; - var challenge_Id = !{JSON.stringify(challengeId)}; - var challenge_Name = !{JSON.stringify(name)}; - var prodOrDev = !{JSON.stringify(environment)}; - var challengeType = !{JSON.stringify(challengeType)}; - var started = Math.floor(Date.now()); + var userLoggedIn = true; + else + .button-spacer + a.btn.signup-btn.btn-block.btn-block.negative-15(href='/login') Sign in so you can save your progress + script. + var userLoggedIn = false; + .button-spacer + ul#testSuite.list-group + br + script(type="text/javascript"). + $('#next-courseware-button').attr('disabled', 'disabled'); + var tests = !{JSON.stringify(tests)}; + var challengeSeed = !{JSON.stringify(challengeSeed)}; + var challenge_Id = !{JSON.stringify(challengeId)}; + var challenge_Name = !{JSON.stringify(name)}; + var prodOrDev = !{JSON.stringify(environment)}; + var challengeType = !{JSON.stringify(challengeType)}; + var started = Math.floor(Date.now()); .col-xs-12.col-sm-12.col-md-5.col-lg-6 .editorScrollDiv(style = "overflow-y: auto; overflow-x: hidden;") #mainEditorPanel diff --git a/server/views/coursewares/showJS.jade b/server/views/coursewares/showJS.jade index 2d8acf85a3b..fa3b9addb63 100644 --- a/server/views/coursewares/showJS.jade +++ b/server/views/coursewares/showJS.jade @@ -16,56 +16,56 @@ block content script(type='text/javascript', src='/js/lib/coursewares/sandbox.js') .row(ng-controller="pairedWithController") .col-xs-12.col-sm-12.col-md-4.col-lg-3 - //.scroll-locker(id = "scroll-locker") - .innerMarginFix(style = "width: 99%;") - #testCreatePanel.well - h3.text-center.negative-10= name - .row - .col-xs-12 - .bonfire-instructions - for sentence in details - p.wrappable.negative-10!= sentence - .negative-bottom-margin-30 - #MDN-links - p.negative-10 Here are some helpful links: - for link, index in MDNlinks - .negative-10 - ul: li: a(href="" + link, target="_blank") !{MDNkeys[index]} - if (user) - form.form-horizontal(novalidate='novalidate', name='completedWithForm') - .form-group.text-center.negative-10 + .scroll-locker(id = "scroll-locker") + .innerMarginFix(style = "width: 99%;") + #testCreatePanel.well + h3.text-center.negative-10= name + .row .col-xs-12 - // extra field to distract password tools like lastpass from injecting css into our username field - label.negative-10.btn.btn-primary.btn-block#submitButton - i.fa.fa-play - |   Run code (ctrl + enter) - .button-spacer - .btn-group.input-group.btn-group-justified - label.btn.btn-success#trigger-reset-modal - i.fa.fa-refresh - |   Reset - label.btn.btn-success#trigger-help-modal - i.fa.fa-medkit - |   Help - label.btn.btn-success#trigger-issue-modal - i.fa.fa-bug - |   Bug - .button-spacer - form.code - .form-group.codeMirrorView - textarea#codeOutput(style='display: none;') - br - #testSuite.negative-10 - br - script(type="text/javascript"). - var tests = !{JSON.stringify(tests)}; - var challengeSeed = !{JSON.stringify(challengeSeed)}; - var challenge_Id = !{JSON.stringify(challengeId)}; - var challenge_Name = !{JSON.stringify(name)}; - var started = Math.floor(Date.now()); - var challengeType = !{JSON.stringify(challengeType)}; - var _ = R; - var dashed = !{JSON.stringify(dashedName)}; + .bonfire-instructions + for sentence in details + p.wrappable.negative-10!= sentence + .negative-bottom-margin-30 + #MDN-links + p.negative-10 Here are some helpful links: + for link, index in MDNlinks + .negative-10 + ul: li: a(href="" + link, target="_blank") !{MDNkeys[index]} + if (user) + form.form-horizontal(novalidate='novalidate', name='completedWithForm') + .form-group.text-center.negative-10 + .col-xs-12 + // extra field to distract password tools like lastpass from injecting css into our username field + label.negative-10.btn.btn-primary.btn-block#submitButton + i.fa.fa-play + |   Run code (ctrl + enter) + .button-spacer + .btn-group.input-group.btn-group-justified + label.btn.btn-success#trigger-reset-modal + i.fa.fa-refresh + |   Reset + label.btn.btn-success#trigger-help-modal + i.fa.fa-medkit + |   Help + label.btn.btn-success#trigger-issue-modal + i.fa.fa-bug + |   Bug + .button-spacer + form.code + .form-group.codeMirrorView + textarea#codeOutput(style='display: none;') + br + #testSuite.negative-10 + br + script(type="text/javascript"). + var tests = !{JSON.stringify(tests)}; + var challengeSeed = !{JSON.stringify(challengeSeed)}; + var challenge_Id = !{JSON.stringify(challengeId)}; + var challenge_Name = !{JSON.stringify(name)}; + var started = Math.floor(Date.now()); + var challengeType = !{JSON.stringify(challengeType)}; + var _ = R; + var dashed = !{JSON.stringify(dashedName)}; .col-xs-12.col-sm-12.col-md-8 .editorScrollDiv(style = "overflow-y: auto; overflow-x: hidden;") #mainEditorPanel From 14d1d1db02ef01c310c7467dcd7360de76849ba3 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Tue, 25 Aug 2015 14:49:19 -0700 Subject: [PATCH 076/134] fix left panel jitter jump --- public/js/lib/coursewares/commonFrameWork.js | 4 ++++ server/views/coursewares/showBonfire.jade | 1 + 2 files changed, 5 insertions(+) diff --git a/public/js/lib/coursewares/commonFrameWork.js b/public/js/lib/coursewares/commonFrameWork.js index 1a40d2f1f4d..661c6d22243 100644 --- a/public/js/lib/coursewares/commonFrameWork.js +++ b/public/js/lib/coursewares/commonFrameWork.js @@ -551,6 +551,10 @@ function bonfireExecute() { workerError("Unsafe $($)"); } } + setTimeout(function() { + var $marginFix = $('.innerMarginFix'); + $marginFix.css('min-height', $marginFix.height()); + }, 500); } $('#submitButton').on('click', function() { diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade index 2b99885971e..cdc7f7c2e33 100644 --- a/server/views/coursewares/showBonfire.jade +++ b/server/views/coursewares/showBonfire.jade @@ -19,6 +19,7 @@ block content .row(ng-controller="pairedWithController") .col-xs-12.col-sm-12.col-md-4.col-lg-3 .scroll-locker(id = "scroll-locker") + .innerMarginFix(style=' width: 99%') #testCreatePanel.well h3.text-center.negative-10= name .positive-15.positive-15-bottom From 300e79273a47b412836ef3b839be698e2771ded0 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Tue, 25 Aug 2015 14:55:45 -0700 Subject: [PATCH 077/134] increase height fix timeout --- public/js/lib/coursewares/commonFrameWork.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/lib/coursewares/commonFrameWork.js b/public/js/lib/coursewares/commonFrameWork.js index 661c6d22243..573b7799351 100644 --- a/public/js/lib/coursewares/commonFrameWork.js +++ b/public/js/lib/coursewares/commonFrameWork.js @@ -554,7 +554,7 @@ function bonfireExecute() { setTimeout(function() { var $marginFix = $('.innerMarginFix'); $marginFix.css('min-height', $marginFix.height()); - }, 500); + }, 1000); } $('#submitButton').on('click', function() { From b9cfc09eb9d65e1c48eae304e33df2161946700b Mon Sep 17 00:00:00 2001 From: AEA2002 Date: Tue, 25 Aug 2015 18:34:31 -0400 Subject: [PATCH 078/134] Minor edit in Find the Nth Character In "Use Bracket Notation to Find the Nth Character in a String" section removed "last" from 'The third last letter of lastName should be..." --- seed/challenges/basic-javascript.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json index 3465c9dcb15..aa07b4b4b62 100644 --- a/seed/challenges/basic-javascript.json +++ b/seed/challenges/basic-javascript.json @@ -189,7 +189,7 @@ "Try looking at the secondLetterOfFirstName variable declaration if you get stuck." ], "tests": [ - "assert(thirdLetterOfLastName === 'v', 'The third last letter of lastName should be a \"v\"');" + "assert(thirdLetterOfLastName === 'v', 'The third letter of lastName should be a \"v\"');" ], "challengeSeed": [ "var firstName = \"Ada\";", From 07f66b61f4cc8ca3b8c6b8bbda05f9d6c5998b22 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Tue, 25 Aug 2015 15:51:47 -0700 Subject: [PATCH 079/134] update the completed all challenges message --- server/boot/challenge.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/server/boot/challenge.js b/server/boot/challenge.js index f69b1101ba4..a13940f7940 100644 --- a/server/boot/challenge.js +++ b/server/boot/challenge.js @@ -208,10 +208,12 @@ module.exports = function(app) { debug('next challengeName', nextChallengeName); if (!nextChallengeName || nextChallengeName === firstChallenge) { req.flash('errors', { - msg: 'It looks like you have finished all of our challenges.' + - ' Great job! Now on to helping nonprofits!' + msg: 'Once you have completed all of our challenges, you should '+ + 'join our Half Way Club and start getting '+ + 'ready for our nonprofit projects.' }); - return res.redirect('/challenges/' + firstChallenge); + return res.redirect('/map'); } res.redirect('/challenges/' + nextChallengeName); } From d23f1e4d28bc96cda4663f5cf74339f0ad237228 Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Wed, 26 Aug 2015 00:13:07 +0100 Subject: [PATCH 080/134] Fixed bonfire auto-execute on html challenges --- public/js/lib/coursewares/commonFrameWork.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/public/js/lib/coursewares/commonFrameWork.js b/public/js/lib/coursewares/commonFrameWork.js index 573b7799351..c2987aed278 100644 --- a/public/js/lib/coursewares/commonFrameWork.js +++ b/public/js/lib/coursewares/commonFrameWork.js @@ -564,5 +564,12 @@ $('#submitButton').on('click', function() { $(document).ready(function(){ editorValue = (codeStorage.isAlive())? codeStorage.getEditorValue() : allSeeds; myCodeMirror.setValue(editorValue.replace(/fccss/gi, '")); - bonfireExecute(); + if(typeof $('#preview').html !== 'undefined'){ + $('#preview').load(function(){ + bonfireExecute(); + }); + } + else{ + bonfireExecute(); + } }); From ac8fa3cbeca74fa0e54e0ce2f7b6f2cf22a885e1 Mon Sep 17 00:00:00 2001 From: bugron Date: Wed, 26 Aug 2015 03:58:49 +0400 Subject: [PATCH 081/134] Changes CSS attributes to CSS properties --- seed/challenges/html5-and-css.json | 34 +++++++++++++++--------------- seed/challenges/jquery.json | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/seed/challenges/html5-and-css.json b/seed/challenges/html5-and-css.json index e55619b87bd..70c922018c7 100644 --- a/seed/challenges/html5-and-css.json +++ b/seed/challenges/html5-and-css.json @@ -372,7 +372,7 @@ "difficulty": 1.09, "description": [ "Delete your h2 element's style attribute and instead create a CSS style element. Add the necessary CSS to turn all h2 elements blue.", - "With CSS, there are hundreds of CSS attributes that you can use to change the way an element looks on your page.", + "With CSS, there are hundreds of CSS properties that you can use to change the way an element looks on your page.", "When you entered <h2 style=\"color: red\">CatPhotoApp</h2>, you were giving that individual h2 element an inline style.", "That's one way to add style to an element, but a better way is by using CSS, which stands for Cascading Style Sheets.", "At the top of your code, create a style element like this: <style></style>.", @@ -544,7 +544,7 @@ "description": [ "Create a second p element with the following kitty ipsum text: Purr jump eat the grass rip the couch scratched sunbathe, shed everywhere rip the couch sleep in the sink fluffy fur catnip scratched.", "Then, inside your <style> element, set the font-size of all p elements to 16 pixels.", - "Font size is controlled by the font-size CSS attribute, like this: h1 { font-size: 30px; }.", + "Font size is controlled by the font-size CSS property, like this: h1 { font-size: 30px; }.", "See if you can figure out how to give both of your p elements the font-size of 16 pixels (16px). You can do this inside the same <style> tag that we created for your red-text class." ], "tests": [ @@ -595,7 +595,7 @@ "difficulty": 1.14, "description": [ "Make all of your p elements use the Monospace font.", - "You can set an element's font by using the font-family attribute.", + "You can set an element's font by using the font-family property.", "For example, if you wanted to set your h2 element's font to Sans-serif, you would use the following CSS: h2 { font-family: Sans-serif; }." ], "tests": [ @@ -645,7 +645,7 @@ "First, you'll need to make a call to Google to grab the Lobster font and load it into your HTML.", "Copy the following code snippet and paste it into your code editor:", "<link href=\"http://fonts.googleapis.com/css?family=Lobster\" rel=\"stylesheet\" type=\"text/css\">.", - "Now you can set Lobster as a font-family attribute on your h2 element." + "Now you can set Lobster as a font-family value on your h2 element." ], "tests": [ "assert(new RegExp(\"googleapis\", \"gi\").test(editor), 'Import the Lobster font.')", @@ -808,7 +808,7 @@ "title": "Size your Images", "difficulty": 1.18, "description": [ - "CSS has an attribute called width that controls an element's width. Just like with fonts, we'll use px (pixels) to specify the image's width.", + "CSS has a property called width that controls an element's width. Just like with fonts, we'll use px (pixels) to specify the image's width.", "For example, if we wanted to create a CSS class called larger-image that gave HTML elements a width of 500 pixels, we'd use: <style> .larger-image { width: 500px; } </style>.", "Create a class called smaller-image and use it to resize the image so that it's only 100 pixels wide." ], @@ -864,7 +864,7 @@ "title": "Add Borders Around your Elements", "difficulty": 1.19, "description": [ - "CSS borders have attributes like style, color and width.", + "CSS borders have properties like style, color and width.", "For example, if we wanted to create a red, 5 pixel border around an HTML element, we could use this class: <style> .thin-red-border { border-color: red; border-width: 5px; border-style: solid; } </style>.", "Create a class called thick-green-border that puts a 10-pixel-wide green border with a style of solid around an HTML element, and apply that class to your cat photo." ], @@ -927,8 +927,8 @@ "title": "Add Rounded Corners with a Border Radius", "difficulty": 1.20, "description": [ - "Your cat photo currently has sharp corners. We can round out those corners with a CSS attribute called border-radius.", - "You can specify a border-radius with pixels. This will affect how rounded the corners are. Add this attribute to your thick-green-border class and set it to 10px.", + "Your cat photo currently has sharp corners. We can round out those corners with a CSS property called border-radius.", + "You can specify a border-radius with pixels. This will affect how rounded the corners are. Add this property to your thick-green-border class and set it to 10px.", "Give your cat photo a border-radius of 10px." ], "tests": [ @@ -2355,7 +2355,7 @@ "title": "Give a Background Color to a Div Element", "difficulty": 1.39, "description": [ - "You can set an element's background color with the background-color attribute.", + "You can set an element's background color with the background-color property.", "For example, if you wanted an element's background color to be green, you'd use .green-background { background-color: green; } within your style element.", "Create a class called gray-background with the background-color of gray. Assign this class to your div element." ], @@ -2627,7 +2627,7 @@ "difficulty": 1.40, "description": [ "You may have already noticed this, but all HTML elements are essentially little rectangles.", - "Three important attributes control the space that surrounds each HTML element: padding, margin, and border.", + "Three important properties control the space that surrounds each HTML element: padding, margin, and border.", "An element's padding controls the amount of space between the element and its border.", "Here, we can see that the green box and the red box are nested within the yellow box. Note that the red box has more padding than the green box.", "When you increase the green box's padding, it will increase the distance between the text padding and the border around it.", @@ -2839,7 +2839,7 @@ "difficulty": 1.43, "description": [ "Sometimes you will want to customize an element so that it has different padding on each of its sides.", - "CSS allows you to control the padding of an element on all four sides with padding-top, padding-right, padding-bottom, and padding-left attributes.", + "CSS allows you to control the padding of an element on all four sides with padding-top, padding-right, padding-bottom, and padding-left properties.", "Give the green box a padding of 40px on its top and left side, but only 20px on its bottom and right side." ], "tests": [ @@ -2912,7 +2912,7 @@ "description": [ "Give the green box a margin of 40px on its top and left side, but only 20px on its bottom and right side.", "Sometimes you will want to customize an element so that it has a different margin on each of its sides.", - "CSS allows you to control the margin of an element on all four sides with margin-top, margin-right, margin-bottom, and margin-left attributes." + "CSS allows you to control the margin of an element on all four sides with margin-top, margin-right, margin-bottom, and margin-left properties." ], "tests": [ "assert($(\".green-box\").css(\"margin-top\") === \"40px\", 'Your green-box class should give the top of elements 40px of margin.')", @@ -2981,7 +2981,7 @@ "title": "Use Clockwise Notation to Specify the Padding of an Element", "difficulty": 1.44, "description": [ - "Instead of specifying an element's padding-top, padding-right, padding-bottom, and padding-left attributes, you can specify them all in one line, like this: padding: 10px 20px 10px 20px;.", + "Instead of specifying an element's padding-top, padding-right, padding-bottom, and padding-left properties, you can specify them all in one line, like this: padding: 10px 20px 10px 20px;.", "These four values work like a clock: top, right, bottom, left, and will produce the exact same result as using the side-specific padding instructions.", "Use Clockwise Notation to give the \".green-box\" class a padding of 40px on its top and left side, but only 20px on its bottom and right side." ], @@ -3051,7 +3051,7 @@ "difficulty": 1.45, "description": [ "Let's try this again, but with margin this time.", - "Instead of specifying an element's margin-top, margin-right, margin-bottom, and margin-left attributes, you can specify them all in one line, like this: margin: 10px 20px 10px 20px;.", + "Instead of specifying an element's margin-top, margin-right, margin-bottom, and margin-left properties, you can specify them all in one line, like this: margin: 10px 20px 10px 20px;.", "These four values work like a clock: top, right, bottom, left, and will produce the exact same result as using the side-specific margin instructions.", "Use Clockwise Notation to give an element a margin of 40px on its top and left side, but only 20px on its bottom and right side." ], @@ -3163,8 +3163,8 @@ "assert(($(\"h1\").length > 0), 'Create an h1 element.')", "assert(($(\"h1\").length > 0 && $(\"h1\").text().match(/hello world/i)), 'Your h1 element should have the text Hello World.')", "assert(editor.match(/<\\/h1>/g) && editor.match(/

/g).length === editor.match(/

h1 element has a closing tag.')", - "assert(($(\"body\").css(\"color\") === \"rgb(0, 128, 0)\"), 'Give your body element the color attribute of green.')", - "assert(($(\"body\").css(\"font-family\").match(/Monospace/i)), 'Give your body element the font-family attribute of Monospace.')", + "assert(($(\"body\").css(\"color\") === \"rgb(0, 128, 0)\"), 'Give your body element the color property of green.')", + "assert(($(\"body\").css(\"font-family\").match(/Monospace/i)), 'Give your body element the font-family property of Monospace.')", "assert(($(\"h1\").length > 0 && $(\"h1\").css(\"font-family\").match(/monospace/i)), 'Your h1 element should inherit the font Monospace from your body element.')", "assert(($(\"h1\").length > 0 && $(\"h1\").css(\"color\") === \"rgb(0, 128, 0)\"), 'Your h1 element should inherit the color green from your body element.')" ], @@ -3198,7 +3198,7 @@ "description": [ "Sometimes your HTML elements will receive multiple styles that conflict with one another.", "For example, your h1 element can't be both green and pink at the same time.", - "Let's see what happens when we create a class that makes text pink, then apply it to an element. Will our class override the body element's color: green; CSS attribute?", + "Let's see what happens when we create a class that makes text pink, then apply it to an element. Will our class override the body element's color: green; CSS property?", "Create a CSS class called pink-text that gives an element the color pink.", "Give your h1 element the class of pink-text." ], diff --git a/seed/challenges/jquery.json b/seed/challenges/jquery.json index 93cc8899b24..23d274929c3 100644 --- a/seed/challenges/jquery.json +++ b/seed/challenges/jquery.json @@ -363,7 +363,7 @@ "Select target1 and change its color to red.", "jQuery has a function called .css() that allows you to change the CSS of an element.", "Here's how we would change its color to blue: $(\"#target1\").css(\"color\", \"blue\");", - "This is slightly different from a normal CSS declaration, because the CSS attribute and its value are in quotes, and separated with a comma instead of a colon." + "This is slightly different from a normal CSS declaration, because the CSS property and its value are in quotes, and separated with a comma instead of a colon." ], "tests": [ "assert($(\"#target1\").css(\"color\") === 'rgb(255, 0, 0)', 'Your target1 element should have red text.')", From 8cdd49e7f136f862eddb13b9f627b293217193a0 Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Wed, 26 Aug 2015 01:13:17 +0100 Subject: [PATCH 082/134] Fix caching issue with frameworks --- .../{commonFrameWork.js => commonFrameWork_0.0.1.js} | 0 server/views/coursewares/showBonfire.jade | 2 +- server/views/coursewares/showHTML.jade | 2 +- server/views/coursewares/showJS.jade | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename public/js/lib/coursewares/{commonFrameWork.js => commonFrameWork_0.0.1.js} (100%) diff --git a/public/js/lib/coursewares/commonFrameWork.js b/public/js/lib/coursewares/commonFrameWork_0.0.1.js similarity index 100% rename from public/js/lib/coursewares/commonFrameWork.js rename to public/js/lib/coursewares/commonFrameWork_0.0.1.js diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade index cdc7f7c2e33..5b0e2deecc4 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.js') + script(src='/js/lib/coursewares/commonFrameWork_0.0.1.js') script. editor.setOption("mode", "javascript"); diff --git a/server/views/coursewares/showHTML.jade b/server/views/coursewares/showHTML.jade index 4f81c31e852..208d9969f7e 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.js') + script(src = '/js/lib/coursewares/commonFrameWork_0.0.1.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 fa3b9addb63..c3c0acf671c 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.js') + script(src = '/js/lib/coursewares/commonFrameWork_0.0.1.js') script. editor.setOption("mode", "javascript"); #complete-courseware-dialog.modal(tabindex='-1') From 31a82c5c64cfd283e0a9a0d4235c8f5292c7b540 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Tue, 25 Aug 2015 17:16:08 -0700 Subject: [PATCH 083/134] add a note about jQuery and Animate.css not usually being accessible in code editor --- seed/challenges/jquery.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/seed/challenges/jquery.json b/seed/challenges/jquery.json index 54d1ea88a94..64fb9253faf 100644 --- a/seed/challenges/jquery.json +++ b/seed/challenges/jquery.json @@ -58,7 +58,8 @@ "This is important because without your document ready function, your code may run before your HTML is rendered, which would cause bugs.", "Now let's write our first jQuery statement. All jQuery functions start with a $, usually referred to as a dollar sign operator, or simply as bling.", "jQuery often selects an HTML element with a selector, then does something to that element.", - "For example, let's make all of your button elements bounce. Just add this code inside your document ready function: $(\"button\").addClass(\"animated bounce\")." + "For example, let's make all of your button elements bounce. Just add this code inside your document ready function: $(\"button\").addClass(\"animated bounce\").", + "Note that we've already included both the jQuery library and the Animate.css library in your code editor. So you are using jQuery to apply the Animate.css bounce class to your button elements." ], "tests": [ "assert($(\"button\").hasClass(\"animated\") && $(\"button\").hasClass(\"bounce\"), 'Use the jQuery addClass() function to give the classes animated and bounce to your button elements.')", @@ -671,7 +672,7 @@ "id": "bad87fee1348bd9aed208826", "title": "Target the Children of an Element Using jQuery", "difficulty": 3.14, - "description": [ + "description": [ "Many HTML elements have children elements from which inherit their properties.", "For example, every HTML element is a child of your body element, and your \"jQuery Playground\" h3 element is a child of your <div class=\"container-fluid\"> element.", "jQuery has a function called children() that allows you to access the children of whichever element you've selected.", From d2704d2dc3d43b7ee68964a686c90c5f8a05bdde Mon Sep 17 00:00:00 2001 From: bugron Date: Wed, 26 Aug 2015 05:44:59 +0400 Subject: [PATCH 084/134] Changes catPhotoApp.com to FCC controlled domain --- seed/challenges/html5-and-css.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/seed/challenges/html5-and-css.json b/seed/challenges/html5-and-css.json index e55619b87bd..4945ff14707 100644 --- a/seed/challenges/html5-and-css.json +++ b/seed/challenges/html5-and-css.json @@ -1062,11 +1062,11 @@ "Here's a diagram of an a element. In this case, the a element is used in the middle of a paragraph element, which means the link will appear in the middle of a sentence.", "\"a", "Here's an example: <p>Here's a <a href=\"http://freecodecamp.com\"> link to Free Code Camp</a> for you to follow.</p>.", - "Create an a element that links to http://catphotoapp.com and has \"cat photos\" as its anchor text." + "Create an a element that links to http://freecatphotoapp.com and has \"cat photos\" as its anchor text." ], "tests": [ "assert((/cat photos/gi).test($(\"a\").text()), 'Your a element should have the anchor text of \"cat photos\"')", - "assert(/http:\\/\\/catphotoapp\\.com/gi.test($(\"a\").attr(\"href\")), 'You need an a element that links to http://catphotoapp.com.')", + "assert(/http:\\/\\/catphotoapp\\.com/gi.test($(\"a\").attr(\"href\")), 'You need an a element that links to http://freecatphotoapp.com.')", "assert(editor.match(/<\\/a>/g) && editor.match(/<\\/a>/g).length === editor.match(/a element has a closing tag.')" ], "challengeSeed": [ @@ -1118,7 +1118,7 @@ "descriptionPt": [], "nameDe": "Waypoint: Verlinke externe Seiten mit Anker Elementen", "descriptionDe": [ - "Erstelle ein a Element oder \"Anker Element\", das auf http://catphotoapp.com verlinkt und den Link-Text \"cat photos\" oder \"anchor text\" beinhaltet.", + "Erstelle ein a Element oder \"Anker Element\", das auf http://freecatphotoapp.com verlinkt und den Link-Text \"cat photos\" oder \"anchor text\" beinhaltet.", "So sieht ein a Element aus. In diesem Fall wird es innerhalb eines Paragraphen Elements verwendet. Das bedeutet dein Link wird innerhalb des Satzes erscheinen.", "\"Ein", "Hier ist ein Beispiel: <p>Hier ist ein <a href=\"http://freecodecamp.com\"> Link zum Free Code Camp</a> für dich zum Folgen.</p>." @@ -1136,10 +1136,10 @@ "Now nest your a element within a new p element so that the surrounding paragraph says \"click here for cat photos\", but where only \"cat photos\" is a link, and the rest of the text is rest is plain text." ], "tests": [ - "assert($(\"a\").attr(\"href\").match(/catphotoapp.com/gi).length > 0, 'You need an a element that links to \"catphotoapp.com\".')", + "assert($(\"a\").attr(\"href\").match(/freecatphotoapp.com/gi).length > 0, 'You need an a element that links to \"freecatphotoapp.com\".')", "assert($(\"a\").text().match(/cat\\sphotos/gi).length > 0, 'Your a element should have the anchor text of \"cat photos\"')", "assert($(\"p\") && $(\"p\").length > 2, 'Create a new p element around your a element.')", - "assert($(\"a[href=\\\"http://www.catphotoapp.com\\\"]\").parent().is(\"p\"), 'Your a element should be nested within your new p element.')", + "assert($(\"a[href=\\\"http://www.freecatphotoapp.com\\\"]\").parent().is(\"p\"), 'Your a element should be nested within your new p element.')", "assert($(\"p\").text().match(/click\\shere\\sfor/gi), 'Your p element should have the text \"click here for\".')", "assert(editor.match(/<\\/p>/g) && editor.match(/

/g).length === editor.match(/

p elements has a closing tag.')", "assert(editor.match(/<\\/a>/g) && editor.match(//g).length === editor.match(/a elements has a closing tag.')" @@ -1174,7 +1174,7 @@ "", "

CatPhotoApp

", "", - "cat photos", + "cat photos", "", "", "", @@ -1242,7 +1242,7 @@ "", "

CatPhotoApp

", "", - "

Click here for cat photos.

", + "

Click here for cat photos.

", "", "", "", From d640522e31f4382a723f463cc079e269109b320d Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Tue, 25 Aug 2015 19:01:48 -0700 Subject: [PATCH 085/134] fix do not submit challenge on initial run closes #2559 --- public/js/lib/coursewares/commonFrameWork_0.0.1.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/public/js/lib/coursewares/commonFrameWork_0.0.1.js b/public/js/lib/coursewares/commonFrameWork_0.0.1.js index c2987aed278..e66e5dc9750 100644 --- a/public/js/lib/coursewares/commonFrameWork_0.0.1.js +++ b/public/js/lib/coursewares/commonFrameWork_0.0.1.js @@ -1,3 +1,4 @@ +var isInitRun = false; var editor; var widgets = []; editor = CodeMirror.fromTextArea(document.getElementById("codeEditor"), { @@ -284,6 +285,9 @@ var testSuccess = function() { }; function showCompletion() { + if (isInitRun) { + return; + } var time = Math.floor(Date.now()) - started; ga('send', 'event', 'Challenge', 'solved', challenge_Name + ', Time: ' + time + ', Attempts: ' + attempts); @@ -475,7 +479,7 @@ var runTests = function(err, data) { } }; -function bonfireExecute() { +function bonfireExecute(isInitRun) { goodTests = 0; attempts++; ga('send', 'event', 'Challenge', 'ran-code', challenge_Name); @@ -562,14 +566,18 @@ $('#submitButton').on('click', function() { }); $(document).ready(function(){ + isInitRun = true; editorValue = (codeStorage.isAlive())? codeStorage.getEditorValue() : allSeeds; myCodeMirror.setValue(editorValue.replace(/fccss/gi, '")); if(typeof $('#preview').html !== 'undefined'){ $('#preview').load(function(){ - bonfireExecute(); + bonfireExecute(false); }); } else{ - bonfireExecute(); + bonfireExecute(false); } + setTimeout(function() { + isInitRun = false; + }, 1000); }); From 8f55dc33a9c9bb0cd230830f890475593922b266 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Tue, 25 Aug 2015 19:49:10 -0700 Subject: [PATCH 086/134] fix should not submit on initial execute fix should call $.prototype.html function --- .../lib/coursewares/commonFrameWork_0.0.1.js | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/public/js/lib/coursewares/commonFrameWork_0.0.1.js b/public/js/lib/coursewares/commonFrameWork_0.0.1.js index e66e5dc9750..fe5f790cf45 100644 --- a/public/js/lib/coursewares/commonFrameWork_0.0.1.js +++ b/public/js/lib/coursewares/commonFrameWork_0.0.1.js @@ -286,6 +286,7 @@ var testSuccess = function() { function showCompletion() { if (isInitRun) { + isInitRun = false; return; } var time = Math.floor(Date.now()) - started; @@ -479,7 +480,7 @@ var runTests = function(err, data) { } }; -function bonfireExecute(isInitRun) { +function bonfireExecute() { goodTests = 0; attempts++; ga('send', 'event', 'Challenge', 'ran-code', challenge_Name); @@ -566,18 +567,15 @@ $('#submitButton').on('click', function() { }); $(document).ready(function(){ + var $preview = $('#preview'); isInitRun = true; editorValue = (codeStorage.isAlive())? codeStorage.getEditorValue() : allSeeds; myCodeMirror.setValue(editorValue.replace(/fccss/gi, '")); - if(typeof $('#preview').html !== 'undefined'){ - $('#preview').load(function(){ - bonfireExecute(false); + if(typeof $preview.html() !== 'undefined') { + $preview.load(function(){ + bonfireExecute(); }); + } else{ + bonfireExecute(); } - else{ - bonfireExecute(false); - } - setTimeout(function() { - isInitRun = false; - }, 1000); }); From df3918cc5355fcb574e667f047941e43fa742195 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Tue, 25 Aug 2015 22:27:01 -0700 Subject: [PATCH 087/134] fix email login not case sensitive --- common/models/user.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/common/models/user.js b/common/models/user.js index c318a88b941..06761e0209e 100644 --- a/common/models/user.js +++ b/common/models/user.js @@ -123,6 +123,14 @@ module.exports = function(User) { }); }); + User.beforeRemote('login', function(ctx, notUsed, next) { + const { body } = ctx.req; + if (body && typeof body.email === 'string') { + body.email = body.email.toLowerCase(); + } + next(); + }); + User.afterRemote('login', function(ctx, accessToken, next) { var res = ctx.res; var req = ctx.req; From 9f9f151a6f1f6d5079409e68015dc7395b0118e7 Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Wed, 26 Aug 2015 12:24:44 +0100 Subject: [PATCH 088/134] Re add init run --- .../{commonFrameWork_0.0.1.js => commonFrameWork_0.0.2.js} | 0 server/views/coursewares/showBonfire.jade | 2 +- server/views/coursewares/showHTML.jade | 2 +- server/views/coursewares/showJS.jade | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename public/js/lib/coursewares/{commonFrameWork_0.0.1.js => commonFrameWork_0.0.2.js} (100%) diff --git a/public/js/lib/coursewares/commonFrameWork_0.0.1.js b/public/js/lib/coursewares/commonFrameWork_0.0.2.js similarity index 100% rename from public/js/lib/coursewares/commonFrameWork_0.0.1.js rename to public/js/lib/coursewares/commonFrameWork_0.0.2.js diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade index 5b0e2deecc4..3ecaff7e782 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.1.js') + script(src='/js/lib/coursewares/commonFrameWork_0.0.2.js') script. editor.setOption("mode", "javascript"); diff --git a/server/views/coursewares/showHTML.jade b/server/views/coursewares/showHTML.jade index 208d9969f7e..58652c9f5f7 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.1.js') + script(src = '/js/lib/coursewares/commonFrameWork_0.0.2.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 c3c0acf671c..79b00162016 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.1.js') + script(src = '/js/lib/coursewares/commonFrameWork_0.0.2.js') script. editor.setOption("mode", "javascript"); #complete-courseware-dialog.modal(tabindex='-1') From 695ad48778c52860402c9522c8a716df59d5c67a Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Wed, 26 Aug 2015 12:26:01 +0100 Subject: [PATCH 089/134] Fixed version number --- .../{commonFrameWork_0.0.2.js => commonFrameWork_0.0.3.js} | 0 server/views/coursewares/showBonfire.jade | 2 +- server/views/coursewares/showHTML.jade | 2 +- server/views/coursewares/showJS.jade | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename public/js/lib/coursewares/{commonFrameWork_0.0.2.js => commonFrameWork_0.0.3.js} (100%) diff --git a/public/js/lib/coursewares/commonFrameWork_0.0.2.js b/public/js/lib/coursewares/commonFrameWork_0.0.3.js similarity index 100% rename from public/js/lib/coursewares/commonFrameWork_0.0.2.js rename to public/js/lib/coursewares/commonFrameWork_0.0.3.js diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade index 3ecaff7e782..8a7e8d2bf11 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.2.js') + script(src='/js/lib/coursewares/commonFrameWork_0.0.3.js') script. editor.setOption("mode", "javascript"); diff --git a/server/views/coursewares/showHTML.jade b/server/views/coursewares/showHTML.jade index 58652c9f5f7..aa7edeb23e8 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.2.js') + script(src = '/js/lib/coursewares/commonFrameWork_0.0.3.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 79b00162016..fad4177e179 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.2.js') + script(src = '/js/lib/coursewares/commonFrameWork_0.0.3.js') script. editor.setOption("mode", "javascript"); #complete-courseware-dialog.modal(tabindex='-1') From 18acaba2f2046eeb6bd1059e8a80d394fa3a158f Mon Sep 17 00:00:00 2001 From: Aniruddh Agarwal Date: Wed, 26 Aug 2015 20:40:54 +0800 Subject: [PATCH 090/134] Expanded description of 'Remove an Element Using jQuery' waypoint --- seed/challenges/jquery.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/seed/challenges/jquery.json b/seed/challenges/jquery.json index 93cc8899b24..f67c7a0807f 100644 --- a/seed/challenges/jquery.json +++ b/seed/challenges/jquery.json @@ -464,7 +464,8 @@ "difficulty": 3.10, "description": [ "Now let's remove an HTML element from your page using jQuery.", - "jQuery has a function called .remove() that will remove an HTML element entirely." + "jQuery has a function called .remove() that will remove an HTML element entirely", + "Remove element target4 from the page by using the .remove() function." ], "tests": [ "assert($(\"#target4\").length === 0, 'Use jQuery to remove your target4 element from your page.')", @@ -671,7 +672,7 @@ "id": "bad87fee1348bd9aed208826", "title": "Target the Children of an Element Using jQuery", "difficulty": 3.14, - "description": [ + "description": [ "Many HTML elements have children elements from which inherit their properties.", "For example, every HTML element is a child of your body element, and your \"jQuery Playground\" h3 element is a child of your <div class=\"container-fluid\"> element.", "jQuery has a function called children() that allows you to access the children of whichever element you've selected.", From a63d6bd00b30869ffd00ea8afb51e4a9905d8b8f Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Wed, 26 Aug 2015 20:22:29 +0100 Subject: [PATCH 091/134] 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 fe5f790cf45..d6c1d95d93b 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, '")); 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 8a7e8d2bf11..46953bc3440 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 aa7edeb23e8..d0175c1c711 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 fad4177e179..a9c73f9a7f0 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') From c481dcabfcbd647f07c8f364d739e2be8c3c59e1 Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Wed, 26 Aug 2015 20:31:31 +0100 Subject: [PATCH 092/134] Touched up frame work --- public/js/lib/coursewares/commonFrameWork_0.0.4.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/js/lib/coursewares/commonFrameWork_0.0.4.js b/public/js/lib/coursewares/commonFrameWork_0.0.4.js index d6c1d95d93b..429effe7a69 100644 --- a/public/js/lib/coursewares/commonFrameWork_0.0.4.js +++ b/public/js/lib/coursewares/commonFrameWork_0.0.4.js @@ -576,11 +576,11 @@ $(document).ready(function(){ isInitRun = true; editorValue = (codeStorage.isAlive())? codeStorage.getEditorValue() : allSeeds; myCodeMirror.setValue(editorValue.replace(/fccss/gi, '")); - if(typeof $preview.html() !== 'undefined') { + if(typeof $preview.html() !== 'undefined' && isInitRun) { $preview.load(function(){ - bonfireExecute(false); + bonfireExecute(true); }); } else{ - bonfireExecute(false); + bonfireExecute(true); } }); From 306551848cec2749a4919dd571b3b4434532bab5 Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Wed, 26 Aug 2015 20:45:50 +0100 Subject: [PATCH 093/134] Update cFW version no --- .../{commonFrameWork_0.0.4.js => commonFrameWork_0.0.5.js} | 0 server/views/coursewares/showBonfire.jade | 2 +- server/views/coursewares/showHTML.jade | 2 +- server/views/coursewares/showJS.jade | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename public/js/lib/coursewares/{commonFrameWork_0.0.4.js => commonFrameWork_0.0.5.js} (100%) diff --git a/public/js/lib/coursewares/commonFrameWork_0.0.4.js b/public/js/lib/coursewares/commonFrameWork_0.0.5.js similarity index 100% rename from public/js/lib/coursewares/commonFrameWork_0.0.4.js rename to public/js/lib/coursewares/commonFrameWork_0.0.5.js diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade index 46953bc3440..395eae398d0 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.4.js') + script(src='/js/lib/coursewares/commonFrameWork_0.0.5.js') script. editor.setOption("mode", "javascript"); diff --git a/server/views/coursewares/showHTML.jade b/server/views/coursewares/showHTML.jade index d0175c1c711..c008b3616f8 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.4.js') + script(src = '/js/lib/coursewares/commonFrameWork_0.0.5.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 a9c73f9a7f0..ae9ad8c83ed 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.4.js') + script(src = '/js/lib/coursewares/commonFrameWork_0.0.5.js') script. editor.setOption("mode", "javascript"); #complete-courseware-dialog.modal(tabindex='-1') From 2c9ed16b7abcac9bde9de0c520f17b41c5a032b7 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Wed, 26 Aug 2015 13:09:38 -0700 Subject: [PATCH 094/134] fix only submit on user click --- ...Work_0.0.5.js => commonFrameWork_0.0.6.js} | 33 +++++++++---------- server/views/coursewares/showBonfire.jade | 5 ++- server/views/coursewares/showHTML.jade | 4 +-- server/views/coursewares/showJS.jade | 4 +-- 4 files changed, 22 insertions(+), 24 deletions(-) rename public/js/lib/coursewares/{commonFrameWork_0.0.5.js => commonFrameWork_0.0.6.js} (97%) diff --git a/public/js/lib/coursewares/commonFrameWork_0.0.5.js b/public/js/lib/coursewares/commonFrameWork_0.0.6.js similarity index 97% rename from public/js/lib/coursewares/commonFrameWork_0.0.5.js rename to public/js/lib/coursewares/commonFrameWork_0.0.6.js index 429effe7a69..7bc8b75d66e 100644 --- a/public/js/lib/coursewares/commonFrameWork_0.0.5.js +++ b/public/js/lib/coursewares/commonFrameWork_0.0.6.js @@ -294,27 +294,26 @@ function showCompletion() { ', Attempts: ' + attempts); var bonfireSolution = myCodeMirror.getValue(); var didCompleteWith = $('#completed-with').val() || null; - $.post( + $('#complete-courseware-dialog').modal('show'); + $('#submit-challenge').click(function(e) { + e.preventDefault(); + $.post( '/completed-bonfire/', { - challengeInfo: { - challengeId: challenge_Id, - challengeName: challenge_Name, - completedWith: didCompleteWith, - challengeType: challengeType, - solution: bonfireSolution - } + challengeInfo: { + challengeId: challenge_Id, + challengeName: challenge_Name, + completedWith: didCompleteWith, + challengeType: challengeType, + solution: bonfireSolution + } }, function(res) { - if (res) { - $('#complete-courseware-dialog').modal('show'); - $('#complete-courseware-dialog').keydown(function(e) { - if (e.ctrlKey && e.keyCode == 13) { - $('#next-courseware-button').click(); - } - }); - } + if (res) { + window.location = '/challenges/next-challenge'; + } } - ); + ); + }); } var resetEditor = function resetEditor() { diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade index 395eae398d0..d6ba73e1f88 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.5.js') + script(src='/js/lib/coursewares/commonFrameWork_0.0.6.js') script. editor.setOption("mode", "javascript"); @@ -138,8 +138,7 @@ block content .animated.zoomInDown.delay-half span.completion-icon.ion-checkmark-circled.text-primary if (user) - - a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block#next-courseware-button(name='_csrf', value=_csrf) Go to my next challenge (ctrl + enter) + #submit-challenge.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Submit if (user.progressTimestamps.length > 2) a.animated.fadeIn.btn.btn-lg.btn-block.btn-twitter(target="_blank", href="https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20%40FreeCodeCamp%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/challenges/#{dashedName}&hashtags=LearnToCode, JavaScript") diff --git a/server/views/coursewares/showHTML.jade b/server/views/coursewares/showHTML.jade index c008b3616f8..ac3c14619c5 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.5.js') + script(src = '/js/lib/coursewares/commonFrameWork_0.0.6.js') script. editor.setOption("mode", "text/html"); .col-md-4.col-lg-3 @@ -91,7 +91,7 @@ block content .animated.zoomInDown.delay-half span.completion-icon.ion-checkmark-circled.text-primary if(user) - a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block(href='/challenges/next-challenge') Go to the next challenge + #submit-challenge.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Submit else a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress include ../partials/challenge-modals diff --git a/server/views/coursewares/showJS.jade b/server/views/coursewares/showJS.jade index ae9ad8c83ed..f99267f2f0e 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.5.js') + script(src = '/js/lib/coursewares/commonFrameWork_0.0.6.js') script. editor.setOption("mode", "javascript"); #complete-courseware-dialog.modal(tabindex='-1') @@ -85,7 +85,7 @@ block content .animated.zoomInDown.delay-half span.completion-icon.ion-checkmark-circled.text-primary if (user) - a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block#next-courseware-button(name='_csrf', value=_csrf) Go to my next challenge (ctrl + enter) + #submit-challenge.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Submit if (user.progressTimestamps.length > 2) a.animated.fadeIn.btn.btn-lg.btn-block.btn-twitter(target="_blank", href="https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20%40FreeCodeCamp%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/challenges/#{dashedName}&hashtags=LearnToCode, JavaScript") i.fa.fa-twitter   From cbc8ac07585eb4ae6b75448cc50d78aa9ffa771f Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Wed, 26 Aug 2015 13:17:05 -0700 Subject: [PATCH 095/134] fix disable button after click --- public/js/lib/coursewares/commonFrameWork_0.0.6.js | 1 + 1 file changed, 1 insertion(+) diff --git a/public/js/lib/coursewares/commonFrameWork_0.0.6.js b/public/js/lib/coursewares/commonFrameWork_0.0.6.js index 7bc8b75d66e..00dccccadd8 100644 --- a/public/js/lib/coursewares/commonFrameWork_0.0.6.js +++ b/public/js/lib/coursewares/commonFrameWork_0.0.6.js @@ -296,6 +296,7 @@ function showCompletion() { var didCompleteWith = $('#completed-with').val() || null; $('#complete-courseware-dialog').modal('show'); $('#submit-challenge').click(function(e) { + $('#submit-challenge').attr('disabled', 'true'); e.preventDefault(); $.post( '/completed-bonfire/', { From 51096dc7c79b6020dec8ff4ae7ae44ae327f5ad9 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Wed, 26 Aug 2015 13:20:50 -0700 Subject: [PATCH 096/134] add disabled class to button on press --- public/js/lib/coursewares/commonFrameWork_0.0.6.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/public/js/lib/coursewares/commonFrameWork_0.0.6.js b/public/js/lib/coursewares/commonFrameWork_0.0.6.js index 00dccccadd8..2aad14d097b 100644 --- a/public/js/lib/coursewares/commonFrameWork_0.0.6.js +++ b/public/js/lib/coursewares/commonFrameWork_0.0.6.js @@ -296,7 +296,11 @@ function showCompletion() { var didCompleteWith = $('#completed-with').val() || null; $('#complete-courseware-dialog').modal('show'); $('#submit-challenge').click(function(e) { - $('#submit-challenge').attr('disabled', 'true'); + + $('#submit-challenge') + .attr('disabled', 'true') + .addClass('disabled'); + e.preventDefault(); $.post( '/completed-bonfire/', { From 51f99b0c30e0cd1be2608ae362a1b0aa73f2a942 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Wed, 26 Aug 2015 13:47:38 -0700 Subject: [PATCH 097/134] fix should not run test on key up --- .../lib/coursewares/commonFrameWork_0.0.6.js | 39 +++++-------------- 1 file changed, 10 insertions(+), 29 deletions(-) diff --git a/public/js/lib/coursewares/commonFrameWork_0.0.6.js b/public/js/lib/coursewares/commonFrameWork_0.0.6.js index 2aad14d097b..878fe4d5e24 100644 --- a/public/js/lib/coursewares/commonFrameWork_0.0.6.js +++ b/public/js/lib/coursewares/commonFrameWork_0.0.6.js @@ -1,4 +1,5 @@ var isInitRun = false; +var initPreview = true; var editor; var widgets = []; editor = CodeMirror.fromTextArea(document.getElementById("codeEditor"), { @@ -10,8 +11,7 @@ editor = CodeMirror.fromTextArea(document.getElementById("codeEditor"), { autoCloseBrackets: true, scrollbarStyle: 'null', lineWrapping: true, - gutters: ["CodeMirror-lint-markers"], - onKeyEvent: doLinting + gutters: ["CodeMirror-lint-markers"] }); var myCodeMirror = editor; @@ -83,29 +83,6 @@ var allSeeds = ''; }); })(); -function doLinting() { - editor.operation(function() { - for (var i = 0; i < widgets.length; ++i) - editor.removeLineWidget(widgets[i]); - widgets.length = 0; - JSHINT(editor.getValue()); - for (var i = 0; i < JSHINT.errors.length; ++i) { - var err = JSHINT.errors[i]; - if (!err) continue; - var msg = document.createElement("div"); - var icon = msg.appendChild(document.createElement("span")); - icon.innerHTML = "!!"; - icon.className = "lint-error-icon"; - msg.appendChild(document.createTextNode(err.reason)); - msg.className = "lint-error"; - widgets.push(editor.addLineWidget(err.line - 1, msg, { - coverGutter: false, - noHScroll: true - })); - } - }); -} - /*var defaultKeymap = { 'Cmd-E': 'emmet.expand_abbreviation', 'Tab': 'emmet.expand_abbreviation_with_tab', @@ -323,7 +300,8 @@ function showCompletion() { var resetEditor = function resetEditor() { editor.setValue(allSeeds.replace((/fccss/gi), '')); - updatePreview(); + $('#testSuite').empty(); + bonfireExecute(true); codeStorage.updateStorage(); }; @@ -485,6 +463,7 @@ var runTests = function(err, data) { }; function bonfireExecute(test) { + initPreview = false; goodTests = 0; attempts++; ga('send', 'event', 'Challenge', 'ran-code', challenge_Name); @@ -510,7 +489,7 @@ function bonfireExecute(test) { if (failedCommentTest) { myCodeMirror.setValue(myCodeMirror.getValue() + "*/"); console.log('Caught Unfinished Comment'); - codeOutput.setValue("Unfinished mulit-line comment"); + codeOutput.setValue("Unfinished multi-line comment"); failedCommentTest = false; } else if (cls) { @@ -580,9 +559,11 @@ $(document).ready(function(){ isInitRun = true; editorValue = (codeStorage.isAlive())? codeStorage.getEditorValue() : allSeeds; myCodeMirror.setValue(editorValue.replace(/fccss/gi, '")); - if(typeof $preview.html() !== 'undefined' && isInitRun) { + if (typeof $preview.html() !== 'undefined') { $preview.load(function(){ - bonfireExecute(true); + if (initPreview) { + bonfireExecute(true); + } }); } else{ bonfireExecute(true); From ee45a147eca02b15ba1ca55d5fc36ee5d399e8db Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Wed, 26 Aug 2015 13:52:05 -0700 Subject: [PATCH 098/134] change button color on submit --- public/js/lib/coursewares/commonFrameWork_0.0.6.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/js/lib/coursewares/commonFrameWork_0.0.6.js b/public/js/lib/coursewares/commonFrameWork_0.0.6.js index 878fe4d5e24..8b0f2570106 100644 --- a/public/js/lib/coursewares/commonFrameWork_0.0.6.js +++ b/public/js/lib/coursewares/commonFrameWork_0.0.6.js @@ -276,7 +276,8 @@ function showCompletion() { $('#submit-challenge') .attr('disabled', 'true') - .addClass('disabled'); + .removeClass('btn-primary') + .addClass('btn-warning disabled'); e.preventDefault(); $.post( From 7c3f6505215eb2817d9478d8e4b23f7a26cee4d6 Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Wed, 26 Aug 2015 22:37:54 +0100 Subject: [PATCH 099/134] Bump up cFW version number to ensure eveyone is on te latest version --- server/views/coursewares/showBonfire.jade | 2 +- server/views/coursewares/showHTML.jade | 2 +- server/views/coursewares/showJS.jade | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade index d6ba73e1f88..9c164b7269b 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.6.js') + script(src='/js/lib/coursewares/commonFrameWork_0.0.7.js') script. editor.setOption("mode", "javascript"); diff --git a/server/views/coursewares/showHTML.jade b/server/views/coursewares/showHTML.jade index ac3c14619c5..4a0e69a4dc0 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.6.js') + script(src = '/js/lib/coursewares/commonFrameWork_0.0.7.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 f99267f2f0e..4a3a6671dde 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.6.js') + script(src = '/js/lib/coursewares/commonFrameWork_0.0.7.js') script. editor.setOption("mode", "javascript"); #complete-courseware-dialog.modal(tabindex='-1') From e7a539704b9078a9eddaae02db2b3f37af71c5f8 Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Wed, 26 Aug 2015 22:40:03 +0100 Subject: [PATCH 100/134] Bump up cFW version number to ensure eveyone is on te latest version emergency fix --- .../{commonFrameWork_0.0.6.js => commonFrameWork_0.0.7.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename public/js/lib/coursewares/{commonFrameWork_0.0.6.js => commonFrameWork_0.0.7.js} (100%) diff --git a/public/js/lib/coursewares/commonFrameWork_0.0.6.js b/public/js/lib/coursewares/commonFrameWork_0.0.7.js similarity index 100% rename from public/js/lib/coursewares/commonFrameWork_0.0.6.js rename to public/js/lib/coursewares/commonFrameWork_0.0.7.js From 39f636ae91f2df947d897a655227809b9c906141 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Wed, 26 Aug 2015 15:17:19 -0700 Subject: [PATCH 101/134] add loader to challenge submit --- public/css/main.less | 101 ++++++++++++++++++ .../lib/coursewares/commonFrameWork_0.0.7.js | 16 ++- server/views/coursewares/showBonfire.jade | 23 ++-- server/views/coursewares/showHTML.jade | 15 +-- server/views/coursewares/showJS.jade | 23 ++-- 5 files changed, 151 insertions(+), 27 deletions(-) diff --git a/public/css/main.less b/public/css/main.less index 45cd2daed40..814e99cb543 100644 --- a/public/css/main.less +++ b/public/css/main.less @@ -1177,3 +1177,104 @@ hr { // border-width: 1px; // border-style: solid; //} + +// source: https://github.com/jlong/css-spinners/blob/master/css/spinner/inner-circles.css +// license MIT +/* :not(:required) hides this rule from IE9 and below */ +.inner-circles-loader:not(:required) { + -moz-transform: translate3d(0, 0, 0); + -ms-transform: translate3d(0, 0, 0); + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + position: relative; + display: inline-block; + width: 125px; + height: 125px; + background: rgba(25, 165, 152, 0.5); + border-radius: 50%; + overflow: hidden; + text-indent: -9999px; + margin-top: 10%; + /* Hides inner circles outside base circle at safari */ + -webkit-mask-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAA5JREFUeNpiYGBgAAgwAAAEAAGbA+oJAAAAAElFTkSuQmCC); +} +.inner-circles-loader:not(:required):before, .inner-circles-loader:not(:required):after { + content: ''; + position: absolute; + top: 0; + display: inline-block; + width: 125px; + height: 125px; + border-radius: 50%; +} +.inner-circles-loader:not(:required):before { + -moz-animation: inner-circles-loader 3s infinite; + -webkit-animation: inner-circles-loader 3s infinite; + animation: inner-circles-loader 3s infinite; + -moz-transform-origin: 0 50%; + -ms-transform-origin: 0 50%; + -webkit-transform-origin: 0 50%; + transform-origin: 0 50%; + left: 0; + background: #c7efcf; +} +.inner-circles-loader:not(:required):after { + -moz-animation: inner-circles-loader 3s 0.2s reverse infinite; + -webkit-animation: inner-circles-loader 3s 0.2s reverse infinite; + animation: inner-circles-loader 3s 0.2s reverse infinite; + -moz-transform-origin: 100% 50%; + -ms-transform-origin: 100% 50%; + -webkit-transform-origin: 100% 50%; + transform-origin: 100% 50%; + right: 0; + background: #eef5db; +} + +@-moz-keyframes inner-circles-loader { + 0% { + -moz-transform: rotate(0deg); + transform: rotate(0deg); + } + 50% { + -moz-transform: rotate(360deg); + transform: rotate(360deg); + } + 100% { + -moz-transform: rotate(0deg); + transform: rotate(0deg); + } +} +@-webkit-keyframes inner-circles-loader { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 50% { + -webkit-transform: rotate(360deg); + transform: rotate(360deg); + } + 100% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } +} +@keyframes inner-circles-loader { + 0% { + -moz-transform: rotate(0deg); + -ms-transform: rotate(0deg); + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 50% { + -moz-transform: rotate(360deg); + -ms-transform: rotate(360deg); + -webkit-transform: rotate(360deg); + transform: rotate(360deg); + } + 100% { + -moz-transform: rotate(0deg); + -ms-transform: rotate(0deg); + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } +} diff --git a/public/js/lib/coursewares/commonFrameWork_0.0.7.js b/public/js/lib/coursewares/commonFrameWork_0.0.7.js index 8b0f2570106..b712a9cb35e 100644 --- a/public/js/lib/coursewares/commonFrameWork_0.0.7.js +++ b/public/js/lib/coursewares/commonFrameWork_0.0.7.js @@ -273,13 +273,27 @@ function showCompletion() { var didCompleteWith = $('#completed-with').val() || null; $('#complete-courseware-dialog').modal('show'); $('#submit-challenge').click(function(e) { + e.preventDefault(); $('#submit-challenge') .attr('disabled', 'true') .removeClass('btn-primary') .addClass('btn-warning disabled'); - e.preventDefault(); + var $checkmarkContainer = $('#checkmark-container'); + $checkmarkContainer.css({ height: $checkmarkContainer.innerHeight() }); + + $('#challenge-checkmark') + .addClass('zoomOutUp') + // .removeClass('zoomInDown') + .delay(1000) + .queue(function(next) { + $(this).replaceWith( + '
submitting...
' + ); + next(); + }); + $.post( '/completed-bonfire/', { challengeInfo: { diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade index 9c164b7269b..ce78fb8ea54 100644 --- a/server/views/coursewares/showBonfire.jade +++ b/server/views/coursewares/showBonfire.jade @@ -135,17 +135,20 @@ block content a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') × .modal-body .text-center - .animated.zoomInDown.delay-half - span.completion-icon.ion-checkmark-circled.text-primary - if (user) - #submit-challenge.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Submit + #checkmark-container.row + #challenge-checkmark.animated.zoomInDown.delay-half + span.completion-icon.ion-checkmark-circled.text-primary + .spacer + .row + if (user) + #submit-challenge.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Submit - if (user.progressTimestamps.length > 2) - a.animated.fadeIn.btn.btn-lg.btn-block.btn-twitter(target="_blank", href="https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20%40FreeCodeCamp%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/challenges/#{dashedName}&hashtags=LearnToCode, JavaScript") - i.fa.fa-twitter   - = phrase - else - a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress + if (user.progressTimestamps.length > 2) + a.animated.fadeIn.btn.btn-lg.btn-block.btn-twitter(target="_blank", href="https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20%40FreeCodeCamp%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/challenges/#{dashedName}&hashtags=LearnToCode, JavaScript") + i.fa.fa-twitter   + = phrase + else + a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress #reset-modal.modal(tabindex='-1') .modal-dialog.animated.fadeInUp.fast-animation .modal-content diff --git a/server/views/coursewares/showHTML.jade b/server/views/coursewares/showHTML.jade index 4a0e69a4dc0..94399ce677a 100644 --- a/server/views/coursewares/showHTML.jade +++ b/server/views/coursewares/showHTML.jade @@ -88,10 +88,13 @@ block content a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') × .modal-body .text-center - .animated.zoomInDown.delay-half - span.completion-icon.ion-checkmark-circled.text-primary - if(user) - #submit-challenge.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Submit - else - a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress + #checkmark-container.row + #challenge-checkmark.animated.zoomInDown.delay-half + span.completion-icon.ion-checkmark-circled.text-primary + .spacer + .row + if(user) + #submit-challenge.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Submit + else + a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress include ../partials/challenge-modals diff --git a/server/views/coursewares/showJS.jade b/server/views/coursewares/showJS.jade index 4a3a6671dde..34bf4fa3b4f 100644 --- a/server/views/coursewares/showJS.jade +++ b/server/views/coursewares/showJS.jade @@ -82,16 +82,19 @@ block content a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') × .modal-body .text-center - .animated.zoomInDown.delay-half - span.completion-icon.ion-checkmark-circled.text-primary - if (user) - #submit-challenge.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Submit - if (user.progressTimestamps.length > 2) - a.animated.fadeIn.btn.btn-lg.btn-block.btn-twitter(target="_blank", href="https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20%40FreeCodeCamp%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/challenges/#{dashedName}&hashtags=LearnToCode, JavaScript") - i.fa.fa-twitter   - = phrase - else - a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress + #checkmark-container.row + #challenge-checkmark.animated.zoomInDown.delay-half + span.completion-icon.ion-checkmark-circled.text-primary + .spacer + .row + if (user) + #submit-challenge.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Submit + if (user.progressTimestamps.length > 2) + a.animated.fadeIn.btn.btn-lg.btn-block.btn-twitter(target="_blank", href="https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20%40FreeCodeCamp%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/challenges/#{dashedName}&hashtags=LearnToCode, JavaScript") + i.fa.fa-twitter   + = phrase + else + 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. var MDNlinks = !{JSON.stringify(MDNlinks)}; From 306c441ae75c2a0cc7decdfa0677c8ffdf7dc83f Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Wed, 26 Aug 2015 23:20:56 -0700 Subject: [PATCH 102/134] add revisioning to js/css files to break caching This moves the location of javascript files, commonFramework, iFrameScript, sandbox, plugin, and all the less files. On gulp or gulp build these files are moved and revisioned. Places where they are references in jade/html are now removed and replaced with the use of a helper function `rev`. This function will take the required file and return a string referencing the revisioned file. This should alleviate the need for hard refreshing and will break caches when files change, so fixes for firefox caching issue as well. NOTE: @benmcmahon @quincylarson, This means files will need to be build on the server in production before doing a server restart/reload In production: 'npm run build' To build and revision js/css files `gulp` and `gulp build` will used in development npm install also needs to be run in production on initial deploy --- .gitignore | 11 +++ client/README.md | 2 +- .../commonFramework.js | 2 +- .../iFrameScripts.js | 0 {public/css => client/less}/lib/Vimeo.css | 0 .../css => client/less}/lib/animate.min.less | 0 .../bootstrap-social/bootstrap-social.less | 0 .../less}/lib/bootstrap/alerts.less | 0 .../less}/lib/bootstrap/badges.less | 0 .../less}/lib/bootstrap/bootstrap.less | 0 .../less}/lib/bootstrap/breadcrumbs.less | 0 .../less}/lib/bootstrap/button-groups.less | 0 .../less}/lib/bootstrap/buttons.less | 0 .../less}/lib/bootstrap/carousel.less | 0 .../less}/lib/bootstrap/close.less | 0 .../less}/lib/bootstrap/code.less | 0 .../lib/bootstrap/component-animations.less | 0 .../less}/lib/bootstrap/dropdowns.less | 0 .../less}/lib/bootstrap/forms.less | 0 .../less}/lib/bootstrap/glyphicons.less | 0 .../less}/lib/bootstrap/grid.less | 0 .../less}/lib/bootstrap/input-groups.less | 0 .../less}/lib/bootstrap/jumbotron.less | 0 .../less}/lib/bootstrap/labels.less | 0 .../less}/lib/bootstrap/list-group.less | 0 .../less}/lib/bootstrap/media.less | 0 .../less}/lib/bootstrap/mixins.less | 0 .../less}/lib/bootstrap/mixins/alerts.less | 0 .../bootstrap/mixins/background-variant.less | 0 .../lib/bootstrap/mixins/border-radius.less | 0 .../less}/lib/bootstrap/mixins/buttons.less | 0 .../lib/bootstrap/mixins/center-block.less | 0 .../less}/lib/bootstrap/mixins/clearfix.less | 0 .../less}/lib/bootstrap/mixins/forms.less | 0 .../less}/lib/bootstrap/mixins/gradients.less | 0 .../lib/bootstrap/mixins/grid-framework.less | 0 .../less}/lib/bootstrap/mixins/grid.less | 0 .../less}/lib/bootstrap/mixins/hide-text.less | 0 .../less}/lib/bootstrap/mixins/image.less | 0 .../less}/lib/bootstrap/mixins/labels.less | 0 .../lib/bootstrap/mixins/list-group.less | 0 .../lib/bootstrap/mixins/nav-divider.less | 0 .../bootstrap/mixins/nav-vertical-align.less | 0 .../less}/lib/bootstrap/mixins/opacity.less | 0 .../lib/bootstrap/mixins/pagination.less | 0 .../less}/lib/bootstrap/mixins/panels.less | 0 .../lib/bootstrap/mixins/progress-bar.less | 0 .../lib/bootstrap/mixins/reset-filter.less | 0 .../less}/lib/bootstrap/mixins/resize.less | 0 .../mixins/responsive-visibility.less | 0 .../less}/lib/bootstrap/mixins/size.less | 0 .../less}/lib/bootstrap/mixins/tab-focus.less | 0 .../less}/lib/bootstrap/mixins/table-row.less | 0 .../lib/bootstrap/mixins/text-emphasis.less | 0 .../lib/bootstrap/mixins/text-overflow.less | 0 .../lib/bootstrap/mixins/vendor-prefixes.less | 0 .../less}/lib/bootstrap/modals.less | 0 .../less}/lib/bootstrap/navbar.less | 0 .../less}/lib/bootstrap/navs.less | 0 .../less}/lib/bootstrap/normalize.less | 0 .../less}/lib/bootstrap/pager.less | 0 .../less}/lib/bootstrap/pagination.less | 0 .../less}/lib/bootstrap/panels.less | 0 .../less}/lib/bootstrap/popovers.less | 0 .../less}/lib/bootstrap/print.less | 0 .../less}/lib/bootstrap/progress-bars.less | 0 .../less}/lib/bootstrap/responsive-embed.less | 0 .../lib/bootstrap/responsive-utilities.less | 0 .../less}/lib/bootstrap/scaffolding.less | 0 .../less}/lib/bootstrap/tables.less | 0 .../less}/lib/bootstrap/theme.less | 0 .../less}/lib/bootstrap/thumbnails.less | 0 .../less}/lib/bootstrap/tooltip.less | 0 .../less}/lib/bootstrap/type.less | 0 .../less}/lib/bootstrap/utilities.less | 0 .../less}/lib/bootstrap/variables.less | 0 .../less}/lib/bootstrap/wells.less | 0 .../font-awesome-4.3.0/css/font-awesome.css | 0 .../css/font-awesome.min.css | 0 .../font-awesome-4.3.0/fonts/FontAwesome.otf | Bin .../fonts/fontawesome-webfont.eot | Bin .../fonts/fontawesome-webfont.svg | 0 .../fonts/fontawesome-webfont.ttf | Bin .../fonts/fontawesome-webfont.woff | Bin .../fonts/fontawesome-webfont.woff2 | Bin .../lib/font-awesome-4.3.0/less/animated.less | 0 .../less/bordered-pulled.less | 0 .../lib/font-awesome-4.3.0/less/core.less | 0 .../font-awesome-4.3.0/less/fixed-width.less | 0 .../font-awesome-4.3.0/less/font-awesome.less | 0 .../lib/font-awesome-4.3.0/less/icons.less | 0 .../lib/font-awesome-4.3.0/less/larger.less | 0 .../lib/font-awesome-4.3.0/less/list.less | 0 .../lib/font-awesome-4.3.0/less/mixins.less | 0 .../lib/font-awesome-4.3.0/less/path.less | 0 .../less/rotated-flipped.less | 0 .../lib/font-awesome-4.3.0/less/stacked.less | 0 .../font-awesome-4.3.0/less/variables.less | 0 .../font-awesome-4.3.0/scss/_animated.scss | 0 .../scss/_bordered-pulled.scss | 0 .../lib/font-awesome-4.3.0/scss/_core.scss | 0 .../font-awesome-4.3.0/scss/_fixed-width.scss | 0 .../lib/font-awesome-4.3.0/scss/_icons.scss | 0 .../lib/font-awesome-4.3.0/scss/_larger.scss | 0 .../lib/font-awesome-4.3.0/scss/_list.scss | 0 .../lib/font-awesome-4.3.0/scss/_mixins.scss | 0 .../lib/font-awesome-4.3.0/scss/_path.scss | 0 .../scss/_rotated-flipped.scss | 0 .../lib/font-awesome-4.3.0/scss/_stacked.scss | 0 .../font-awesome-4.3.0/scss/_variables.scss | 0 .../font-awesome-4.3.0/scss/font-awesome.scss | 0 .../lib/ionicons/_ionicons-animation.less | 0 .../less}/lib/ionicons/_ionicons-font.less | 0 .../less}/lib/ionicons/_ionicons-icons.less | 0 .../lib/ionicons/_ionicons-variables.less | 0 .../less}/lib/ionicons/ionicons.less | 0 .../less}/lib/ionicons/ionicons.min.css | 0 {public/css => client/less}/main.less | 0 public/js/main_0.0.3.js => client/main.js | 0 .../plugin_v0.1.5.js => client/plugin.js | 0 .../js/lib/coursewares => client}/sandbox.js | 2 +- gulpfile.js | 88 ++++++++++++++---- package.json | 3 + server/middleware.json | 3 +- server/middlewares/revision-helpers.js | 13 +++ server/views/coursewares/showBonfire.jade | 4 +- server/views/coursewares/showHTML.jade | 4 +- server/views/coursewares/showJS.jade | 4 +- server/views/partials/small-head.jade | 2 +- server/views/partials/universal-head.jade | 4 +- 130 files changed, 112 insertions(+), 30 deletions(-) rename public/js/lib/coursewares/commonFrameWork_0.0.7.js => client/commonFramework.js (99%) rename public/js/lib/coursewares/iFrameScripts_0.0.4.js => client/iFrameScripts.js (100%) rename {public/css => client/less}/lib/Vimeo.css (100%) rename {public/css => client/less}/lib/animate.min.less (100%) rename {public/css => client/less}/lib/bootstrap-social/bootstrap-social.less (100%) rename {public/css => client/less}/lib/bootstrap/alerts.less (100%) rename {public/css => client/less}/lib/bootstrap/badges.less (100%) rename {public/css => client/less}/lib/bootstrap/bootstrap.less (100%) rename {public/css => client/less}/lib/bootstrap/breadcrumbs.less (100%) rename {public/css => client/less}/lib/bootstrap/button-groups.less (100%) rename {public/css => client/less}/lib/bootstrap/buttons.less (100%) rename {public/css => client/less}/lib/bootstrap/carousel.less (100%) rename {public/css => client/less}/lib/bootstrap/close.less (100%) rename {public/css => client/less}/lib/bootstrap/code.less (100%) rename {public/css => client/less}/lib/bootstrap/component-animations.less (100%) rename {public/css => client/less}/lib/bootstrap/dropdowns.less (100%) rename {public/css => client/less}/lib/bootstrap/forms.less (100%) rename {public/css => client/less}/lib/bootstrap/glyphicons.less (100%) rename {public/css => client/less}/lib/bootstrap/grid.less (100%) rename {public/css => client/less}/lib/bootstrap/input-groups.less (100%) rename {public/css => client/less}/lib/bootstrap/jumbotron.less (100%) rename {public/css => client/less}/lib/bootstrap/labels.less (100%) rename {public/css => client/less}/lib/bootstrap/list-group.less (100%) rename {public/css => client/less}/lib/bootstrap/media.less (100%) rename {public/css => client/less}/lib/bootstrap/mixins.less (100%) rename {public/css => client/less}/lib/bootstrap/mixins/alerts.less (100%) rename {public/css => client/less}/lib/bootstrap/mixins/background-variant.less (100%) rename {public/css => client/less}/lib/bootstrap/mixins/border-radius.less (100%) rename {public/css => client/less}/lib/bootstrap/mixins/buttons.less (100%) rename {public/css => client/less}/lib/bootstrap/mixins/center-block.less (100%) rename {public/css => client/less}/lib/bootstrap/mixins/clearfix.less (100%) rename {public/css => client/less}/lib/bootstrap/mixins/forms.less (100%) rename {public/css => client/less}/lib/bootstrap/mixins/gradients.less (100%) rename {public/css => client/less}/lib/bootstrap/mixins/grid-framework.less (100%) rename {public/css => client/less}/lib/bootstrap/mixins/grid.less (100%) rename {public/css => client/less}/lib/bootstrap/mixins/hide-text.less (100%) rename {public/css => client/less}/lib/bootstrap/mixins/image.less (100%) rename {public/css => client/less}/lib/bootstrap/mixins/labels.less (100%) rename {public/css => client/less}/lib/bootstrap/mixins/list-group.less (100%) rename {public/css => client/less}/lib/bootstrap/mixins/nav-divider.less (100%) rename {public/css => client/less}/lib/bootstrap/mixins/nav-vertical-align.less (100%) rename {public/css => client/less}/lib/bootstrap/mixins/opacity.less (100%) rename {public/css => client/less}/lib/bootstrap/mixins/pagination.less (100%) rename {public/css => client/less}/lib/bootstrap/mixins/panels.less (100%) rename {public/css => client/less}/lib/bootstrap/mixins/progress-bar.less (100%) rename {public/css => client/less}/lib/bootstrap/mixins/reset-filter.less (100%) rename {public/css => client/less}/lib/bootstrap/mixins/resize.less (100%) rename {public/css => client/less}/lib/bootstrap/mixins/responsive-visibility.less (100%) rename {public/css => client/less}/lib/bootstrap/mixins/size.less (100%) rename {public/css => client/less}/lib/bootstrap/mixins/tab-focus.less (100%) rename {public/css => client/less}/lib/bootstrap/mixins/table-row.less (100%) rename {public/css => client/less}/lib/bootstrap/mixins/text-emphasis.less (100%) rename {public/css => client/less}/lib/bootstrap/mixins/text-overflow.less (100%) rename {public/css => client/less}/lib/bootstrap/mixins/vendor-prefixes.less (100%) rename {public/css => client/less}/lib/bootstrap/modals.less (100%) rename {public/css => client/less}/lib/bootstrap/navbar.less (100%) rename {public/css => client/less}/lib/bootstrap/navs.less (100%) rename {public/css => client/less}/lib/bootstrap/normalize.less (100%) rename {public/css => client/less}/lib/bootstrap/pager.less (100%) rename {public/css => client/less}/lib/bootstrap/pagination.less (100%) rename {public/css => client/less}/lib/bootstrap/panels.less (100%) rename {public/css => client/less}/lib/bootstrap/popovers.less (100%) rename {public/css => client/less}/lib/bootstrap/print.less (100%) rename {public/css => client/less}/lib/bootstrap/progress-bars.less (100%) rename {public/css => client/less}/lib/bootstrap/responsive-embed.less (100%) rename {public/css => client/less}/lib/bootstrap/responsive-utilities.less (100%) rename {public/css => client/less}/lib/bootstrap/scaffolding.less (100%) rename {public/css => client/less}/lib/bootstrap/tables.less (100%) rename {public/css => client/less}/lib/bootstrap/theme.less (100%) rename {public/css => client/less}/lib/bootstrap/thumbnails.less (100%) rename {public/css => client/less}/lib/bootstrap/tooltip.less (100%) rename {public/css => client/less}/lib/bootstrap/type.less (100%) rename {public/css => client/less}/lib/bootstrap/utilities.less (100%) rename {public/css => client/less}/lib/bootstrap/variables.less (100%) rename {public/css => client/less}/lib/bootstrap/wells.less (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/css/font-awesome.css (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/css/font-awesome.min.css (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/fonts/FontAwesome.otf (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/fonts/fontawesome-webfont.eot (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/fonts/fontawesome-webfont.svg (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/fonts/fontawesome-webfont.ttf (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/fonts/fontawesome-webfont.woff (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/fonts/fontawesome-webfont.woff2 (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/less/animated.less (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/less/bordered-pulled.less (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/less/core.less (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/less/fixed-width.less (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/less/font-awesome.less (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/less/icons.less (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/less/larger.less (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/less/list.less (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/less/mixins.less (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/less/path.less (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/less/rotated-flipped.less (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/less/stacked.less (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/less/variables.less (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/scss/_animated.scss (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/scss/_bordered-pulled.scss (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/scss/_core.scss (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/scss/_fixed-width.scss (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/scss/_icons.scss (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/scss/_larger.scss (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/scss/_list.scss (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/scss/_mixins.scss (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/scss/_path.scss (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/scss/_rotated-flipped.scss (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/scss/_stacked.scss (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/scss/_variables.scss (100%) rename {public/css => client/less}/lib/font-awesome-4.3.0/scss/font-awesome.scss (100%) rename {public/css => client/less}/lib/ionicons/_ionicons-animation.less (100%) rename {public/css => client/less}/lib/ionicons/_ionicons-font.less (100%) rename {public/css => client/less}/lib/ionicons/_ionicons-icons.less (100%) rename {public/css => client/less}/lib/ionicons/_ionicons-variables.less (100%) rename {public/css => client/less}/lib/ionicons/ionicons.less (100%) rename {public/css => client/less}/lib/ionicons/ionicons.min.css (100%) rename {public/css => client/less}/main.less (100%) rename public/js/main_0.0.3.js => client/main.js (100%) rename public/js/lib/coursewares/plugin_v0.1.5.js => client/plugin.js (100%) rename {public/js/lib/coursewares => client}/sandbox.js (96%) create mode 100644 server/middlewares/revision-helpers.js diff --git a/.gitignore b/.gitignore index 86cbd7b0c85..c257b2da901 100644 --- a/.gitignore +++ b/.gitignore @@ -31,4 +31,15 @@ coverage server/*.bundle.js public/js/*.bundle.js + *.map + +// revision manifest +public/js/main* +public/js/commonFramework* +public/js/sandbox* +public/js/iFrameScripts* +public/js/plugin* +public/css/main* + +server/rev-manifest.json diff --git a/client/README.md b/client/README.md index 5ba2586944b..b722fceb9c0 100644 --- a/client/README.md +++ b/client/README.md @@ -1,4 +1,4 @@ -This is the entry point for the client +This is the entry point for the client code Code that should only run on the client should be put here. NOTE(berks): For react specific stuff this should be the entry point diff --git a/public/js/lib/coursewares/commonFrameWork_0.0.7.js b/client/commonFramework.js similarity index 99% rename from public/js/lib/coursewares/commonFrameWork_0.0.7.js rename to client/commonFramework.js index b712a9cb35e..9f6210f1c00 100644 --- a/public/js/lib/coursewares/commonFrameWork_0.0.7.js +++ b/client/commonFramework.js @@ -130,7 +130,7 @@ var libraryIncludes = ""; +var iFrameScript = ""; var delay; // Initialize CodeMirror editor with a nice html5 canvas demo. diff --git a/public/js/lib/coursewares/iFrameScripts_0.0.4.js b/client/iFrameScripts.js similarity index 100% rename from public/js/lib/coursewares/iFrameScripts_0.0.4.js rename to client/iFrameScripts.js diff --git a/public/css/lib/Vimeo.css b/client/less/lib/Vimeo.css similarity index 100% rename from public/css/lib/Vimeo.css rename to client/less/lib/Vimeo.css diff --git a/public/css/lib/animate.min.less b/client/less/lib/animate.min.less similarity index 100% rename from public/css/lib/animate.min.less rename to client/less/lib/animate.min.less diff --git a/public/css/lib/bootstrap-social/bootstrap-social.less b/client/less/lib/bootstrap-social/bootstrap-social.less similarity index 100% rename from public/css/lib/bootstrap-social/bootstrap-social.less rename to client/less/lib/bootstrap-social/bootstrap-social.less diff --git a/public/css/lib/bootstrap/alerts.less b/client/less/lib/bootstrap/alerts.less similarity index 100% rename from public/css/lib/bootstrap/alerts.less rename to client/less/lib/bootstrap/alerts.less diff --git a/public/css/lib/bootstrap/badges.less b/client/less/lib/bootstrap/badges.less similarity index 100% rename from public/css/lib/bootstrap/badges.less rename to client/less/lib/bootstrap/badges.less diff --git a/public/css/lib/bootstrap/bootstrap.less b/client/less/lib/bootstrap/bootstrap.less similarity index 100% rename from public/css/lib/bootstrap/bootstrap.less rename to client/less/lib/bootstrap/bootstrap.less diff --git a/public/css/lib/bootstrap/breadcrumbs.less b/client/less/lib/bootstrap/breadcrumbs.less similarity index 100% rename from public/css/lib/bootstrap/breadcrumbs.less rename to client/less/lib/bootstrap/breadcrumbs.less diff --git a/public/css/lib/bootstrap/button-groups.less b/client/less/lib/bootstrap/button-groups.less similarity index 100% rename from public/css/lib/bootstrap/button-groups.less rename to client/less/lib/bootstrap/button-groups.less diff --git a/public/css/lib/bootstrap/buttons.less b/client/less/lib/bootstrap/buttons.less similarity index 100% rename from public/css/lib/bootstrap/buttons.less rename to client/less/lib/bootstrap/buttons.less diff --git a/public/css/lib/bootstrap/carousel.less b/client/less/lib/bootstrap/carousel.less similarity index 100% rename from public/css/lib/bootstrap/carousel.less rename to client/less/lib/bootstrap/carousel.less diff --git a/public/css/lib/bootstrap/close.less b/client/less/lib/bootstrap/close.less similarity index 100% rename from public/css/lib/bootstrap/close.less rename to client/less/lib/bootstrap/close.less diff --git a/public/css/lib/bootstrap/code.less b/client/less/lib/bootstrap/code.less similarity index 100% rename from public/css/lib/bootstrap/code.less rename to client/less/lib/bootstrap/code.less diff --git a/public/css/lib/bootstrap/component-animations.less b/client/less/lib/bootstrap/component-animations.less similarity index 100% rename from public/css/lib/bootstrap/component-animations.less rename to client/less/lib/bootstrap/component-animations.less diff --git a/public/css/lib/bootstrap/dropdowns.less b/client/less/lib/bootstrap/dropdowns.less similarity index 100% rename from public/css/lib/bootstrap/dropdowns.less rename to client/less/lib/bootstrap/dropdowns.less diff --git a/public/css/lib/bootstrap/forms.less b/client/less/lib/bootstrap/forms.less similarity index 100% rename from public/css/lib/bootstrap/forms.less rename to client/less/lib/bootstrap/forms.less diff --git a/public/css/lib/bootstrap/glyphicons.less b/client/less/lib/bootstrap/glyphicons.less similarity index 100% rename from public/css/lib/bootstrap/glyphicons.less rename to client/less/lib/bootstrap/glyphicons.less diff --git a/public/css/lib/bootstrap/grid.less b/client/less/lib/bootstrap/grid.less similarity index 100% rename from public/css/lib/bootstrap/grid.less rename to client/less/lib/bootstrap/grid.less diff --git a/public/css/lib/bootstrap/input-groups.less b/client/less/lib/bootstrap/input-groups.less similarity index 100% rename from public/css/lib/bootstrap/input-groups.less rename to client/less/lib/bootstrap/input-groups.less diff --git a/public/css/lib/bootstrap/jumbotron.less b/client/less/lib/bootstrap/jumbotron.less similarity index 100% rename from public/css/lib/bootstrap/jumbotron.less rename to client/less/lib/bootstrap/jumbotron.less diff --git a/public/css/lib/bootstrap/labels.less b/client/less/lib/bootstrap/labels.less similarity index 100% rename from public/css/lib/bootstrap/labels.less rename to client/less/lib/bootstrap/labels.less diff --git a/public/css/lib/bootstrap/list-group.less b/client/less/lib/bootstrap/list-group.less similarity index 100% rename from public/css/lib/bootstrap/list-group.less rename to client/less/lib/bootstrap/list-group.less diff --git a/public/css/lib/bootstrap/media.less b/client/less/lib/bootstrap/media.less similarity index 100% rename from public/css/lib/bootstrap/media.less rename to client/less/lib/bootstrap/media.less diff --git a/public/css/lib/bootstrap/mixins.less b/client/less/lib/bootstrap/mixins.less similarity index 100% rename from public/css/lib/bootstrap/mixins.less rename to client/less/lib/bootstrap/mixins.less diff --git a/public/css/lib/bootstrap/mixins/alerts.less b/client/less/lib/bootstrap/mixins/alerts.less similarity index 100% rename from public/css/lib/bootstrap/mixins/alerts.less rename to client/less/lib/bootstrap/mixins/alerts.less diff --git a/public/css/lib/bootstrap/mixins/background-variant.less b/client/less/lib/bootstrap/mixins/background-variant.less similarity index 100% rename from public/css/lib/bootstrap/mixins/background-variant.less rename to client/less/lib/bootstrap/mixins/background-variant.less diff --git a/public/css/lib/bootstrap/mixins/border-radius.less b/client/less/lib/bootstrap/mixins/border-radius.less similarity index 100% rename from public/css/lib/bootstrap/mixins/border-radius.less rename to client/less/lib/bootstrap/mixins/border-radius.less diff --git a/public/css/lib/bootstrap/mixins/buttons.less b/client/less/lib/bootstrap/mixins/buttons.less similarity index 100% rename from public/css/lib/bootstrap/mixins/buttons.less rename to client/less/lib/bootstrap/mixins/buttons.less diff --git a/public/css/lib/bootstrap/mixins/center-block.less b/client/less/lib/bootstrap/mixins/center-block.less similarity index 100% rename from public/css/lib/bootstrap/mixins/center-block.less rename to client/less/lib/bootstrap/mixins/center-block.less diff --git a/public/css/lib/bootstrap/mixins/clearfix.less b/client/less/lib/bootstrap/mixins/clearfix.less similarity index 100% rename from public/css/lib/bootstrap/mixins/clearfix.less rename to client/less/lib/bootstrap/mixins/clearfix.less diff --git a/public/css/lib/bootstrap/mixins/forms.less b/client/less/lib/bootstrap/mixins/forms.less similarity index 100% rename from public/css/lib/bootstrap/mixins/forms.less rename to client/less/lib/bootstrap/mixins/forms.less diff --git a/public/css/lib/bootstrap/mixins/gradients.less b/client/less/lib/bootstrap/mixins/gradients.less similarity index 100% rename from public/css/lib/bootstrap/mixins/gradients.less rename to client/less/lib/bootstrap/mixins/gradients.less diff --git a/public/css/lib/bootstrap/mixins/grid-framework.less b/client/less/lib/bootstrap/mixins/grid-framework.less similarity index 100% rename from public/css/lib/bootstrap/mixins/grid-framework.less rename to client/less/lib/bootstrap/mixins/grid-framework.less diff --git a/public/css/lib/bootstrap/mixins/grid.less b/client/less/lib/bootstrap/mixins/grid.less similarity index 100% rename from public/css/lib/bootstrap/mixins/grid.less rename to client/less/lib/bootstrap/mixins/grid.less diff --git a/public/css/lib/bootstrap/mixins/hide-text.less b/client/less/lib/bootstrap/mixins/hide-text.less similarity index 100% rename from public/css/lib/bootstrap/mixins/hide-text.less rename to client/less/lib/bootstrap/mixins/hide-text.less diff --git a/public/css/lib/bootstrap/mixins/image.less b/client/less/lib/bootstrap/mixins/image.less similarity index 100% rename from public/css/lib/bootstrap/mixins/image.less rename to client/less/lib/bootstrap/mixins/image.less diff --git a/public/css/lib/bootstrap/mixins/labels.less b/client/less/lib/bootstrap/mixins/labels.less similarity index 100% rename from public/css/lib/bootstrap/mixins/labels.less rename to client/less/lib/bootstrap/mixins/labels.less diff --git a/public/css/lib/bootstrap/mixins/list-group.less b/client/less/lib/bootstrap/mixins/list-group.less similarity index 100% rename from public/css/lib/bootstrap/mixins/list-group.less rename to client/less/lib/bootstrap/mixins/list-group.less diff --git a/public/css/lib/bootstrap/mixins/nav-divider.less b/client/less/lib/bootstrap/mixins/nav-divider.less similarity index 100% rename from public/css/lib/bootstrap/mixins/nav-divider.less rename to client/less/lib/bootstrap/mixins/nav-divider.less diff --git a/public/css/lib/bootstrap/mixins/nav-vertical-align.less b/client/less/lib/bootstrap/mixins/nav-vertical-align.less similarity index 100% rename from public/css/lib/bootstrap/mixins/nav-vertical-align.less rename to client/less/lib/bootstrap/mixins/nav-vertical-align.less diff --git a/public/css/lib/bootstrap/mixins/opacity.less b/client/less/lib/bootstrap/mixins/opacity.less similarity index 100% rename from public/css/lib/bootstrap/mixins/opacity.less rename to client/less/lib/bootstrap/mixins/opacity.less diff --git a/public/css/lib/bootstrap/mixins/pagination.less b/client/less/lib/bootstrap/mixins/pagination.less similarity index 100% rename from public/css/lib/bootstrap/mixins/pagination.less rename to client/less/lib/bootstrap/mixins/pagination.less diff --git a/public/css/lib/bootstrap/mixins/panels.less b/client/less/lib/bootstrap/mixins/panels.less similarity index 100% rename from public/css/lib/bootstrap/mixins/panels.less rename to client/less/lib/bootstrap/mixins/panels.less diff --git a/public/css/lib/bootstrap/mixins/progress-bar.less b/client/less/lib/bootstrap/mixins/progress-bar.less similarity index 100% rename from public/css/lib/bootstrap/mixins/progress-bar.less rename to client/less/lib/bootstrap/mixins/progress-bar.less diff --git a/public/css/lib/bootstrap/mixins/reset-filter.less b/client/less/lib/bootstrap/mixins/reset-filter.less similarity index 100% rename from public/css/lib/bootstrap/mixins/reset-filter.less rename to client/less/lib/bootstrap/mixins/reset-filter.less diff --git a/public/css/lib/bootstrap/mixins/resize.less b/client/less/lib/bootstrap/mixins/resize.less similarity index 100% rename from public/css/lib/bootstrap/mixins/resize.less rename to client/less/lib/bootstrap/mixins/resize.less diff --git a/public/css/lib/bootstrap/mixins/responsive-visibility.less b/client/less/lib/bootstrap/mixins/responsive-visibility.less similarity index 100% rename from public/css/lib/bootstrap/mixins/responsive-visibility.less rename to client/less/lib/bootstrap/mixins/responsive-visibility.less diff --git a/public/css/lib/bootstrap/mixins/size.less b/client/less/lib/bootstrap/mixins/size.less similarity index 100% rename from public/css/lib/bootstrap/mixins/size.less rename to client/less/lib/bootstrap/mixins/size.less diff --git a/public/css/lib/bootstrap/mixins/tab-focus.less b/client/less/lib/bootstrap/mixins/tab-focus.less similarity index 100% rename from public/css/lib/bootstrap/mixins/tab-focus.less rename to client/less/lib/bootstrap/mixins/tab-focus.less diff --git a/public/css/lib/bootstrap/mixins/table-row.less b/client/less/lib/bootstrap/mixins/table-row.less similarity index 100% rename from public/css/lib/bootstrap/mixins/table-row.less rename to client/less/lib/bootstrap/mixins/table-row.less diff --git a/public/css/lib/bootstrap/mixins/text-emphasis.less b/client/less/lib/bootstrap/mixins/text-emphasis.less similarity index 100% rename from public/css/lib/bootstrap/mixins/text-emphasis.less rename to client/less/lib/bootstrap/mixins/text-emphasis.less diff --git a/public/css/lib/bootstrap/mixins/text-overflow.less b/client/less/lib/bootstrap/mixins/text-overflow.less similarity index 100% rename from public/css/lib/bootstrap/mixins/text-overflow.less rename to client/less/lib/bootstrap/mixins/text-overflow.less diff --git a/public/css/lib/bootstrap/mixins/vendor-prefixes.less b/client/less/lib/bootstrap/mixins/vendor-prefixes.less similarity index 100% rename from public/css/lib/bootstrap/mixins/vendor-prefixes.less rename to client/less/lib/bootstrap/mixins/vendor-prefixes.less diff --git a/public/css/lib/bootstrap/modals.less b/client/less/lib/bootstrap/modals.less similarity index 100% rename from public/css/lib/bootstrap/modals.less rename to client/less/lib/bootstrap/modals.less diff --git a/public/css/lib/bootstrap/navbar.less b/client/less/lib/bootstrap/navbar.less similarity index 100% rename from public/css/lib/bootstrap/navbar.less rename to client/less/lib/bootstrap/navbar.less diff --git a/public/css/lib/bootstrap/navs.less b/client/less/lib/bootstrap/navs.less similarity index 100% rename from public/css/lib/bootstrap/navs.less rename to client/less/lib/bootstrap/navs.less diff --git a/public/css/lib/bootstrap/normalize.less b/client/less/lib/bootstrap/normalize.less similarity index 100% rename from public/css/lib/bootstrap/normalize.less rename to client/less/lib/bootstrap/normalize.less diff --git a/public/css/lib/bootstrap/pager.less b/client/less/lib/bootstrap/pager.less similarity index 100% rename from public/css/lib/bootstrap/pager.less rename to client/less/lib/bootstrap/pager.less diff --git a/public/css/lib/bootstrap/pagination.less b/client/less/lib/bootstrap/pagination.less similarity index 100% rename from public/css/lib/bootstrap/pagination.less rename to client/less/lib/bootstrap/pagination.less diff --git a/public/css/lib/bootstrap/panels.less b/client/less/lib/bootstrap/panels.less similarity index 100% rename from public/css/lib/bootstrap/panels.less rename to client/less/lib/bootstrap/panels.less diff --git a/public/css/lib/bootstrap/popovers.less b/client/less/lib/bootstrap/popovers.less similarity index 100% rename from public/css/lib/bootstrap/popovers.less rename to client/less/lib/bootstrap/popovers.less diff --git a/public/css/lib/bootstrap/print.less b/client/less/lib/bootstrap/print.less similarity index 100% rename from public/css/lib/bootstrap/print.less rename to client/less/lib/bootstrap/print.less diff --git a/public/css/lib/bootstrap/progress-bars.less b/client/less/lib/bootstrap/progress-bars.less similarity index 100% rename from public/css/lib/bootstrap/progress-bars.less rename to client/less/lib/bootstrap/progress-bars.less diff --git a/public/css/lib/bootstrap/responsive-embed.less b/client/less/lib/bootstrap/responsive-embed.less similarity index 100% rename from public/css/lib/bootstrap/responsive-embed.less rename to client/less/lib/bootstrap/responsive-embed.less diff --git a/public/css/lib/bootstrap/responsive-utilities.less b/client/less/lib/bootstrap/responsive-utilities.less similarity index 100% rename from public/css/lib/bootstrap/responsive-utilities.less rename to client/less/lib/bootstrap/responsive-utilities.less diff --git a/public/css/lib/bootstrap/scaffolding.less b/client/less/lib/bootstrap/scaffolding.less similarity index 100% rename from public/css/lib/bootstrap/scaffolding.less rename to client/less/lib/bootstrap/scaffolding.less diff --git a/public/css/lib/bootstrap/tables.less b/client/less/lib/bootstrap/tables.less similarity index 100% rename from public/css/lib/bootstrap/tables.less rename to client/less/lib/bootstrap/tables.less diff --git a/public/css/lib/bootstrap/theme.less b/client/less/lib/bootstrap/theme.less similarity index 100% rename from public/css/lib/bootstrap/theme.less rename to client/less/lib/bootstrap/theme.less diff --git a/public/css/lib/bootstrap/thumbnails.less b/client/less/lib/bootstrap/thumbnails.less similarity index 100% rename from public/css/lib/bootstrap/thumbnails.less rename to client/less/lib/bootstrap/thumbnails.less diff --git a/public/css/lib/bootstrap/tooltip.less b/client/less/lib/bootstrap/tooltip.less similarity index 100% rename from public/css/lib/bootstrap/tooltip.less rename to client/less/lib/bootstrap/tooltip.less diff --git a/public/css/lib/bootstrap/type.less b/client/less/lib/bootstrap/type.less similarity index 100% rename from public/css/lib/bootstrap/type.less rename to client/less/lib/bootstrap/type.less diff --git a/public/css/lib/bootstrap/utilities.less b/client/less/lib/bootstrap/utilities.less similarity index 100% rename from public/css/lib/bootstrap/utilities.less rename to client/less/lib/bootstrap/utilities.less diff --git a/public/css/lib/bootstrap/variables.less b/client/less/lib/bootstrap/variables.less similarity index 100% rename from public/css/lib/bootstrap/variables.less rename to client/less/lib/bootstrap/variables.less diff --git a/public/css/lib/bootstrap/wells.less b/client/less/lib/bootstrap/wells.less similarity index 100% rename from public/css/lib/bootstrap/wells.less rename to client/less/lib/bootstrap/wells.less diff --git a/public/css/lib/font-awesome-4.3.0/css/font-awesome.css b/client/less/lib/font-awesome-4.3.0/css/font-awesome.css similarity index 100% rename from public/css/lib/font-awesome-4.3.0/css/font-awesome.css rename to client/less/lib/font-awesome-4.3.0/css/font-awesome.css diff --git a/public/css/lib/font-awesome-4.3.0/css/font-awesome.min.css b/client/less/lib/font-awesome-4.3.0/css/font-awesome.min.css similarity index 100% rename from public/css/lib/font-awesome-4.3.0/css/font-awesome.min.css rename to client/less/lib/font-awesome-4.3.0/css/font-awesome.min.css diff --git a/public/css/lib/font-awesome-4.3.0/fonts/FontAwesome.otf b/client/less/lib/font-awesome-4.3.0/fonts/FontAwesome.otf similarity index 100% rename from public/css/lib/font-awesome-4.3.0/fonts/FontAwesome.otf rename to client/less/lib/font-awesome-4.3.0/fonts/FontAwesome.otf diff --git a/public/css/lib/font-awesome-4.3.0/fonts/fontawesome-webfont.eot b/client/less/lib/font-awesome-4.3.0/fonts/fontawesome-webfont.eot similarity index 100% rename from public/css/lib/font-awesome-4.3.0/fonts/fontawesome-webfont.eot rename to client/less/lib/font-awesome-4.3.0/fonts/fontawesome-webfont.eot diff --git a/public/css/lib/font-awesome-4.3.0/fonts/fontawesome-webfont.svg b/client/less/lib/font-awesome-4.3.0/fonts/fontawesome-webfont.svg similarity index 100% rename from public/css/lib/font-awesome-4.3.0/fonts/fontawesome-webfont.svg rename to client/less/lib/font-awesome-4.3.0/fonts/fontawesome-webfont.svg diff --git a/public/css/lib/font-awesome-4.3.0/fonts/fontawesome-webfont.ttf b/client/less/lib/font-awesome-4.3.0/fonts/fontawesome-webfont.ttf similarity index 100% rename from public/css/lib/font-awesome-4.3.0/fonts/fontawesome-webfont.ttf rename to client/less/lib/font-awesome-4.3.0/fonts/fontawesome-webfont.ttf diff --git a/public/css/lib/font-awesome-4.3.0/fonts/fontawesome-webfont.woff b/client/less/lib/font-awesome-4.3.0/fonts/fontawesome-webfont.woff similarity index 100% rename from public/css/lib/font-awesome-4.3.0/fonts/fontawesome-webfont.woff rename to client/less/lib/font-awesome-4.3.0/fonts/fontawesome-webfont.woff diff --git a/public/css/lib/font-awesome-4.3.0/fonts/fontawesome-webfont.woff2 b/client/less/lib/font-awesome-4.3.0/fonts/fontawesome-webfont.woff2 similarity index 100% rename from public/css/lib/font-awesome-4.3.0/fonts/fontawesome-webfont.woff2 rename to client/less/lib/font-awesome-4.3.0/fonts/fontawesome-webfont.woff2 diff --git a/public/css/lib/font-awesome-4.3.0/less/animated.less b/client/less/lib/font-awesome-4.3.0/less/animated.less similarity index 100% rename from public/css/lib/font-awesome-4.3.0/less/animated.less rename to client/less/lib/font-awesome-4.3.0/less/animated.less diff --git a/public/css/lib/font-awesome-4.3.0/less/bordered-pulled.less b/client/less/lib/font-awesome-4.3.0/less/bordered-pulled.less similarity index 100% rename from public/css/lib/font-awesome-4.3.0/less/bordered-pulled.less rename to client/less/lib/font-awesome-4.3.0/less/bordered-pulled.less diff --git a/public/css/lib/font-awesome-4.3.0/less/core.less b/client/less/lib/font-awesome-4.3.0/less/core.less similarity index 100% rename from public/css/lib/font-awesome-4.3.0/less/core.less rename to client/less/lib/font-awesome-4.3.0/less/core.less diff --git a/public/css/lib/font-awesome-4.3.0/less/fixed-width.less b/client/less/lib/font-awesome-4.3.0/less/fixed-width.less similarity index 100% rename from public/css/lib/font-awesome-4.3.0/less/fixed-width.less rename to client/less/lib/font-awesome-4.3.0/less/fixed-width.less diff --git a/public/css/lib/font-awesome-4.3.0/less/font-awesome.less b/client/less/lib/font-awesome-4.3.0/less/font-awesome.less similarity index 100% rename from public/css/lib/font-awesome-4.3.0/less/font-awesome.less rename to client/less/lib/font-awesome-4.3.0/less/font-awesome.less diff --git a/public/css/lib/font-awesome-4.3.0/less/icons.less b/client/less/lib/font-awesome-4.3.0/less/icons.less similarity index 100% rename from public/css/lib/font-awesome-4.3.0/less/icons.less rename to client/less/lib/font-awesome-4.3.0/less/icons.less diff --git a/public/css/lib/font-awesome-4.3.0/less/larger.less b/client/less/lib/font-awesome-4.3.0/less/larger.less similarity index 100% rename from public/css/lib/font-awesome-4.3.0/less/larger.less rename to client/less/lib/font-awesome-4.3.0/less/larger.less diff --git a/public/css/lib/font-awesome-4.3.0/less/list.less b/client/less/lib/font-awesome-4.3.0/less/list.less similarity index 100% rename from public/css/lib/font-awesome-4.3.0/less/list.less rename to client/less/lib/font-awesome-4.3.0/less/list.less diff --git a/public/css/lib/font-awesome-4.3.0/less/mixins.less b/client/less/lib/font-awesome-4.3.0/less/mixins.less similarity index 100% rename from public/css/lib/font-awesome-4.3.0/less/mixins.less rename to client/less/lib/font-awesome-4.3.0/less/mixins.less diff --git a/public/css/lib/font-awesome-4.3.0/less/path.less b/client/less/lib/font-awesome-4.3.0/less/path.less similarity index 100% rename from public/css/lib/font-awesome-4.3.0/less/path.less rename to client/less/lib/font-awesome-4.3.0/less/path.less diff --git a/public/css/lib/font-awesome-4.3.0/less/rotated-flipped.less b/client/less/lib/font-awesome-4.3.0/less/rotated-flipped.less similarity index 100% rename from public/css/lib/font-awesome-4.3.0/less/rotated-flipped.less rename to client/less/lib/font-awesome-4.3.0/less/rotated-flipped.less diff --git a/public/css/lib/font-awesome-4.3.0/less/stacked.less b/client/less/lib/font-awesome-4.3.0/less/stacked.less similarity index 100% rename from public/css/lib/font-awesome-4.3.0/less/stacked.less rename to client/less/lib/font-awesome-4.3.0/less/stacked.less diff --git a/public/css/lib/font-awesome-4.3.0/less/variables.less b/client/less/lib/font-awesome-4.3.0/less/variables.less similarity index 100% rename from public/css/lib/font-awesome-4.3.0/less/variables.less rename to client/less/lib/font-awesome-4.3.0/less/variables.less diff --git a/public/css/lib/font-awesome-4.3.0/scss/_animated.scss b/client/less/lib/font-awesome-4.3.0/scss/_animated.scss similarity index 100% rename from public/css/lib/font-awesome-4.3.0/scss/_animated.scss rename to client/less/lib/font-awesome-4.3.0/scss/_animated.scss diff --git a/public/css/lib/font-awesome-4.3.0/scss/_bordered-pulled.scss b/client/less/lib/font-awesome-4.3.0/scss/_bordered-pulled.scss similarity index 100% rename from public/css/lib/font-awesome-4.3.0/scss/_bordered-pulled.scss rename to client/less/lib/font-awesome-4.3.0/scss/_bordered-pulled.scss diff --git a/public/css/lib/font-awesome-4.3.0/scss/_core.scss b/client/less/lib/font-awesome-4.3.0/scss/_core.scss similarity index 100% rename from public/css/lib/font-awesome-4.3.0/scss/_core.scss rename to client/less/lib/font-awesome-4.3.0/scss/_core.scss diff --git a/public/css/lib/font-awesome-4.3.0/scss/_fixed-width.scss b/client/less/lib/font-awesome-4.3.0/scss/_fixed-width.scss similarity index 100% rename from public/css/lib/font-awesome-4.3.0/scss/_fixed-width.scss rename to client/less/lib/font-awesome-4.3.0/scss/_fixed-width.scss diff --git a/public/css/lib/font-awesome-4.3.0/scss/_icons.scss b/client/less/lib/font-awesome-4.3.0/scss/_icons.scss similarity index 100% rename from public/css/lib/font-awesome-4.3.0/scss/_icons.scss rename to client/less/lib/font-awesome-4.3.0/scss/_icons.scss diff --git a/public/css/lib/font-awesome-4.3.0/scss/_larger.scss b/client/less/lib/font-awesome-4.3.0/scss/_larger.scss similarity index 100% rename from public/css/lib/font-awesome-4.3.0/scss/_larger.scss rename to client/less/lib/font-awesome-4.3.0/scss/_larger.scss diff --git a/public/css/lib/font-awesome-4.3.0/scss/_list.scss b/client/less/lib/font-awesome-4.3.0/scss/_list.scss similarity index 100% rename from public/css/lib/font-awesome-4.3.0/scss/_list.scss rename to client/less/lib/font-awesome-4.3.0/scss/_list.scss diff --git a/public/css/lib/font-awesome-4.3.0/scss/_mixins.scss b/client/less/lib/font-awesome-4.3.0/scss/_mixins.scss similarity index 100% rename from public/css/lib/font-awesome-4.3.0/scss/_mixins.scss rename to client/less/lib/font-awesome-4.3.0/scss/_mixins.scss diff --git a/public/css/lib/font-awesome-4.3.0/scss/_path.scss b/client/less/lib/font-awesome-4.3.0/scss/_path.scss similarity index 100% rename from public/css/lib/font-awesome-4.3.0/scss/_path.scss rename to client/less/lib/font-awesome-4.3.0/scss/_path.scss diff --git a/public/css/lib/font-awesome-4.3.0/scss/_rotated-flipped.scss b/client/less/lib/font-awesome-4.3.0/scss/_rotated-flipped.scss similarity index 100% rename from public/css/lib/font-awesome-4.3.0/scss/_rotated-flipped.scss rename to client/less/lib/font-awesome-4.3.0/scss/_rotated-flipped.scss diff --git a/public/css/lib/font-awesome-4.3.0/scss/_stacked.scss b/client/less/lib/font-awesome-4.3.0/scss/_stacked.scss similarity index 100% rename from public/css/lib/font-awesome-4.3.0/scss/_stacked.scss rename to client/less/lib/font-awesome-4.3.0/scss/_stacked.scss diff --git a/public/css/lib/font-awesome-4.3.0/scss/_variables.scss b/client/less/lib/font-awesome-4.3.0/scss/_variables.scss similarity index 100% rename from public/css/lib/font-awesome-4.3.0/scss/_variables.scss rename to client/less/lib/font-awesome-4.3.0/scss/_variables.scss diff --git a/public/css/lib/font-awesome-4.3.0/scss/font-awesome.scss b/client/less/lib/font-awesome-4.3.0/scss/font-awesome.scss similarity index 100% rename from public/css/lib/font-awesome-4.3.0/scss/font-awesome.scss rename to client/less/lib/font-awesome-4.3.0/scss/font-awesome.scss diff --git a/public/css/lib/ionicons/_ionicons-animation.less b/client/less/lib/ionicons/_ionicons-animation.less similarity index 100% rename from public/css/lib/ionicons/_ionicons-animation.less rename to client/less/lib/ionicons/_ionicons-animation.less diff --git a/public/css/lib/ionicons/_ionicons-font.less b/client/less/lib/ionicons/_ionicons-font.less similarity index 100% rename from public/css/lib/ionicons/_ionicons-font.less rename to client/less/lib/ionicons/_ionicons-font.less diff --git a/public/css/lib/ionicons/_ionicons-icons.less b/client/less/lib/ionicons/_ionicons-icons.less similarity index 100% rename from public/css/lib/ionicons/_ionicons-icons.less rename to client/less/lib/ionicons/_ionicons-icons.less diff --git a/public/css/lib/ionicons/_ionicons-variables.less b/client/less/lib/ionicons/_ionicons-variables.less similarity index 100% rename from public/css/lib/ionicons/_ionicons-variables.less rename to client/less/lib/ionicons/_ionicons-variables.less diff --git a/public/css/lib/ionicons/ionicons.less b/client/less/lib/ionicons/ionicons.less similarity index 100% rename from public/css/lib/ionicons/ionicons.less rename to client/less/lib/ionicons/ionicons.less diff --git a/public/css/lib/ionicons/ionicons.min.css b/client/less/lib/ionicons/ionicons.min.css similarity index 100% rename from public/css/lib/ionicons/ionicons.min.css rename to client/less/lib/ionicons/ionicons.min.css diff --git a/public/css/main.less b/client/less/main.less similarity index 100% rename from public/css/main.less rename to client/less/main.less diff --git a/public/js/main_0.0.3.js b/client/main.js similarity index 100% rename from public/js/main_0.0.3.js rename to client/main.js diff --git a/public/js/lib/coursewares/plugin_v0.1.5.js b/client/plugin.js similarity index 100% rename from public/js/lib/coursewares/plugin_v0.1.5.js rename to client/plugin.js diff --git a/public/js/lib/coursewares/sandbox.js b/client/sandbox.js similarity index 96% rename from public/js/lib/coursewares/sandbox.js rename to client/sandbox.js index 75452114eb3..10eaa2ef078 100644 --- a/public/js/lib/coursewares/sandbox.js +++ b/client/sandbox.js @@ -67,7 +67,7 @@ var requests; // (re)initializes the plugin var reset = function() { requests = 0; - plugin = new jailed.Plugin(path+'plugin_v0.1.5.js', api); + plugin = new jailed.Plugin(path + 'plugin.js', api); plugin.whenDisconnected( function() { // give some time to handle the last responce setTimeout( function() { diff --git a/gulpfile.js b/gulpfile.js index 9cfded3db8a..09d0161b486 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -7,7 +7,6 @@ var Rx = require('rx'), plumber = require('gulp-plumber'), notify = require('gulp-notify'), debug = require('debug')('freecc:gulp'), - bower = require('bower-main-files'), // react app webpack = require('gulp-webpack'), @@ -18,11 +17,13 @@ var Rx = require('rx'), nodemon = require('gulp-nodemon'), sync = require('browser-sync'), - inject = require('gulp-inject'), - // css less = require('gulp-less'), + // rev + rev = require('gulp-rev'), + revReplace = require('gulp-rev-replace'), + // lint jsonlint = require('gulp-jsonlint'), eslint = require('gulp-eslint'); @@ -43,6 +44,7 @@ var paths = { ], publicJs: './public/js', + css: 'public/css', loopback: { client: './client/loopbackClient', @@ -55,6 +57,21 @@ var paths = { dest: 'public/js' }, + js: [ + 'client/main.js', + 'client/iFrameScripts.js', + 'client/plugin.js' + ], + + dependents: [ + 'client/commonFramework.js', + 'client/sandbox.js' + ], + + less: './client/less/main.less', + + manifest: 'server/', + node: { src: './client', dest: 'common/app' @@ -70,6 +87,13 @@ var paths = { ] }; +var manifestName = 'rev-manifest.json'; +var manifestOptions = { + path: paths.manifest + manifestName, + base: path.join(__dirname, paths.manifest), + merge: true +}; + var webpackOptions = { devtool: 'inline-source-map' }; @@ -87,15 +111,6 @@ function errorHandler() { this.emit('end'); } -gulp.task('inject', function() { - gulp.src('views/home.jade') - .pipe(plumber({ errorHandler: errorHandler })) - .pipe(inject(gulp.src(bower()), { - // ignorePath: '/public' - })) - .pipe(gulp.dest('views')); -}); - gulp.task('pack-client', function() { return gulp.src(webpackConfig.entry) .pipe(plumber({ errorHandler: errorHandler })) @@ -185,18 +200,57 @@ gulp.task('lint-json', function() { gulp.task('test-challenges', ['lint-json']); gulp.task('less', function() { - return gulp.src('./public/css/*.less') + return gulp.src(paths.less) .pipe(plumber({ errorHandler: errorHandler })) + // copile .pipe(less({ paths: [ path.join(__dirname, 'less', 'includes') ] })) - .pipe(gulp.dest('./public/css/')); + .pipe(gulp.dest(paths.css)) + // add revision + .pipe(rev()) + // copy files to public + .pipe(gulp.dest(paths.css)) + // create and merge manifest + .pipe(rev.manifest(manifestOptions)) + .pipe(gulp.dest(paths.manifest)); }); -gulp.task('build', ['less']); +gulp.task('js', function() { + return gulp.src(paths.js) + .pipe(plumber({ errorHandler: errorHandler })) + .pipe(gulp.dest(paths.publicJs)) + // create registry file + .pipe(rev()) + // copy revisioned assets to dest + .pipe(gulp.dest(paths.publicJs)) + // create manifest file + .pipe(rev.manifest(manifestOptions)) + // copy manifest file to dest + .pipe(gulp.dest(paths.manifest)); +}); -gulp.task('watch', ['less', 'serve', 'sync'], function() { - gulp.watch('./public/css/*.less', ['less']); +// commonFramework depend on iFrameScripts +// sandbox depends on plugin +gulp.task('dependents', ['js'], function() { + var manifest = gulp.src( + path.join(__dirname, paths.manifest, manifestName) + ); + + return gulp.src(paths.dependents) + .pipe(plumber({ errorHandler: errorHandler })) + .pipe(revReplace({ manifest: manifest })) + .pipe(rev()) + .pipe(gulp.dest(paths.publicJs)) + .pipe(rev.manifest(manifestOptions)) + .pipe(gulp.dest(paths.manifest)); +}); + +gulp.task('build', ['less', 'js', 'dependents']); + +gulp.task('watch', ['less', 'js', 'dependents', 'serve', 'sync'], function() { + gulp.watch(paths.less, ['less']); + gulp.watch(paths.js, ['js']); gulp.watch(paths.challenges, ['test-challenges']); }); diff --git a/package.json b/package.json index 8aa3c12d408..768cd4be719 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "url": "https://github.com/freecodecamp/freecodecamp.git" }, "scripts": { + "build": "gulp build", "build-production": "webpack", "start": "babel-node server/server.js", "prestart-production": "bower cache clean && bower install && gulp build && npm run build-production", @@ -59,6 +60,8 @@ "github-api": "~0.7.0", "gulp-less": "^3.0.3", "gulp-minify-css": "~0.5.1", + "gulp-rev": "^6.0.1", + "gulp-rev-replace": "^0.4.2", "gulp-webpack": "^1.5.0", "helmet": "~0.9.0", "helmet-csp": "^0.2.3", diff --git a/server/middleware.json b/server/middleware.json index 2c791f8b93f..66a1d0bd52b 100644 --- a/server/middleware.json +++ b/server/middleware.json @@ -45,7 +45,8 @@ "./middlewares/constant-headers": {}, "./middlewares/csp": {}, "./middlewares/express-rx": {}, - "./middlewares/global-locals": {} + "./middlewares/global-locals": {}, + "./middlewares/revision-helpers": {} }, "routes": { }, diff --git a/server/middlewares/revision-helpers.js b/server/middlewares/revision-helpers.js new file mode 100644 index 00000000000..a5e957fc5c4 --- /dev/null +++ b/server/middlewares/revision-helpers.js @@ -0,0 +1,13 @@ +import manifest from '../rev-manifest.json'; + +export default function({ globalPrepend = '' } = {}) { + + function rev(scopedPrepend, asset) { + return `${globalPrepend}${scopedPrepend}/${ manifest[asset] || asset }`; + } + + return function(req, res, next) { + res.locals.rev = rev; + next(); + }; +} diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade index ce78fb8ea54..8e7bf6b2eb6 100644 --- a/server/views/coursewares/showBonfire.jade +++ b/server/views/coursewares/showBonfire.jade @@ -14,7 +14,7 @@ block content link(rel="stylesheet", href="//fonts.googleapis.com/css?family=Ubuntu+Mono") script(type='text/javascript', src='/js/lib/codemirror/mode/javascript/javascript.js') script(type='text/javascript', src='/js/lib/jailed/jailed.js') - script(type='text/javascript', src='/js/lib/coursewares/sandbox.js') + script(type='text/javascript', src=rev('/js', 'sandbox.js')) .row(ng-controller="pairedWithController") .col-xs-12.col-sm-12.col-md-4.col-lg-3 @@ -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.7.js') + script(src=rev('/js', 'commonFramework.js')) script. editor.setOption("mode", "javascript"); diff --git a/server/views/coursewares/showHTML.jade b/server/views/coursewares/showHTML.jade index 94399ce677a..b655bf51877 100644 --- a/server/views/coursewares/showHTML.jade +++ b/server/views/coursewares/showHTML.jade @@ -14,7 +14,7 @@ block content link(rel="stylesheet", href="http://fonts.googleapis.com/css?family=Ubuntu+Mono") script(src='/js/lib/codemirror/mode/javascript/javascript.js') script(src='/js/lib/jailed/jailed.js') - script(src='/js/lib/coursewares/sandbox.js') + script(src=rev('/js', 'sandbox.js')) script(src='/js/lib/codemirror/mode/xml/xml.js') script(src='/js/lib/codemirror/mode/css/css.js') script(src='/js/lib/codemirror/mode/htmlmixed/htmlmixed.js') @@ -72,7 +72,7 @@ block content form.code .codeMirrorView textarea#codeEditor(autofocus=true, style='display: none;') - script(src = '/js/lib/coursewares/commonFrameWork_0.0.7.js') + script(src=rev('/js', 'commonFramework.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 34bf4fa3b4f..cb5bdb2d442 100644 --- a/server/views/coursewares/showJS.jade +++ b/server/views/coursewares/showJS.jade @@ -13,7 +13,7 @@ block content link(rel="stylesheet", href="//fonts.googleapis.com/css?family=Ubuntu+Mono") script(type='text/javascript', src='/js/lib/codemirror/mode/javascript/javascript.js') script(type='text/javascript', src='/js/lib/jailed/jailed.js') - script(type='text/javascript', src='/js/lib/coursewares/sandbox.js') + script(type='text/javascript', src=rev('/js', 'sandbox.js')) .row(ng-controller="pairedWithController") .col-xs-12.col-sm-12.col-md-4.col-lg-3 .scroll-locker(id = "scroll-locker") @@ -72,7 +72,7 @@ block content form.code .codeMirrorView textarea#codeEditor(autofocus=true, style='display: none;') - script(src = '/js/lib/coursewares/commonFrameWork_0.0.7.js') + script(src=rev('/js', 'commonFramework')) script. editor.setOption("mode", "javascript"); #complete-courseware-dialog.modal(tabindex='-1') diff --git a/server/views/partials/small-head.jade b/server/views/partials/small-head.jade index 5913fc223c6..585d55498db 100644 --- a/server/views/partials/small-head.jade +++ b/server/views/partials/small-head.jade @@ -2,7 +2,7 @@ script(src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js") script(src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.4/js/bootstrap.min.js") link(rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Lato:400|Inconsolata") link(rel='stylesheet', href='/bower_components/font-awesome/css/font-awesome.min.css') -link(rel='stylesheet', href='/css/main.css') +link(rel='stylesheet', href=rev('/css', 'main.css')) link(rel='stylesheet', href='/css/lib/Vimeo.css') // End **REQUIRED** includes diff --git a/server/views/partials/universal-head.jade b/server/views/partials/universal-head.jade index bc27767eb5b..b97250af49d 100644 --- a/server/views/partials/universal-head.jade +++ b/server/views/partials/universal-head.jade @@ -4,7 +4,7 @@ link(rel="stylesheet" type="text/css" href="/bower_components/cal-heatmap/cal-he link(rel='stylesheet', href='/bower_components/font-awesome/css/font-awesome.min.css') -link(rel='stylesheet', href='/css/main.css') +link(rel='stylesheet', href=rev('/css', 'main.css')) // End **REQUIRED** includes include meta @@ -40,7 +40,7 @@ script(src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.2/moment.min.js") script. window.moment || document.write('")); if (typeof $preview.html() !== 'undefined') { $preview.load(function(){ From 384dec42ac88ac2330cdc05e7b8a91dd191ada4b Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Thu, 27 Aug 2015 00:15:13 -0700 Subject: [PATCH 105/134] mid finished linting commonFramework --- client/commonFramework.js | 168 +++++++++++++++++++++----------------- 1 file changed, 92 insertions(+), 76 deletions(-) diff --git a/client/commonFramework.js b/client/commonFramework.js index ab0fe149337..88793bf3a59 100644 --- a/client/commonFramework.js +++ b/client/commonFramework.js @@ -1,4 +1,4 @@ -/* globals CodeMirror, challenge_Name */ +/* globals CodeMirror, challenge_Name, challengeType */ // codeStorage var codeStorageFactory = (function($, localStorage) { @@ -68,6 +68,12 @@ var codeStorageFactory = (function($, localStorage) { return codeStorageFactory; }($, localStorage)); +function replaceSafeTags(value) { + return value + .replace(/fccss/gi, ''); +} + var isInitRun = false; var initPreview = true; var editor; @@ -106,30 +112,30 @@ var allSeeds = ''; }); })(); -editor.setOption("extraKeys", { - Tab: function(cm) { - if (cm.somethingSelected()){ - cm.indentSelection("add"); - } else { - var spaces = Array(cm.getOption("indentUnit") + 1).join(" "); - cm.replaceSelection(spaces); - } - }, - "Shift-Tab": function(cm) { - if (cm.somethingSelected()){ - cm.indentSelection("subtract"); - } else { - var spaces = Array(cm.getOption("indentUnit") + 1).join(" "); - cm.replaceSelection(spaces); - } - }, - "Ctrl-Enter": function() { - bonfireExecute(true); - return false; +editor.setOption('extraKeys', { + Tab: function(cm) { + if (cm.somethingSelected()) { + cm.indentSelection('add'); + } else { + var spaces = Array(cm.getOption('indentUnit') + 1).join(' '); + cm.replaceSelection(spaces); } + }, + 'Shift-Tab': function(cm) { + if (cm.somethingSelected()) { + cm.indentSelection('subtract'); + } else { + var spaces = Array(cm.getOption('indentUnit') + 1).join(' '); + cm.replaceSelection(spaces); + } + }, + 'Ctrl-Enter': function() { + bonfireExecute(true); + return false; + } }); -editor.setSize("100%", "auto"); +editor.setSize('100%', 'auto'); var libraryIncludes = "" + "" + @@ -141,39 +147,44 @@ var libraryIncludes = ""; - var delay; + // Initialize CodeMirror editor with a nice html5 canvas demo. -editor.on("keyup", function () { - clearTimeout(delay); - delay = setTimeout(updatePreview, 300); +editor.on('keyup', function() { + clearTimeout(delay); + delay = setTimeout(updatePreview, 300); }); -function workerError(error){ - var display = $('.runTimeError'); - var housing = $('#testSuite'); - if(display.html() != error){ - display.remove(); - housing.prepend("
" + error.replace(/j\$/gi, "$").replace(/jdocument/gi, "document").replace(/jjQuery/gi, "jQuery") + "
"); - display.hide().fadeIn(function(){ - setTimeout(function(){ - display.fadeOut(function(){ - display.remove(); - }); - }, 1000) +function workerError(error) { + var display = $('.runTimeError'); + var housing = $('#testSuite'); + if (display.html() !== error) { + display.remove(); + housing.prepend( + '
' + + error.replace(/j\$/gi, '$').replace(/jdocument/gi, 'document').replace(/jjQuery/gi, 'jQuery') + + '
' + ); + display.hide().fadeIn(function() { + setTimeout(function() { + display.fadeOut(function() { + display.remove(); }); - } + }, 1000); + }); + } } -function scopejQuery(s){ - return(s.replace(/\$/gi, "j$").replace(/document/gi, "jdocument").replace(/jQuery/gi, "jjQuery")); +function scopejQuery(str) { + return str + .replace(/\$/gi, 'j$') + .replace(/document/gi, 'jdocument') + .replace(/jQuery/gi, 'jjQuery'); } -function safeHTMLRun(test){ +function safeHTMLRun(test) { if(challengeType === "0"){ var previewFrame = document.getElementById('preview'); var preview = previewFrame.contentDocument || previewFrame.contentWindow.document; @@ -328,32 +339,36 @@ function showCompletion() { } var resetEditor = function resetEditor() { - editor.setValue(allSeeds.replace((/fccss/gi), '')); - $('#testSuite').empty(); - bonfireExecute(true); - codeStorage.updateStorage(); + editor.setValue(replaceSafeTags(allSeeds)); + $('#testSuite').empty(); + bonfireExecute(true); + codeStorage.updateStorage(); }; var attempts = 0; if (attempts) { - attempts = 0; + attempts = 0; } -if(challengeType !== "0") { - var codeOutput = CodeMirror.fromTextArea(document.getElementById("codeOutput"), { - lineNumbers: false, - mode: "text", - theme: 'monokai', - readOnly: 'nocursor', - lineWrapping: true - }); +if (challengeType !== '0') { + var codeOutput = CodeMirror.fromTextArea( + document.getElementById('codeOutput'), + { + lineNumbers: false, + mode: 'text', + theme: 'monokai', + readOnly: 'nocursor', + lineWrapping: true + } + ); - codeOutput.setValue('/**\n' + - ' * Your output will go here.\n' + ' * Console.log() -type statements\n' + - ' * will appear in your browser\'s\n' + ' * DevTools JavaScript console.\n' + - ' */'); - codeOutput.setSize("100%", "100%"); + codeOutput.setValue('/**\n' + + ' * Your output will go here.\n' + ' * Console.log() -type statements\n' + + ' * will appear in your browser\'s\n' + ' * DevTools JavaScript console.\n' + + ' */'); + codeOutput.setSize("100%", "100%"); } + var info = editor.getScrollInfo(); var after = editor.charCoords({ line: editor.getCursor().line + 1, @@ -584,21 +599,22 @@ $('#submitButton').on('click', function() { }); $(document).ready(function() { - var $preview = $('#preview'); - isInitRun = true; + var $preview = $('#preview'); + isInitRun = true; - editorValue = codeStorage.isAlive() ? - codeStorage.getStoredValue() : - allSeeds; + editorValue = codeStorage.isAlive() ? + codeStorage.getStoredValue() : + allSeeds; - myCodeMirror.setValue(editorValue.replace(/fccss/gi, '")); - if (typeof $preview.html() !== 'undefined') { - $preview.load(function(){ - if (initPreview) { - bonfireExecute(true); - } - }); - } else{ + myCodeMirror.setValue(replaceSafeTags(editorValue)); + + if (typeof $preview.html() !== 'undefined') { + $preview.load(function() { + if (initPreview) { bonfireExecute(true); - } + } + }); + } else { + bonfireExecute(true); + } }); From ebd92743f1294577b09d7ee577e0e13850f7ef96 Mon Sep 17 00:00:00 2001 From: regonn Date: Thu, 27 Aug 2015 23:29:21 +0900 Subject: [PATCH 106/134] fix lack of semicolon --- seed/challenges/html5-and-css.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/html5-and-css.json b/seed/challenges/html5-and-css.json index 5e3f435fd86..9142e952cc2 100644 --- a/seed/challenges/html5-and-css.json +++ b/seed/challenges/html5-and-css.json @@ -2478,7 +2478,7 @@ " width: 100px;", " }", " .gray-background {", - " background-color: gray", + " background-color: gray;", " }", "", "", From a048049ca3dfe66362ab4bd2f7c4f39e0b82127e Mon Sep 17 00:00:00 2001 From: Ben McMahon Date: Thu, 27 Aug 2015 15:31:56 +0100 Subject: [PATCH 107/134] allow literally any whitespace fix #2769 --- seed/challenges/jquery.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/seed/challenges/jquery.json b/seed/challenges/jquery.json index b7250f5da3b..9144407289a 100644 --- a/seed/challenges/jquery.json +++ b/seed/challenges/jquery.json @@ -16,8 +16,8 @@ "tests": [ "assert(editor.match(/'); } +var BDDregex = new RegExp( + '(expect(\s+)?\(.*\;)|' + + '(assert(\s+)?\(.*\;)|' + + '(assert\.\w.*\;)|' + + '(.*\.should\..*\;)' +); + var isInitRun = false; var initPreview = true; var editor; @@ -144,19 +151,13 @@ var libraryIncludes = ""; + '' + + ''; var editorValueForIFrame; var iFrameScript = ""; var delay; -// Initialize CodeMirror editor with a nice html5 canvas demo. -editor.on('keyup', function() { - clearTimeout(delay); - delay = setTimeout(updatePreview, 300); -}); - function workerError(error) { var display = $('.runTimeError'); var housing = $('#testSuite'); @@ -185,157 +186,184 @@ function scopejQuery(str) { } function safeHTMLRun(test) { - if(challengeType === "0"){ - var previewFrame = document.getElementById('preview'); - var preview = previewFrame.contentDocument || previewFrame.contentWindow.document; - if(editor.getValue().match(/\/gi) !== null) { - var s = editor.getValue().split(/\<\s?script\s?\>/gi)[1].split(/\<\s?\/\s?script\s?\>/gi)[0]; - s = "var document = \"\"; var $ = function(){return(new function(){this.add=function(){return(this);};this.addBack=function(){return(this);};this.addClass=function(){return(this);};this.after=function(){return(this);};this.ajaxComplete=function(){return(this);};this.ajaxError=function(){return(this);};this.ajaxSend=function(){return(this);};this.ajaxStart=function(){return(this);};this.ajaxStop=function(){return(this);};this.ajaxSuccess=function(){return(this);};this.andSelf=function(){return(this);};this.animate=function(){return(this);};this.append=function(){return(this);};this.appendTo=function(){return(this);};this.attr=function(){return(this);};this.before=function(){return(this);};this.bind=function(){return(this);};this.blur=function(){return(this);};this.callbacksadd=function(){return(this);};this.callbacksdisable=function(){return(this);};this.callbacksdisabled=function(){return(this);};this.callbacksempty=function(){return(this);};this.callbacksfire=function(){return(this);};this.callbacksfired=function(){return(this);};this.callbacksfireWith=function(){return(this);};this.callbackshas=function(){return(this);};this.callbackslock=function(){return(this);};this.callbackslocked=function(){return(this);};this.callbacksremove=function(){return(this);};this.change=function(){return(this);};this.children=function(){return(this);};this.clearQueue=function(){return(this);};this.click=function(){return(this);};this.clone=function(){return(this);};this.closest=function(){return(this);};this.contents=function(){return(this);};this.context=function(){return(this);};this.css=function(){return(this);};this.data=function(){return(this);};this.dblclick=function(){return(this);};this.delay=function(){return(this);};this.delegate=function(){return(this);};this.dequeue=function(){return(this);};this.detach=function(){return(this);};this.die=function(){return(this);};this.each=function(){return(this);};this.empty=function(){return(this);};this.end=function(){return(this);};this.eq=function(){return(this);};this.error=function(){return(this);};this.fadeIn=function(){return(this);};this.fadeOut=function(){return(this);};this.fadeTo=function(){return(this);};this.fadeToggle=function(){return(this);};this.filter=function(){return(this);};this.find=function(){return(this);};this.finish=function(){return(this);};this.first=function(){return(this);};this.focus=function(){return(this);};this.focusin=function(){return(this);};this.focusout=function(){return(this);};this.get=function(){return(this);};this.has=function(){return(this);};this.hasClass=function(){return(this);};this.height=function(){return(this);};this.hide=function(){return(this);};this.hover=function(){return(this);};this.html=function(){return(this);};this.index=function(){return(this);};this.innerHeight=function(){return(this);};this.innerWidth=function(){return(this);};this.insertAfter=function(){return(this);};this.insertBefore=function(){return(this);};this.is=function(){return(this);};this.jQuery=function(){return(this);};this.jquery=function(){return(this);};this.keydown=function(){return(this);};this.keypress=function(){return(this);};this.keyup=function(){return(this);};this.last=function(){return(this);};this.length=function(){return(this);};this.live=function(){return(this);};this.load=function(){return(this);};this.load=function(){return(this);};this.map=function(){return(this);};this.mousedown=function(){return(this);};this.mouseenter=function(){return(this);};this.mouseleave=function(){return(this);};this.mousemove=function(){return(this);};this.mouseout=function(){return(this);};this.mouseover=function(){return(this);};this.mouseup=function(){return(this);};this.next=function(){return(this);};this.nextAll=function(){return(this);};this.nextUntil=function(){return(this);};this.not=function(){return(this);};this.off=function(){return(this);};this.offset=function(){return(this);};this.offsetParent=function(){return(this);};this.on=function(){return(this);};this.one=function(){return(this);};this.outerHeight=function(){return(this);};this.outerWidth=function(){return(this);};this.parent=function(){return(this);};this.parents=function(){return(this);};this.parentsUntil=function(){return(this);};this.position=function(){return(this);};this.prepend=function(){return(this);};this.prependTo=function(){return(this);};this.prev=function(){return(this);};this.prevAll=function(){return(this);};this.prevUntil=function(){return(this);};this.promise=function(){return(this);};this.prop=function(){return(this);};this.pushStack=function(){return(this);};this.queue=function(){return(this);};this.ready=function(){return(this);};this.remove=function(){return(this);};this.removeAttr=function(){return(this);};this.removeClass=function(){return(this);};this.removeData=function(){return(this);};this.removeProp=function(){return(this);};this.replaceAll=function(){return(this);};this.replaceWith=function(){return(this);};this.resize=function(){return(this);};this.scroll=function(){return(this);};this.scrollLeft=function(){return(this);};this.scrollTop=function(){return(this);};this.select=function(){return(this);};this.selector=function(){return(this);};this.serialize=function(){return(this);};this.serializeArray=function(){return(this);};this.show=function(){return(this);};this.siblings=function(){return(this);};this.size=function(){return(this);};this.slice=function(){return(this);};this.slideDown=function(){return(this);};this.slideToggle=function(){return(this);};this.slideUp=function(){return(this);};this.stop=function(){return(this);};this.submit=function(){return(this);};this.text=function(){return(this);};this.toArray=function(){return(this);};this.toggle=function(){return(this);};this.toggle=function(){return(this);};this.toggleClass=function(){return(this);};this.trigger=function(){return(this);};this.triggerHandler=function(){return(this);};this.unbind=function(){return(this);};this.undelegate=function(){return(this);};this.unload=function(){return(this);};this.unwrap=function(){return(this);};this.val=function(){return(this);};this.width=function(){return(this);};this.wrap=function(){return(this);};this.wrapAll=function(){return(this);};this.wrapInner=function(){return(this);}});};$.ajax=function(){return($);};$.ajaxPrefilter=function(){return($);};$.ajaxSetup=function(){return($);};$.ajaxTransport=function(){return($);};$.boxModel=function(){return($);};$.browser=function(){return($);};$.Callbacks=function(){return($);};$.contains=function(){return($);};$.cssHooks=function(){return($);};$.cssNumber=function(){return($);};$.data=function(){return($);};$.Deferred=function(){return($);};$.dequeue=function(){return($);};$.each=function(){return($);};$.error=function(){return($);};$.extend=function(){return($);};$.fnextend=function(){return($);};$.fxinterval=function(){return($);};$.fxoff=function(){return($);};$.get=function(){return($);};$.getJSON=function(){return($);};$.getScript=function(){return($);};$.globalEval=function(){return($);};$.grep=function(){return($);};$.hasData=function(){return($);};$.holdReady=function(){return($);};$.inArray=function(){return($);};$.isArray=function(){return($);};$.isEmptyObject=function(){return($);};$.isFunction=function(){return($);};$.isNumeric=function(){return($);};$.isPlainObject=function(){return($);};$.isWindow=function(){return($);};$.isXMLDoc=function(){return($);};$.makeArray=function(){return($);};$.map=function(){return($);};$.merge=function(){return($);};$.noConflict=function(){return($);};$.noop=function(){return($);};$.now=function(){return($);};$.param=function(){return($);};$.parseHTML=function(){return($);};$.parseJSON=function(){return($);};$.parseXML=function(){return($);};$.post=function(){return($);};$.proxy=function(){return($);};$.queue=function(){return($);};$.removeData=function(){return($);};$.sub=function(){return($);};$.support=function(){return($);};$.trim=function(){return($);};$.type=function(){return($);};$.unique=function(){return($);};$.when=function(){return($);};$.always=function(){return($);};$.done=function(){return($);};$.fail=function(){return($);};$.isRejected=function(){return($);};$.isResolved=function(){return($);};$.notify=function(){return($);};$.notifyWith=function(){return($);};$.pipe=function(){return($);};$.progress=function(){return($);};$.promise=function(){return($);};$.reject=function(){return($);};$.rejectWith=function(){return($);};$.resolve=function(){return($);};$.resolveWith=function(){return($);};$.state=function(){return($);};$.then=function(){return($);};$.currentTarget=function(){return($);};$.data=function(){return($);};$.delegateTarget=function(){return($);};$.isDefaultPrevented=function(){return($);};$.isImmediatePropagationStopped=function(){return($);};$.isPropagationStopped=function(){return($);};$.metaKey=function(){return($);};$.namespace=function(){return($);};$.pageX=function(){return($);};$.pageY=function(){return($);};$.preventDefault=function(){return($);};$.relatedTarget=function(){return($);};$.result=function(){return($);};$.stopImmediatePropagation=function(){return($);};$.stopPropagation=function(){return($);};$.target=function(){return($);};$.timeStamp=function(){return($);};$.type=function(){return($);};$.which=function(){return($);};"+s; - submit( - scopejQuery(s), function (cls, message) { - if (cls) { - console.log(message.error); - workerError(message.error); - } else { - if(test){ - preview.open(); - preview.write(libraryIncludes + editor.getValue() + iFrameScript); - codeStorage.updateStorage(); - preview.close(); - } - else{ - preview.open(); - preview.write(libraryIncludes + editor.getValue()); - codeStorage.updateStorage(); - preview.close(); - } - } - } - ); + if (challengeType === '0') { + var previewFrame = document.getElementById('preview'); + var preview = previewFrame.contentDocument || previewFrame.contentWindow.document; + if (editor.getValue().match(/\/gi) !== null) { + var s = editor + .getValue() + .split(/\<\s?script\s?\>/gi)[1] + .split(/\<\s?\/\s?script\s?\>/gi)[0]; + // add feuxQuery + s = "var document = \"\"; var $ = function() {return(new function() {this.add=function() {return(this);};this.addBack=function() {return(this);};this.addClass=function() {return(this);};this.after=function() {return(this);};this.ajaxComplete=function() {return(this);};this.ajaxError=function() {return(this);};this.ajaxSend=function() {return(this);};this.ajaxStart=function() {return(this);};this.ajaxStop=function() {return(this);};this.ajaxSuccess=function() {return(this);};this.andSelf=function() {return(this);};this.animate=function() {return(this);};this.append=function() {return(this);};this.appendTo=function() {return(this);};this.attr=function() {return(this);};this.before=function() {return(this);};this.bind=function() {return(this);};this.blur=function() {return(this);};this.callbacksadd=function() {return(this);};this.callbacksdisable=function() {return(this);};this.callbacksdisabled=function() {return(this);};this.callbacksempty=function() {return(this);};this.callbacksfire=function() {return(this);};this.callbacksfired=function() {return(this);};this.callbacksfireWith=function() {return(this);};this.callbackshas=function() {return(this);};this.callbackslock=function() {return(this);};this.callbackslocked=function() {return(this);};this.callbacksremove=function() {return(this);};this.change=function() {return(this);};this.children=function() {return(this);};this.clearQueue=function() {return(this);};this.click=function() {return(this);};this.clone=function() {return(this);};this.closest=function() {return(this);};this.contents=function() {return(this);};this.context=function() {return(this);};this.css=function() {return(this);};this.data=function() {return(this);};this.dblclick=function() {return(this);};this.delay=function() {return(this);};this.delegate=function() {return(this);};this.dequeue=function() {return(this);};this.detach=function() {return(this);};this.die=function() {return(this);};this.each=function() {return(this);};this.empty=function() {return(this);};this.end=function() {return(this);};this.eq=function() {return(this);};this.error=function() {return(this);};this.fadeIn=function() {return(this);};this.fadeOut=function() {return(this);};this.fadeTo=function() {return(this);};this.fadeToggle=function() {return(this);};this.filter=function() {return(this);};this.find=function() {return(this);};this.finish=function() {return(this);};this.first=function() {return(this);};this.focus=function() {return(this);};this.focusin=function() {return(this);};this.focusout=function() {return(this);};this.get=function() {return(this);};this.has=function() {return(this);};this.hasClass=function() {return(this);};this.height=function() {return(this);};this.hide=function() {return(this);};this.hover=function() {return(this);};this.html=function() {return(this);};this.index=function() {return(this);};this.innerHeight=function() {return(this);};this.innerWidth=function() {return(this);};this.insertAfter=function() {return(this);};this.insertBefore=function() {return(this);};this.is=function() {return(this);};this.jQuery=function() {return(this);};this.jquery=function() {return(this);};this.keydown=function() {return(this);};this.keypress=function() {return(this);};this.keyup=function() {return(this);};this.last=function() {return(this);};this.length=function() {return(this);};this.live=function() {return(this);};this.load=function() {return(this);};this.load=function() {return(this);};this.map=function() {return(this);};this.mousedown=function() {return(this);};this.mouseenter=function() {return(this);};this.mouseleave=function() {return(this);};this.mousemove=function() {return(this);};this.mouseout=function() {return(this);};this.mouseover=function() {return(this);};this.mouseup=function() {return(this);};this.next=function() {return(this);};this.nextAll=function() {return(this);};this.nextUntil=function() {return(this);};this.not=function() {return(this);};this.off=function() {return(this);};this.offset=function() {return(this);};this.offsetParent=function() {return(this);};this.on=function() {return(this);};this.one=function() {return(this);};this.outerHeight=function() {return(this);};this.outerWidth=function() {return(this);};this.parent=function() {return(this);};this.parents=function() {return(this);};this.parentsUntil=function() {return(this);};this.position=function() {return(this);};this.prepend=function() {return(this);};this.prependTo=function() {return(this);};this.prev=function() {return(this);};this.prevAll=function() {return(this);};this.prevUntil=function() {return(this);};this.promise=function() {return(this);};this.prop=function() {return(this);};this.pushStack=function() {return(this);};this.queue=function() {return(this);};this.ready=function() {return(this);};this.remove=function() {return(this);};this.removeAttr=function() {return(this);};this.removeClass=function() {return(this);};this.removeData=function() {return(this);};this.removeProp=function() {return(this);};this.replaceAll=function() {return(this);};this.replaceWith=function() {return(this);};this.resize=function() {return(this);};this.scroll=function() {return(this);};this.scrollLeft=function() {return(this);};this.scrollTop=function() {return(this);};this.select=function() {return(this);};this.selector=function() {return(this);};this.serialize=function() {return(this);};this.serializeArray=function() {return(this);};this.show=function() {return(this);};this.siblings=function() {return(this);};this.size=function() {return(this);};this.slice=function() {return(this);};this.slideDown=function() {return(this);};this.slideToggle=function() {return(this);};this.slideUp=function() {return(this);};this.stop=function() {return(this);};this.submit=function() {return(this);};this.text=function() {return(this);};this.toArray=function() {return(this);};this.toggle=function() {return(this);};this.toggle=function() {return(this);};this.toggleClass=function() {return(this);};this.trigger=function() {return(this);};this.triggerHandler=function() {return(this);};this.unbind=function() {return(this);};this.undelegate=function() {return(this);};this.unload=function() {return(this);};this.unwrap=function() {return(this);};this.val=function() {return(this);};this.width=function() {return(this);};this.wrap=function() {return(this);};this.wrapAll=function() {return(this);};this.wrapInner=function() {return(this);}});};$.ajax=function() {return($);};$.ajaxPrefilter=function() {return($);};$.ajaxSetup=function() {return($);};$.ajaxTransport=function() {return($);};$.boxModel=function() {return($);};$.browser=function() {return($);};$.Callbacks=function() {return($);};$.contains=function() {return($);};$.cssHooks=function() {return($);};$.cssNumber=function() {return($);};$.data=function() {return($);};$.Deferred=function() {return($);};$.dequeue=function() {return($);};$.each=function() {return($);};$.error=function() {return($);};$.extend=function() {return($);};$.fnextend=function() {return($);};$.fxinterval=function() {return($);};$.fxoff=function() {return($);};$.get=function() {return($);};$.getJSON=function() {return($);};$.getScript=function() {return($);};$.globalEval=function() {return($);};$.grep=function() {return($);};$.hasData=function() {return($);};$.holdReady=function() {return($);};$.inArray=function() {return($);};$.isArray=function() {return($);};$.isEmptyObject=function() {return($);};$.isFunction=function() {return($);};$.isNumeric=function() {return($);};$.isPlainObject=function() {return($);};$.isWindow=function() {return($);};$.isXMLDoc=function() {return($);};$.makeArray=function() {return($);};$.map=function() {return($);};$.merge=function() {return($);};$.noConflict=function() {return($);};$.noop=function() {return($);};$.now=function() {return($);};$.param=function() {return($);};$.parseHTML=function() {return($);};$.parseJSON=function() {return($);};$.parseXML=function() {return($);};$.post=function() {return($);};$.proxy=function() {return($);};$.queue=function() {return($);};$.removeData=function() {return($);};$.sub=function() {return($);};$.support=function() {return($);};$.trim=function() {return($);};$.type=function() {return($);};$.unique=function() {return($);};$.when=function() {return($);};$.always=function() {return($);};$.done=function() {return($);};$.fail=function() {return($);};$.isRejected=function() {return($);};$.isResolved=function() {return($);};$.notify=function() {return($);};$.notifyWith=function() {return($);};$.pipe=function() {return($);};$.progress=function() {return($);};$.promise=function() {return($);};$.reject=function() {return($);};$.rejectWith=function() {return($);};$.resolve=function() {return($);};$.resolveWith=function() {return($);};$.state=function() {return($);};$.then=function() {return($);};$.currentTarget=function() {return($);};$.data=function() {return($);};$.delegateTarget=function() {return($);};$.isDefaultPrevented=function() {return($);};$.isImmediatePropagationStopped=function() {return($);};$.isPropagationStopped=function() {return($);};$.metaKey=function() {return($);};$.namespace=function() {return($);};$.pageX=function() {return($);};$.pageY=function() {return($);};$.preventDefault=function() {return($);};$.relatedTarget=function() {return($);};$.result=function() {return($);};$.stopImmediatePropagation=function() {return($);};$.stopPropagation=function() {return($);};$.target=function() {return($);};$.timeStamp=function() {return($);};$.type=function() {return($);};$.which=function() {return($);};" + s; + + submit(scopejQuery(s), function(cls, message) { + if (cls) { + console.log(message.error); + workerError(message.error); + } else if (test) { + preview.open(); + preview.write(libraryIncludes + editor.getValue() + iFrameScript); + codeStorage.updateStorage(); + preview.close(); + } else { + preview.open(); + preview.write(libraryIncludes + editor.getValue()); + codeStorage.updateStorage(); + preview.close(); } - else { - if(test){ - preview.open(); - preview.write(libraryIncludes + editor.getValue() +iFrameScript); - codeStorage.updateStorage(); - preview.close(); - } - else{ - preview.open(); - preview.write(libraryIncludes + editor.getValue()); - codeStorage.updateStorage(); - preview.close(); - } - } + }); + } else if (test) { + preview.open(); + preview.write(libraryIncludes + editor.getValue() + iFrameScript); + codeStorage.updateStorage(); + preview.close(); + } else { + preview.open(); + preview.write(libraryIncludes + editor.getValue()); + codeStorage.updateStorage(); + preview.close(); } + } } -if(typeof prodOrDev !== 'undefined') { - var nodeEnv = prodOrDev === 'production' ? 'http://www.freecodecamp.com' : 'http://localhost:3001'; - if(challengeType === "0") - { - function updatePreview() { - editorValueForIFrame = editor.getValue(); - var failedCommentTest = false; - if (editorValueForIFrame.match(/\<\!\-\-/gi) && editorValueForIFrame.match(/\-\-\>/gi) == null) { - failedCommentTest = true; - } - else if (editorValueForIFrame.match(/\<\!\-\-/gi) && editorValueForIFrame.match(/\<\!\-\-/gi).length > editorValueForIFrame.match(/\-\-\>/gi).length) { - failedCommentTest = true; - } - if (failedCommentTest) { - editor.setValue(editor.getValue() + "-->"); - editorValueForIFrame = editorValueForIFrame + "-->"; - } - if(!editor.getValue().match(/\$\s*?\(\s*?\$\s*?\)/gi)){ - safeHTMLRun(false); - } - else{ - workerError("Unsafe $($)"); - } - } +function updatePreview() { + editorValueForIFrame = editor.getValue(); + var failedCommentTest = false; + if ( + editorValueForIFrame.match(/\<\!\-\-/gi) && + editorValueForIFrame.match(/\-\-\>/gi) == null + ) { + failedCommentTest = true; + } else if ( + editorValueForIFrame.match(/\<\!\-\-/gi) && + editorValueForIFrame.match(/\<\!\-\-/gi).length > editorValueForIFrame.match(/\-\-\>/gi).length + ) { + failedCommentTest = true; + } - setTimeout(updatePreview, 300); - } + if (failedCommentTest) { + editor.setValue(editor.getValue() + '-->'); + editorValueForIFrame = editorValueForIFrame + '-->'; + } + + if (!editor.getValue().match(/\$\s*?\(\s*?\$\s*?\)/gi)) { + safeHTMLRun(false); + } else { + workerError('Unsafe $($)'); + } } + +if (typeof prodOrDev !== 'undefined') { + + var nodeEnv = prodOrDev === 'production' ? + 'http://www.freecodecamp.com' : + 'http://localhost:3001'; + + if (challengeType === '0') { + setTimeout(updatePreview, 300); + } +} + +// Initialize CodeMirror editor with a nice html5 canvas demo. +editor.on('keyup', function() { + clearTimeout(delay); + delay = setTimeout(updatePreview, 300); +}); + /** * "post" methods */ var testResults = []; var postSuccess = function(data) { - var testDoc = document.createElement("div"); - $(testDoc) - .html("
" + JSON.parse(data) + "
"); - $('#testSuite').append(testDoc); - testSuccess(); + var testDoc = document.createElement('div'); + $(testDoc).html( + "
" + + JSON.parse(data) + + '
' + ); + + $('#testSuite').append(testDoc); + testSuccess(); }; var postError = function(data) { - var testDoc = document.createElement("div"); - $(testDoc) - .html("
" + JSON.parse(data) + "
"); - $('#testSuite').append(testDoc); + var testDoc = document.createElement('div'); + + $(testDoc).html( + "
" + + JSON.parse(data) + + '
' + ); + + $('#testSuite').append(testDoc); }; + var goodTests = 0; var testSuccess = function() { - goodTests++; - if (goodTests === tests.length) { - showCompletion(); - } + goodTests++; + if (goodTests === tests.length) { + showCompletion(); + } }; function showCompletion() { - if (isInitRun) { - isInitRun = false; - return; - } - var time = Math.floor(Date.now()) - started; - ga('send', 'event', 'Challenge', 'solved', challenge_Name + ', Time: ' + time + - ', Attempts: ' + attempts); - var bonfireSolution = myCodeMirror.getValue(); - var didCompleteWith = $('#completed-with').val() || null; - $('#complete-courseware-dialog').modal('show'); - $('#submit-challenge').click(function(e) { - e.preventDefault(); + if (isInitRun) { + isInitRun = false; + return; + } + var time = Math.floor(Date.now()) - started; + ga( + 'send', + 'event', + 'Challenge', + 'solved', + challenge_Name + ', Time: ' + time + ', Attempts: ' + attempts + ); + var bonfireSolution = myCodeMirror.getValue(); + var didCompleteWith = $('#completed-with').val() || null; + $('#complete-courseware-dialog').modal('show'); + $('#submit-challenge').click(function(e) { + e.preventDefault(); - $('#submit-challenge') - .attr('disabled', 'true') - .removeClass('btn-primary') - .addClass('btn-warning disabled'); + $('#submit-challenge') + .attr('disabled', 'true') + .removeClass('btn-primary') + .addClass('btn-warning disabled'); - var $checkmarkContainer = $('#checkmark-container'); - $checkmarkContainer.css({ height: $checkmarkContainer.innerHeight() }); + var $checkmarkContainer = $('#checkmark-container'); + $checkmarkContainer.css({ height: $checkmarkContainer.innerHeight() }); - $('#challenge-checkmark') - .addClass('zoomOutUp') - // .removeClass('zoomInDown') - .delay(1000) - .queue(function(next) { - $(this).replaceWith( - '
submitting...
' - ); - next(); - }); + $('#challenge-checkmark') + .addClass('zoomOutUp') + // .removeClass('zoomInDown') + .delay(1000) + .queue(function(next) { + $(this).replaceWith( + '
submitting...
' + ); + next(); + }); - $.post( - '/completed-bonfire/', { - challengeInfo: { - challengeId: challenge_Id, - challengeName: challenge_Name, - completedWith: didCompleteWith, - challengeType: challengeType, - solution: bonfireSolution - } - }, - function(res) { - if (res) { - window.location = '/challenges/next-challenge'; - } + $.post( + '/completed-bonfire/', { + challengeInfo: { + challengeId: challenge_Id, + challengeName: challenge_Name, + completedWith: didCompleteWith, + challengeType: challengeType, + solution: bonfireSolution } - ); - }); + }, + function(res) { + if (res) { + window.location = '/challenges/next-challenge'; + } + } + ); + }); } var resetEditor = function resetEditor() { @@ -366,16 +394,19 @@ if (challengeType !== '0') { ' * Your output will go here.\n' + ' * Console.log() -type statements\n' + ' * will appear in your browser\'s\n' + ' * DevTools JavaScript console.\n' + ' */'); - codeOutput.setSize("100%", "100%"); + codeOutput.setSize('100%', '100%'); } var info = editor.getScrollInfo(); + var after = editor.charCoords({ - line: editor.getCursor().line + 1, - ch: 0 -}, "local").top; -if (info.top + info.clientHeight < after) - editor.scrollTo(null, after - info.clientHeight + 3); + line: editor.getCursor().line + 1, + ch: 0 +}, 'local').top; + +if (info.top + info.clientHeight < after) { + editor.scrollTo(null, after - info.clientHeight + 3); +} var userTests; var testSalt = Math.random(); @@ -383,34 +414,35 @@ var testSalt = Math.random(); var scrapeTests = function(userJavaScript) { - // insert tests from mongo - for (var i = 0; i < tests.length; i++) { - userJavaScript += '\n' + tests[i]; + // insert tests from mongo + for (var i = 0; i < tests.length; i++) { + userJavaScript += '\n' + tests[i]; + } + + var counter = 0; + var match = BDDregex.exec(userJavaScript); + + while (match) { + var replacement = '//' + counter + testSalt; + userJavaScript = userJavaScript.substring(0, match.index) + + replacement + + userJavaScript.substring(match.index + match[0].length); + + if (!userTests) { + userTests = []; } - var counter = 0; - var regex = new RegExp( - /(expect(\s+)?\(.*\;)|(assert(\s+)?\(.*\;)|(assert\.\w.*\;)|(.*\.should\..*\;)/ - ); - var match = regex.exec(userJavaScript); - while (match != null) { - var replacement = '//' + counter + testSalt; - userJavaScript = userJavaScript.substring(0, match.index) + replacement + - userJavaScript.substring(match.index + match[0].length); + userTests.push({ + 'text': match[0], + 'line': counter, + 'err': null + }); - if (!userTests) { - userTests = []; - } - userTests.push({ - "text": match[0], - "line": counter, - "err": null - }); - counter++; - match = regex.exec(userJavaScript); - } + counter++; + match = BDDregex.exec(userJavaScript); + } - return userJavaScript; + return userJavaScript; }; function removeComments(userJavaScript) { @@ -424,28 +456,33 @@ function removeLogs(userJavaScript) { var pushed = false; var createTestDisplay = function() { - if (pushed) { - userTests.pop(); + if (pushed) { + userTests.pop(); + } + for (var i = 0; i < userTests.length; i++) { + var test = userTests[i]; + var testDoc = document.createElement('div'); + + if (test.err) { + console.log('Should be displaying bad tests'); + + $(testDoc).html( + "
" + + test.text + "
" + + test.err + "
" + ) + .appendTo($('#testSuite')); + + } else { + + $(testDoc).html( + "
" + + test.text + + "
" + ) + .appendTo($('#testSuite')); } - for (var i = 0; i < userTests.length; i++) { - var test = userTests[i]; - var testDoc = document.createElement("div"); - if (test.err != null) { - console.log('Should be displaying bad tests'); - $(testDoc) - .html( - "
" + - test.text + "
" + - test.err + "
") - .appendTo($('#testSuite')); - } else { - $(testDoc) - .html( - "
" + - test.text + "
") - .appendTo($('#testSuite')); - } - }; + } }; var expect = chai.expect; @@ -454,148 +491,162 @@ var should = chai.should(); var reassembleTest = function(test, data) { - var lineNum = test.line; - var regexp = new RegExp("\/\/" + lineNum + testSalt); - return data.input.replace(regexp, test.text); + var lineNum = test.line; + var regexp = new RegExp('\/\/' + lineNum + testSalt); + return data.input.replace(regexp, test.text); }; var runTests = function(err, data) { - //userTests = userTests ? null : []; - var allTestsPassed = true; - pushed = false; - $('#testSuite').children().remove(); - if (err && userTests.length > 0) { - userTests = [{ - text: "Program Execution Failure", - err: "No user tests were run." - }]; - createTestDisplay(); - } - //Add blocks to test exploits here! - else if(editorValue.match(/if\s\(null\)\sconsole\.log\(1\);/gi)){ - allTestsPassed = false; - userTests = [{ - text: "Program Execution Failure", - err: "Invalid if (null) console.log(1); detected" - }]; - createTestDisplay(); - } - else if (userTests) { - userTests.push(false); - pushed = true; - userTests.forEach(function(chaiTestFromJSON, indexOfTestArray, - __testArray) { - try { - if (chaiTestFromJSON) { - var output = eval(reassembleTest(chaiTestFromJSON, data)); - } - } catch (error) { - allTestsPassed = false; - __testArray[indexOfTestArray].err = error.message; - } finally { - if (!chaiTestFromJSON) { - createTestDisplay(); - } - } - }); + // userTests = userTests ? null : []; + var allTestsPassed = true; + pushed = false; + $('#testSuite').children().remove(); + if (err && userTests.length > 0) { + userTests = [{ + text: 'Program Execution Failure', + err: 'No user tests were run.' + }]; + createTestDisplay(); - if (allTestsPassed) { - allTestsPassed = false; - showCompletion(); + // Add blocks to test exploits here! + } else if (editorValue.match(/if\s\(null\)\sconsole\.log\(1\);/gi)) { + allTestsPassed = false; + userTests = [{ + text: 'Program Execution Failure', + err: 'Invalid if (null) console.log(1); detected' + }]; + createTestDisplay(); + } else if (userTests) { + userTests.push(false); + pushed = true; + userTests.forEach(function( + chaiTestFromJSON, + indexOfTestArray, + __testArray + ) { + try { + if (chaiTestFromJSON) { + var output = eval(reassembleTest(chaiTestFromJSON, data)); } + } catch (error) { + allTestsPassed = false; + __testArray[indexOfTestArray].err = error.message; + } finally { + if (!chaiTestFromJSON) { + createTestDisplay(); + } + } + }); + + if (allTestsPassed) { + allTestsPassed = false; + showCompletion(); } + } }; -function bonfireExecute(test) { - initPreview = false; - goodTests = 0; - attempts++; - ga('send', 'event', 'Challenge', 'ran-code', challenge_Name); - userTests = null; - $('#testSuite').empty(); - if(challengeType !== "0" && !editor.getValue().match(/\$\s*?\(\s*?\$\s*?\)/gi)){ - var userJavaScript = myCodeMirror.getValue(); - var failedCommentTest = false; - if (userJavaScript.match(/\/\*/gi) && userJavaScript.match(/\*\//gi) == null) { - failedCommentTest = true; - } - else if (!failedCommentTest && userJavaScript.match(/\/\*/gi) && userJavaScript.match(/\/\*/gi).length > userJavaScript.match(/\*\//gi).length) { - failedCommentTest = true; - } - userJavaScript = removeComments(userJavaScript); - userJavaScript = scrapeTests(userJavaScript); - // simple fix in case the user forgets to invoke their function +function bonfireExecute(shouldTest) { + initPreview = false; + goodTests = 0; + attempts++; + ga('send', 'event', 'Challenge', 'ran-code', challenge_Name); + userTests = null; + $('#testSuite').empty(); - if(userJavaScript.match(/function/gi)){ - if(userJavaScript.match(/function\s*?\(|function\s+\w+\s*?\(/gi)){ + if ( + challengeType !== '0' && + !editor.getValue().match(/\$\s*?\(\s*?\$\s*?\)/gi) + ) { + var userJavaScript = myCodeMirror.getValue(); + var failedCommentTest = false; - submit(userJavaScript, function (cls, message) { - if (failedCommentTest) { - myCodeMirror.setValue(myCodeMirror.getValue() + "*/"); - console.log('Caught Unfinished Comment'); - codeOutput.setValue("Unfinished multi-line comment"); - failedCommentTest = false; - } - else if (cls) { - codeOutput.setValue(message.error); - if(test) - runTests('Error', null); - } else { - codeOutput.setValue(message.output); - codeOutput.setValue(codeOutput.getValue().replace(/\\\"/gi, '')); - message.input = removeLogs(message.input); - if(test) - runTests(null, message); - } - }); - } - else{ - codeOutput.setValue("Unsafe or Unfinished function declaration"); - } - } - else{ - submit(userJavaScript, function (cls, message) { - if (failedCommentTest) { - myCodeMirror.setValue(myCodeMirror.getValue() + "*/"); - console.log('Caught Unfinished Comment'); - codeOutput.setValue("Unfinished mulit-line comment"); - failedCommentTest = false; - } - else if (cls) { - codeOutput.setValue(message.error); - if(test) - runTests('Error', null); - } else { - codeOutput.setValue(message.output); - codeOutput.setValue(codeOutput.getValue().replace(/\\\"/gi, '')); - message.input = removeLogs(message.input); - if(test) - runTests(null, message); - } - }); - } + // checks if the number of opening comments(/*) matches the number of + // closing comments(*/) + if ( + userJavaScript.match(/\/\*/gi) && + userJavaScript.match(/\/\*/gi).length > userJavaScript.match(/\*\//gi).length + ) { + failedCommentTest = true; } - else { - editorValueForIFrame = editor.getValue(); + + userJavaScript = removeComments(userJavaScript); + userJavaScript = scrapeTests(userJavaScript); + // simple fix in case the user forgets to invoke their function + + 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() + '*/'); + console.log('Caught Unfinished Comment'); + codeOutput.setValue('Unfinished multi-line comment'); + failedCommentTest = false; + } else if (cls) { + codeOutput.setValue(message.error); + if (test) { + runTests('Error', null); + } + } else { + codeOutput.setValue(message.output); + codeOutput.setValue(codeOutput.getValue().replace(/\\\"/gi, '')); + message.input = removeLogs(message.input); + if (shouldTest) { + runTests(null, message); + } + } + }); + } else { + codeOutput.setValue('Unsafe or unfinished function declaration'); + } + } else { + submit(userJavaScript, function(cls, message) { + if (failedCommentTest) { - editor.setValue(editor.getValue() + "-->"); - editorValueForIFrame = editorValueForIFrame + "-->"; - } - if(!editor.getValue().match(/\$\s*?\(\s*?\$\s*?\)/gi) && challengeType === "0") { - safeHTMLRun(test); - } - else{ - workerError("Unsafe $($)"); + myCodeMirror.setValue(myCodeMirror.getValue() + '*/'); + console.log('Caught Unfinished Comment'); + codeOutput.setValue('Unfinished mulit-line comment'); + failedCommentTest = false; + } else if (cls) { + codeOutput.setValue(message.error); + if (shouldTest) { + runTests('Error', null); + } + } else { + codeOutput.setValue(message.output); + codeOutput.setValue(codeOutput.getValue().replace(/\\\"/gi, '')); + message.input = removeLogs(message.input); + + if (shouldTest) { + runTests(null, message); + } } + }); } - setTimeout(function() { - var $marginFix = $('.innerMarginFix'); - $marginFix.css('min-height', $marginFix.height()); - }, 1000); + } else { + + editorValueForIFrame = editor.getValue(); + + if (failedCommentTest) { + editor.setValue(editor.getValue() + '-->'); + editorValueForIFrame = editorValueForIFrame + '-->'; + } + if ( + !editor.getValue().match(/\$\s*?\(\s*?\$\s*?\)/gi) && + challengeType === '0' + ) { + safeHTMLRun(test); + } else { + workerError('Unsafe $($)'); + } + } + setTimeout(function() { + var $marginFix = $('.innerMarginFix'); + $marginFix.css('min-height', $marginFix.height()); + }, 1000); } $('#submitButton').on('click', function() { - bonfireExecute(true); + bonfireExecute(true); }); $(document).ready(function() { From ce364b472f7e601fa17713e30dd424fd6be74ece Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Thu, 27 Aug 2015 11:35:41 -0700 Subject: [PATCH 110/134] lint plugin --- client/plugin.js | 55 +++++++++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/client/plugin.js b/client/plugin.js index 9e63a18b88d..3ef30006018 100644 --- a/client/plugin.js +++ b/client/plugin.js @@ -1,6 +1,17 @@ - +/* eslint-disable no-eval */ +/* global importScripts, application */ // executes the given code and handles the result -var run = function(code) { + +function importScript(url, error) { + try { + importScripts(url); + } catch (e) { + error = e; + } + return error; +} + +function run(code) { var result = { input: code, output: null, @@ -18,21 +29,13 @@ var run = function(code) { application.remote.output(result); self.close(); -}; +} // protects even the worker scope from being accessed -var runHidden = function(code) { +function runHidden(code) { - var importScript = function(url) { - var error = null; - try { - importScripts(url); - } catch (e) { - error = e; - console.log('Unable to load %s!', url); - } - }; + /* eslint-disable */ var indexedDB = null; var location = null; var navigator = null; @@ -55,25 +58,34 @@ var runHidden = function(code) { var dump = null; var onoffline = null; var ononline = null; - importScripts( - "https://cdnjs.cloudflare.com/ajax/libs/ramda/0.13.0/ramda.min.js"); - importScripts( - "https://cdnjs.cloudflare.com/ajax/libs/chai/2.2.0/chai.min.js" - ) var expect = chai.expect; var assert = chai.assert; + /* eslint-enable */ + var error = null; + error = importScript( + error, + 'https://cdnjs.cloudflare.com/ajax/libs/ramda/0.13.0/ramda.min.js' + ); + + error = importScript( + 'https://cdnjs.cloudflare.com/ajax/libs/chai/2.2.0/chai.min.js' + ); + + if (error) { + return error; + } return eval(code); } // converts the output into a string -var stringify = function(output) { +function stringify(output) { var result; - if (typeof output == 'undefined') { + if (typeof output === 'undefined') { result = 'undefined'; } else if (output === null) { result = 'null'; @@ -84,5 +96,4 @@ var stringify = function(output) { return result; } - -application.setInterface({run:run}); +application.setInterface({ run: run }); From 45c0c710e0bec64bb3d1df87a283653dfcd65b46 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Thu, 27 Aug 2015 11:40:06 -0700 Subject: [PATCH 111/134] lint sandbox --- client/sandbox.js | 102 +++++++++++++++++++++++----------------------- 1 file changed, 52 insertions(+), 50 deletions(-) diff --git a/client/sandbox.js b/client/sandbox.js index 10eaa2ef078..f2a32b3d3a3 100644 --- a/client/sandbox.js +++ b/client/sandbox.js @@ -1,88 +1,90 @@ +/* global jailed */ var printCallback; -// sends the input to the plugin for evaluation -var submit = function(code,callback) { - printCallback = callback; - // postpone the evaluation until the plugin is initialized - plugin.whenConnected( - function() { - if (requests == 0) { - startLoading(); - } - requests++; - plugin.remote.run(code); - } - ); -}; +// sends the input to the plugin for evaluation +function submit(code, callback) { + printCallback = callback; + + // postpone the evaluation until the plugin is initialized + plugin.whenConnected(function() { + if (requests === 0) { + startLoading(); + } + + requests++; + plugin.remote.run(code); + }); +} // puts the message on the terminal var print = function(cls, msg) { - printCallback(cls,msg); + printCallback(cls, msg); }; // will restart the plugin if it does not respond var disconnectTimeout = null; var startLoading = function() { - disconnectTimeout = setTimeout(disconnect, 3000); + disconnectTimeout = setTimeout(disconnect, 3000); }; var endLoading = function() { - clearTimeout(disconnectTimeout); + clearTimeout(disconnectTimeout); }; var disconnect = function() { - plugin.disconnect(); + plugin.disconnect(); }; // interface provided to the plugin var api = { - output: function(data) { - endLoading(); - //print('input', data.input); - if (data.error) { - print('Error', data); - reset(); - } else { - print(null, data); - reset(); - } + output: function(data) { + endLoading(); + // print('input', data.input); + + if (data.error) { + print('Error', data); + reset(); + } else { + print(null, data); + reset(); } + } }; // obtaining absolute path of this script var scripts = document.getElementsByTagName('script'); -var path = scripts[scripts.length-1].src - .split('?')[0] - .split('/') - .slice(0, -1) - .join('/')+'/'; - - +var path = scripts[scripts.length - 1].src + .split('?')[0] + .split('/') + .slice(0, -1) + .join('/') + '/'; var requests; // (re)initializes the plugin var reset = function() { - requests = 0; - plugin = new jailed.Plugin(path + 'plugin.js', api); - plugin.whenDisconnected( function() { - // give some time to handle the last responce - setTimeout( function() { - endLoading(); - console.log("resetting on fatal plugin error"); - if(challengeType === 0){ - codeOutput.setValue("Sorry, your code is either too slow, has a fatal error, or contains an infinite loop."); - } - reset(); - }, 10); - }); + requests = 0; + plugin = new jailed.Plugin(path + 'plugin.js', api); + plugin.whenDisconnected( function() { + // give some time to handle the last responce + setTimeout( function() { + endLoading(); + console.log('resetting on fatal plugin error'); + + if (challengeType === 0) { + codeOutput.setValue( + 'Sorry, your code is either too slow, has a fatal error, ' + + 'or contains an infinite loop.' + ); + } + reset(); + }, 10); + }); }; - - // initialize everything var plugin = null; From 551cb987dd9bbd98b51b8c34728fd05f2ee80be3 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Thu, 27 Aug 2015 12:36:29 -0700 Subject: [PATCH 112/134] call chai after load in plugin --- client/plugin.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/client/plugin.js b/client/plugin.js index 3ef30006018..36f869db1a7 100644 --- a/client/plugin.js +++ b/client/plugin.js @@ -58,9 +58,6 @@ function runHidden(code) { var dump = null; var onoffline = null; var ononline = null; - - var expect = chai.expect; - var assert = chai.assert; /* eslint-enable */ var error = null; @@ -73,6 +70,12 @@ function runHidden(code) { 'https://cdnjs.cloudflare.com/ajax/libs/chai/2.2.0/chai.min.js' ); + + /* eslint-disable*/ + var expect = chai.expect; + var assert = chai.assert; + /* eslint-enable */ + if (error) { return error; } From 376b58cc150d71f6a845d66482d562b516b04ba0 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Thu, 27 Aug 2015 12:37:41 -0700 Subject: [PATCH 113/134] combine sandbox into commonFramework a @benmcmahon suggestion --- client/commonFramework.js | 117 ++++++++++++++++++++-- client/sandbox.js | 91 ----------------- server/views/coursewares/showBonfire.jade | 1 - server/views/coursewares/showHTML.jade | 1 - server/views/coursewares/showJS.jade | 1 - 5 files changed, 107 insertions(+), 104 deletions(-) delete mode 100644 client/sandbox.js diff --git a/client/commonFramework.js b/client/commonFramework.js index 8545d542f96..dd91756e06f 100644 --- a/client/commonFramework.js +++ b/client/commonFramework.js @@ -1,4 +1,4 @@ -/* globals CodeMirror, challenge_Id, challenge_Name, challengeType */ +/* globals jailed, CodeMirror, challenge_Id, challenge_Name, challengeType */ // codeStorage var codeStorageFactory = (function($, localStorage) { @@ -68,6 +68,103 @@ var codeStorageFactory = (function($, localStorage) { return codeStorageFactory; }($, localStorage)); +var sandBox = (function() { + + var plugin = null; + + var sandBox = { + }; + + var printCallback; + + // sends the input to the plugin for evaluation + function submit(code, callback) { + printCallback = callback; + + // postpone the evaluation until the plugin is initialized + plugin.whenConnected(function() { + if (requests === 0) { + startLoading(); + } + + requests++; + plugin.remote.run(code); + }); + } + + // puts the message on the terminal + var print = function(cls, msg) { + printCallback(cls, msg); + }; + + + // will restart the plugin if it does not respond + var disconnectTimeout = null; + var startLoading = function() { + disconnectTimeout = setTimeout(disconnect, 3000); + }; + + var endLoading = function() { + clearTimeout(disconnectTimeout); + }; + + var disconnect = function() { + plugin.disconnect(); + }; + + + // interface provided to the plugin + var api = { + output: function(data) { + endLoading(); + // print('input', data.input); + + if (data.error) { + print('Error', data); + reset(); + } else { + print(null, data); + reset(); + } + } + }; + + + // obtaining absolute path of this script + var scripts = document.getElementsByTagName('script'); + var path = scripts[scripts.length - 1].src + .split('?')[0] + .split('/') + .slice(0, -1) + .join('/') + '/'; + + var requests; + + // (re)initializes the plugin + var reset = function() { + requests = 0; + plugin = new jailed.Plugin(path + 'plugin.js', api); + plugin.whenDisconnected( function() { + // give some time to handle the last responce + setTimeout( function() { + endLoading(); + console.log('resetting on fatal plugin error'); + + if (challengeType === 0) { + codeOutput.setValue( + 'Sorry, your code is either too slow, has a fatal error, ' + + 'or contains an infinite loop.' + ); + } + reset(); + }, 10); + }); + }; + reset(); + sandBox.submit = submit; + return sandBox; +}()); + function replaceSafeTags(value) { return value .replace(/fccss/gi, '