From e6061ef9443d02159dfe6450dd5f3e5eb90e035a Mon Sep 17 00:00:00 2001 From: Matt Trifilo Date: Mon, 17 Aug 2015 14:55:22 -0500 Subject: [PATCH 01/80] Spelling and grammar edit. Minor spelling and grammar edit in the description of "Waypoint: Use Hex Code for Specific Colors" for clarity. --- challenges/html5-and-css.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/html5-and-css.json b/challenges/html5-and-css.json index 7bdce36cdb..1bf7c3d1ba 100644 --- a/challenges/html5-and-css.json +++ b/challenges/html5-and-css.json @@ -3431,7 +3431,7 @@ "description": [ "Did you know there are other ways to represent colors in CSS? One of these ways is called hexadecimal code, or hex code for short.", "Decimal means the numbers zero through nine - the numbers that people use in everyday life. Hexadecimal includes these 10 numbers, plus the letters A, B, C, D, E and F. This means that Hexidecimal has a total of 16 possible values, instead of the 10 possible values that our normal base-10 number system gives us.", - "With CSS, we use 6 hexidecimal number to represent colors. For example, #000000 is the lowest possible value, and it represents the color black.", + "With CSS, we use 6 hexadecimal numbers to represent colors. For example, #000000 is the lowest possible value, and it represents the color black.", "Replace the word black in our body element's background-color with its hex code representation, #000000. " ], "tests": [ From eef4c8ebfa1d643e0bfa2caa85e008e48a91ada5 Mon Sep 17 00:00:00 2001 From: ayampol Date: Mon, 17 Aug 2015 16:43:43 -0400 Subject: [PATCH 02/80] Update basic-ziplines.json Add missing around <a target='_blank'&rt;. --- challenges/basic-ziplines.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/basic-ziplines.json b/challenges/basic-ziplines.json index 7b7ca96c27..ff72754961 100644 --- a/challenges/basic-ziplines.json +++ b/challenges/basic-ziplines.json @@ -52,7 +52,7 @@ "Bonus User Story: As a user, I navigate to different sections of the webpage by clicking buttons in the navigation.", "Don't worry if you don't have anything to showcase on your portfolio yet - you will build several several apps on the next few CodePen challenges, and can come back and update your portfolio later.", "There are many great portfolio templates out there, but for this challenge, you'll need to build a portfolio page yourself. Using Bootstrap will make this much easier for you.", - "Note that CodePen.io overrides the Window.open() function, so if you want to open windows using jquery, you will need to target invisible anchor elements like this one: <a target='_blank'&rt;.", + "Note that CodePen.io overrides the Window.open() function, so if you want to open windows using jquery, you will need to target invisible anchor elements like this one: <a target='_blank'&rt;.", "Remember to use Read-Search-Ask if you get stuck.", "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen. If you pair programmed, you should also include the Free Code Camp username of your pair.", "If you'd like immediate feedback on your project, click this button and paste in a link to your CodePen project. Otherwise, we'll review it before you start your nonprofit projects.

Click here then add your link to your tweet's text" From 1fc43ad70a83956af92c2843b6e7f5c59ae2c678 Mon Sep 17 00:00:00 2001 From: ayampol Date: Mon, 17 Aug 2015 16:49:19 -0400 Subject: [PATCH 03/80] Fix code tags Changed &rt to >. --- challenges/basic-ziplines.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/basic-ziplines.json b/challenges/basic-ziplines.json index ff72754961..408eecdde8 100644 --- a/challenges/basic-ziplines.json +++ b/challenges/basic-ziplines.json @@ -52,7 +52,7 @@ "Bonus User Story: As a user, I navigate to different sections of the webpage by clicking buttons in the navigation.", "Don't worry if you don't have anything to showcase on your portfolio yet - you will build several several apps on the next few CodePen challenges, and can come back and update your portfolio later.", "There are many great portfolio templates out there, but for this challenge, you'll need to build a portfolio page yourself. Using Bootstrap will make this much easier for you.", - "Note that CodePen.io overrides the Window.open() function, so if you want to open windows using jquery, you will need to target invisible anchor elements like this one: <a target='_blank'&rt;.", + "Note that CodePen.io overrides the Window.open() function, so if you want to open windows using jquery, you will need to target invisible anchor elements like this one: <a target='_blank'>.", "Remember to use Read-Search-Ask if you get stuck.", "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen. If you pair programmed, you should also include the Free Code Camp username of your pair.", "If you'd like immediate feedback on your project, click this button and paste in a link to your CodePen project. Otherwise, we'll review it before you start your nonprofit projects.

Click here then add your link to your tweet's text" From 7bfe73ce26a81de64c740dbc98838e7a208147e5 Mon Sep 17 00:00:00 2001 From: Aryan Jabbari Date: Mon, 17 Aug 2015 22:19:14 -0400 Subject: [PATCH 04/80] Fixed #1909 #1972 --- challenges/basic-javascript.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/basic-javascript.json b/challenges/basic-javascript.json index 1096e02868..4b72ffdd49 100644 --- a/challenges/basic-javascript.json +++ b/challenges/basic-javascript.json @@ -150,7 +150,7 @@ "Bracket notation is a way to get a character at a specific index within a string.", "Computers don't start counting at 1 like humans do. They start at 0.", "For example, the character at index 0 in the word \"Charles\" is \"C\". So if var firstName = \"Charles\", you can get the value of the first letter of the string by using firstName[0].", - "Use bracket notation to find the first character in a the firstLetterOfLastName variable.", + "Use bracket notation to find the first character in the firstLetterOfLastName variable.", "Try looking at the firstLetterOfFirstName variable declaration if you get stuck." ], "tests": [ From e632f2b06a5d6b62eb2e24c15e9c7523731d2654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Mart=C3=ADnez?= Date: Tue, 18 Aug 2015 02:20:24 +0000 Subject: [PATCH 05/80] Fixes #1970 (minor typo) --- challenges/html5-and-css.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/html5-and-css.json b/challenges/html5-and-css.json index 7bdce36cdb..3382085643 100644 --- a/challenges/html5-and-css.json +++ b/challenges/html5-and-css.json @@ -3749,7 +3749,7 @@ "description": [ "Another way you can represent colors in CSS is by using rgb values.", "RGB values look like this: rgb(0, 0, 0) for black and rgb(255, 255, 255) for white.", - "Instead of using six hexadecimal digits like you do with hex code, with rbg you specify the brightness of each color with a number between 0 and 255.", + "Instead of using six hexadecimal digits like you do with hex code, with rgb you specify the brightness of each color with a number between 0 and 255.", "If you do the math, 16 times 16 is 256 total values. So rgb, which starts counting from zero, has the exact same number of possible values as hex code.", "Let's replace the hex code in our body element's background color with the RGB value for black: rgb(0, 0, 0)" ], From c8e41ef0849d1163a856a003bfc372b22156f922 Mon Sep 17 00:00:00 2001 From: Aryan Jabbari Date: Mon, 17 Aug 2015 22:21:57 -0400 Subject: [PATCH 06/80] Fixed #1944 --- challenges/basic-javascript.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/basic-javascript.json b/challenges/basic-javascript.json index 1096e02868..a69da47e52 100644 --- a/challenges/basic-javascript.json +++ b/challenges/basic-javascript.json @@ -958,7 +958,7 @@ "We can use if statements in JavaScript to only execute code if a certain condition is met.", "if statements require some sort of boolean condition evaluate.", "Example:", - " if (1 == 2) {", + " if (1 === 2) {", "  return(true);", "}", "else {", From 3683d5143eb4d35d2c6e08446de308149939bd9f Mon Sep 17 00:00:00 2001 From: Aryan Jabbari Date: Mon, 17 Aug 2015 22:29:35 -0400 Subject: [PATCH 07/80] Fixed #1980 --- challenges/basic-ziplines.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/basic-ziplines.json b/challenges/basic-ziplines.json index 7b7ca96c27..662526a365 100644 --- a/challenges/basic-ziplines.json +++ b/challenges/basic-ziplines.json @@ -48,7 +48,7 @@ "Here are the user stories you must enable, and optional bonus user stories:", "User Story: As a user, I can access all of the portfolio webpage's content just by scrolling.", "User Story: As a user, I can click different buttons that will take me to the portfolio creator's different social media pages.", - "User Story: As a user, I can see thumbnail images of different projects the portfolio creator has built (if you don't haven't built any websites before, use placeholders.)", + "User Story: As a user, I can see thumbnail images of different projects the portfolio creator has built (if you haven't built any websites before, use placeholders.)", "Bonus User Story: As a user, I navigate to different sections of the webpage by clicking buttons in the navigation.", "Don't worry if you don't have anything to showcase on your portfolio yet - you will build several several apps on the next few CodePen challenges, and can come back and update your portfolio later.", "There are many great portfolio templates out there, but for this challenge, you'll need to build a portfolio page yourself. Using Bootstrap will make this much easier for you.", From c31f6956c18b3cbb9bfe38a86ed8b6b9591ceb15 Mon Sep 17 00:00:00 2001 From: Aryan Jabbari Date: Mon, 17 Aug 2015 22:31:37 -0400 Subject: [PATCH 08/80] Fixed #1982 --- challenges/basic-javascript.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/basic-javascript.json b/challenges/basic-javascript.json index 1096e02868..8ba3870827 100644 --- a/challenges/basic-javascript.json +++ b/challenges/basic-javascript.json @@ -755,7 +755,7 @@ "title": "Manipulate JavaScript Objects", "difficulty":"9.9823", "description":[ - "There are many ways to add and add and remove properties from objects.", + "There are many ways to add and remove properties from objects.", "For example, we can add properties to objects like this:", "myObject.myProperty = \"myValue\";", "We can also delete them like this:", From ea131f38211716a7a277e1b7c3a8d9322cb1aede Mon Sep 17 00:00:00 2001 From: Aryan Jabbari Date: Mon, 17 Aug 2015 22:54:08 -0400 Subject: [PATCH 09/80] Fixes #1924 --- challenges/basic-javascript.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/basic-javascript.json b/challenges/basic-javascript.json index 1096e02868..0c94fc4802 100644 --- a/challenges/basic-javascript.json +++ b/challenges/basic-javascript.json @@ -1040,7 +1040,7 @@ ], "challengeSeed":[ "var test = (function() {", - " var testString = \"There's 3 cats but 4 dogs.\";", + " var testString = \"There are 3 cats but 4 dogs.\";", "", " // Only change code below this line.", "", From 7353d6206013c507987fd5eb7c40abfbbf396f2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Mart=C3=ADnez?= Date: Tue, 18 Aug 2015 03:33:38 +0000 Subject: [PATCH 10/80] Fixes #1833 --- challenges/jquery.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/jquery.json b/challenges/jquery.json index d6a6fa0fb0..da4b93a56d 100644 --- a/challenges/jquery.json +++ b/challenges/jquery.json @@ -263,7 +263,7 @@ ], "tests": [ "assert(editor.match(/\\$\\(.*button/g), 'Use the $(\"button\") selector.')", - "assert(editor.match(/\\$\\(.*.btn/g), 'Use the $(\".btn\") selector.')", + "assert(editor.match(/\\$\\(.*\\.btn/g), 'Use the $(\".btn\") selector.')", "assert(editor.match(/\\$\\(.*#target1/g), 'Use the $(\"#target1\") selector.')", "assert(editor.match(/addClass/g) && editor.match(/addClass/g).length > 2, 'Only add one class with each of your three selectors.')", "assert($(\"#target1\").hasClass(\"animated\") && $(\"#target1\").hasClass(\"shake\") && $(\"#target1\").hasClass(\"btn-primary\"), 'Your #target1 element should have the classes animated‚ shake and btn-primary.')", From ee451a34fa70cd559e89c4eff4a7c7ac2d4946a9 Mon Sep 17 00:00:00 2001 From: Matt Trifilo Date: Mon, 17 Aug 2015 23:01:52 -0500 Subject: [PATCH 11/80] Issue: Grammar #1994 Put in the proposed grammar changes from [this issue](https://github.com/FreeCodeCamp/FreeCodeCamp/issues/1994). --- challenges/basic-javascript.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/challenges/basic-javascript.json b/challenges/basic-javascript.json index 1096e02868..db05feede9 100644 --- a/challenges/basic-javascript.json +++ b/challenges/basic-javascript.json @@ -956,7 +956,7 @@ "difficulty":"9.983", "description":[ "We can use if statements in JavaScript to only execute code if a certain condition is met.", - "if statements require some sort of boolean condition evaluate.", + "if statements require some sort of boolean condition to evaluate.", "Example:", " if (1 == 2) {", "  return(true);", @@ -965,7 +965,7 @@ "  return(false);", "}", "Let's use if and else statements to make a coin-flip game.", - "Create an if-else statement to return heads if the flip var is zero and to return tails if it's not." + "Create an if-else statement to return heads if the flip var is zero, or else return tails if it's not." ], "tests":[ "assert((function(){if(myFunction() === \"heads\" || myFunction() === \"tails\"){return(true);}else{return(false);}})(), 'myFunction should either return heads or tails');", @@ -975,7 +975,7 @@ "challengeSeed":[ "function myFunction(){", " var flip = Math.floor(Math.random() * (1 - 0 + 1)) + 0;", - " // Create and if else statement here to return \"heads\" if flip is 0. Otherwise return \"tails\".", + " // Create an if-else statement here to return \"heads\" if flip is 0. Otherwise return \"tails\".", "", " // Only change code below this line.", "", From 3215c39b8beea34fab40423f059b8265ab54a96c Mon Sep 17 00:00:00 2001 From: Michael Krebs Date: Tue, 18 Aug 2015 00:17:56 -0400 Subject: [PATCH 12/80] fix #1986 --- challenges/basic-javascript.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/basic-javascript.json b/challenges/basic-javascript.json index 1096e02868..e71a6d45ab 100644 --- a/challenges/basic-javascript.json +++ b/challenges/basic-javascript.json @@ -832,7 +832,7 @@ "difficulty":"9.9825", "description":[ "You can run the same code multiple times by using a loop.", - "Another type of JavaScript loop is called a \"while loop\" because it runs \"while\" something is true, and stops once that something is no longer true.", + "Another type of JavaScript loop is called a \"while loop\", because it runs \"while\" something is true and stops once that something is no longer true.", "var ourArray = [];", "var i = 0;", "while(i < 5) {", From de9adc0aa8ed74f895b8fb7b7e4828ddfd44d1bd Mon Sep 17 00:00:00 2001 From: Michael Krebs Date: Tue, 18 Aug 2015 00:22:33 -0400 Subject: [PATCH 13/80] fix #1988 --- challenges/basic-javascript.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/basic-javascript.json b/challenges/basic-javascript.json index 1096e02868..48b60fcf7a 100644 --- a/challenges/basic-javascript.json +++ b/challenges/basic-javascript.json @@ -859,7 +859,7 @@ "title": "Generate Random Fractions with JavaScript", "difficulty":"9.9827", "description":[ - "Random numbers are useful for creating random behaviours and games.", + "Random numbers are useful for creating random behavior.", "JavaScript has a Math.random() function that generates a random decimal number.", "Use Math.random() to get myFunction to return a random number." ], From 511956541119b87a3a6582cf12791a5d2298e4f0 Mon Sep 17 00:00:00 2001 From: Matt Trifilo Date: Mon, 17 Aug 2015 23:29:11 -0500 Subject: [PATCH 14/80] Fixed: Misspell #1877 Issue #1877's description's hint mentioned the wrong variable. --- challenges/basic-javascript.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/basic-javascript.json b/challenges/basic-javascript.json index 1096e02868..d8c61a0a53 100644 --- a/challenges/basic-javascript.json +++ b/challenges/basic-javascript.json @@ -216,7 +216,7 @@ "In order to get the last letter of a string, you can subtract one from the string's length.", "For example, if var firstName = \"Charles\", you can get the value of the last letter of the string by using firstName[firstName.length - 1].", "Use bracket notation to find the last character in the lastName variable.", - "Try looking at the lastLetterOfLastName variable declaration if you get stuck." + "Try looking at the lastLetterOfFirstName variable declaration if you get stuck." ], "tests": [ "assert(lastLetterOfLastName === \"e\", 'lastLetterOfLastName should be \"e\"');", From 5d3582aa0a805cff8daa4dca4ba3d7f4ecb500e5 Mon Sep 17 00:00:00 2001 From: Matt Trifilo Date: Tue, 18 Aug 2015 00:43:28 -0500 Subject: [PATCH 15/80] 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. --- challenges/jquery.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/jquery.json b/challenges/jquery.json index d6a6fa0fb0..166ff7f431 100644 --- a/challenges/jquery.json +++ b/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 e7927459c6b7ac5a39eabdbcf03b729492bdac9c Mon Sep 17 00:00:00 2001 From: Michael Krebs Date: Tue, 18 Aug 2015 02:05:53 -0400 Subject: [PATCH 16/80] fix #2011 --- challenges/object-oriented-and-functional-programming.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/challenges/object-oriented-and-functional-programming.json b/challenges/object-oriented-and-functional-programming.json index 307563795b..c49dd082d8 100644 --- a/challenges/object-oriented-and-functional-programming.json +++ b/challenges/object-oriented-and-functional-programming.json @@ -17,7 +17,7 @@ "difficulty":0, "description":[ "Before we dive into Object Oriented Programming, let's revisit JavaScript objects.", - "Give your motorBike object a wheels, engine and seats attribute and set them to numbers." + "Give your motorBike object a wheels, engines and seats attribute and set them to numbers." ], "tests":[ "assert(typeof(motorBike.engines) === 'number', 'engines should be have a engines attribute set to a number.');", @@ -54,7 +54,7 @@ "difficulty":0, "description":[ "We are also able to create objects using constructor functions.", - "Give your motorBike object a wheels, engine and seats attribute and set them to numbers." + "Give your motorBike object a wheels, engines and seats attribute and set them to numbers." ], "tests":[ "assert(typeof((new MotorBike()).engines) === 'number', 'engines should be have a engines attribute set to a number.');", @@ -62,7 +62,7 @@ "assert(typeof((new MotorBike()).seats) === 'number', 'seats should be have a engines attribute set to a number.');" ], "challengeSeed":[ - "// Let's add the properties engine and seats to the car in the same way that the property wheels has been added below. They should both be numbers.", + "// Let's add the properties engines and seats to the car in the same way that the property wheels has been added below. They should both be numbers.", "var Car = function() {", " this.wheels = 4;", " this.engines = 1;", From cc43a2ab713b1675dcde1b68422a06b24ce6141f Mon Sep 17 00:00:00 2001 From: Jeremy Gorniak Date: Tue, 18 Aug 2015 21:27:19 +1000 Subject: [PATCH 17/80] Fixed new waypoint description typo Small but important typo in challenge description for: Object Oriented and Functional Programming section Waypoint #1 - Declare JavaScript Objects as Variables --- challenges/object-oriented-and-functional-programming.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/object-oriented-and-functional-programming.json b/challenges/object-oriented-and-functional-programming.json index 307563795b..2d6c978e90 100644 --- a/challenges/object-oriented-and-functional-programming.json +++ b/challenges/object-oriented-and-functional-programming.json @@ -17,7 +17,7 @@ "difficulty":0, "description":[ "Before we dive into Object Oriented Programming, let's revisit JavaScript objects.", - "Give your motorBike object a wheels, engine and seats attribute and set them to numbers." + "Give your motorBike object a wheels, engines and seats attribute and set them to numbers." ], "tests":[ "assert(typeof(motorBike.engines) === 'number', 'engines should be have a engines attribute set to a number.');", From c9f561af86d5b0391d19db9a941625ed693beb3f Mon Sep 17 00:00:00 2001 From: Jeremy Gorniak Date: Tue, 18 Aug 2015 21:35:10 +1000 Subject: [PATCH 18/80] Fixed typo in waypoints #1 and #2 --- challenges/object-oriented-and-functional-programming.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/object-oriented-and-functional-programming.json b/challenges/object-oriented-and-functional-programming.json index 2d6c978e90..b599d6cd13 100644 --- a/challenges/object-oriented-and-functional-programming.json +++ b/challenges/object-oriented-and-functional-programming.json @@ -54,7 +54,7 @@ "difficulty":0, "description":[ "We are also able to create objects using constructor functions.", - "Give your motorBike object a wheels, engine and seats attribute and set them to numbers." + "Give your motorBike object a wheels, engines and seats attribute and set them to numbers." ], "tests":[ "assert(typeof((new MotorBike()).engines) === 'number', 'engines should be have a engines attribute set to a number.');", From 079d39677033c27682170b06fb255b4cddd9e7ef Mon Sep 17 00:00:00 2001 From: Aryan Jabbari Date: Tue, 18 Aug 2015 09:34:34 -0400 Subject: [PATCH 19/80] Fixes #2036 --- challenges/basic-javascript.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/basic-javascript.json b/challenges/basic-javascript.json index 1096e02868..9bf7cc740f 100644 --- a/challenges/basic-javascript.json +++ b/challenges/basic-javascript.json @@ -113,7 +113,7 @@ "description": [ "data structures have properties. For example, strings have a property called .length that will tell you how many characters are in the string.", "For example, if we created a variable var firstName = \"Charles\", we could find out how long the string \"Charles\" is by using the firstName.length property.", - "Use the .length property to count the number of characters in the lastNameLength variable." + "Use the .length property to count the number of characters in the lastName variable." ], "tests": [ "assert((function(){if(typeof(lastNameLength) !== \"undefined\" && typeof(lastNameLength) === \"number\" && lastNameLength === 8){return(true);}else{return(false);}})(), 'lastNameLength should be equal to eight.');", From 1b42bb44339ed26aa362382529592a4851ba0f8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Mart=C3=ADnez?= Date: Tue, 18 Aug 2015 14:05:51 +0000 Subject: [PATCH 20/80] Fixed #2049 --- challenges/basic-javascript.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/basic-javascript.json b/challenges/basic-javascript.json index 1096e02868..0cee2773f9 100644 --- a/challenges/basic-javascript.json +++ b/challenges/basic-javascript.json @@ -496,7 +496,7 @@ "// Only change code above this line.", "// We use this function to show you the value of your variable in your output box.", "// You'll learn about functions soon.", - "if(typeof(myArray) !== \"undefined\" && typeof(data) !== \"undefined\"){(function(y,z){return('myArray = ' + JSON.stringify(y) + ', data = ' + JSON.stringify(z));})(myArray, data);}" + "if(typeof(myArray) !== \"undefined\" && typeof(myData) !== \"undefined\"){(function(y,z){return('myArray = ' + JSON.stringify(y) + ', myData = ' + JSON.stringify(z));})(myArray, myData);}" ], "type": "waypoint", "challengeType": 1 From bde4c2a28075dc9a96868e41f8f4a145e68545b7 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Tue, 18 Aug 2015 10:57:38 -0700 Subject: [PATCH 21/80] add beginnings of react and d3 challenges --- under-construction/d3.json | 5 +++++ under-construction/json-apis-and-ajax.json | 3 +-- under-construction/reactjs.json | 5 +++++ 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 under-construction/d3.json create mode 100644 under-construction/reactjs.json diff --git a/under-construction/d3.json b/under-construction/d3.json new file mode 100644 index 0000000000..8c84070738 --- /dev/null +++ b/under-construction/d3.json @@ -0,0 +1,5 @@ +{ + "name": "D3", + "order": 0.099, + "challenges": [] +} diff --git a/under-construction/json-apis-and-ajax.json b/under-construction/json-apis-and-ajax.json index 268ad265a5..f2469887a7 100644 --- a/under-construction/json-apis-and-ajax.json +++ b/under-construction/json-apis-and-ajax.json @@ -1,6 +1,6 @@ { "name": "JSON APIs and Ajax", - "order": 0.007, + "order": 0.0065, "challenges": [ { "id": "bad87fed1348bd9aeca08826", @@ -79,7 +79,6 @@ " }", " ]", "", - " });", "fcces", "", "", diff --git a/under-construction/reactjs.json b/under-construction/reactjs.json new file mode 100644 index 0000000000..d4b687444b --- /dev/null +++ b/under-construction/reactjs.json @@ -0,0 +1,5 @@ +{ + "name": "ReactJS", + "order": 0.099, + "challenges": [] +} From 986ad3662c28990bea9fc11b8a072d950366f270 Mon Sep 17 00:00:00 2001 From: Jakob Dahl Date: Tue, 18 Aug 2015 23:46:09 +0200 Subject: [PATCH 22/80] update seed for Override Styles in Subsequent CSS --- challenges/html5-and-css.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/challenges/html5-and-css.json b/challenges/html5-and-css.json index b7a82a256c..df039b3abd 100644 --- a/challenges/html5-and-css.json +++ b/challenges/html5-and-css.json @@ -3235,7 +3235,8 @@ "Our \"pink-text\" class overrode our body element's CSS declaration!", "We just proved that our classes will override the body element's CSS. So the next logical question is, what can we do to override our pink-text class?", "Create an additional CSS class called blue-text that gives an element the color blue. Make sure it's below your pink-text class declaration.", - "Apply the blue-text class to your h1 element in addition to your pink-text class, and let's see which one wins." + "Apply the blue-text class to your h1 element in addition to your pink-text class, and let's see which one wins.", + "Applying multiple class attributes to a HTML element is done with a space between them like this: class=\"class1 class2\"" ], "tests": [ "assert($(\"h1\").hasClass(\"pink-text\"), 'Your h1 element should have the class pink-text.')", From d6752a060066247e2f39dde0b81f378307aeeeab Mon Sep 17 00:00:00 2001 From: Pavel Tsurbeleu Date: Tue, 18 Aug 2015 15:17:26 -0700 Subject: [PATCH 23/80] fix issue #2124 and rephrase the challenge a bit to avoid confusion --- challenges/basic-javascript.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/challenges/basic-javascript.json b/challenges/basic-javascript.json index 1096e02868..2c97249b0a 100644 --- a/challenges/basic-javascript.json +++ b/challenges/basic-javascript.json @@ -1093,12 +1093,12 @@ "You can invert any match by using the uppercase version of the selector \\s versus \\S for example." ], "tests":[ - "assert(test === 36, 'Your RegEx should have found seven spaces in the testString.');", - "assert(editor.getValue().match(/\\/\\\\S\\/gi/gi), 'You should be using the following expression /\\+S/gi to find the spaces in the testString.');" + "assert(test === 49, 'Your RegEx should have found forty nine non-space characters in the testString.');", + "assert(editor.getValue().match(/\\/\\\\S\\/gi/gi), 'You should be using the following expression /\\S/gi to find non-space characters in the testString.');" ], "challengeSeed":[ "var test = (function(){", - " var testString = \"How many spaces are there in this sentence?\";", + " var testString = \"How many non-space characters are there in this sentence?\";", "", " // Only change code below this line.", "", From fa1c8312498af6b9af8b7bbe914f9b91337a2cd2 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Tue, 18 Aug 2015 21:49:16 -0700 Subject: [PATCH 24/80] add types to testing waypoints --- challenges/automated-testing-and-debugging.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/challenges/automated-testing-and-debugging.json b/challenges/automated-testing-and-debugging.json index a62368eee0..9cf677a024 100644 --- a/challenges/automated-testing-and-debugging.json +++ b/challenges/automated-testing-and-debugging.json @@ -20,7 +20,8 @@ "", "" ], - "challengeType":1 + "challengeType":1, + "type": "waypoint" }, { "id":"cf1111c1c16feddfaeb7bdef", @@ -46,7 +47,8 @@ "", "" ], - "challengeType":1 + "challengeType":1, + "type": "waypoint" } ] } From 72c69a7e19a7cd126e54a3cc0183fff91f05e86e Mon Sep 17 00:00:00 2001 From: Ionut Costica Date: Wed, 19 Aug 2015 15:08:57 +0300 Subject: [PATCH 25/80] Fix for Issue #2175 Fixes #2175 --- challenges/basic-javascript.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/basic-javascript.json b/challenges/basic-javascript.json index 1096e02868..a76622afeb 100644 --- a/challenges/basic-javascript.json +++ b/challenges/basic-javascript.json @@ -1002,7 +1002,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 occurances 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 current 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 current regular expression with the word and." ], "tests":[ "assert(test==2, 'Your regular expression should find two occurrences of the word and');", From 6d5309b1898b5383da7872a7ce1ce07756c21af6 Mon Sep 17 00:00:00 2001 From: dokkillo Date: Wed, 19 Aug 2015 18:49:25 +0200 Subject: [PATCH 26/80] issue 2173 --- challenges/bootstrap.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/bootstrap.json b/challenges/bootstrap.json index a58be9f38b..610919a282 100644 --- a/challenges/bootstrap.json +++ b/challenges/bootstrap.json @@ -795,7 +795,7 @@ "We can clean up our code and make our Cat Photo App look more conventional by using Bootstrap's built-in styles instead of the custom styles we created earlier.", "Don't worry - there will be plenty of time to customize our CSS later.", "Delete the .red-text, p, and .smaller-image CSS declarations from your style element so that the only declarations left in your style element are h2 and thick-green-border.", - "Then Delete the p element that contains a dead link. Then remove the red-text class from your h2 element and replace it with the text-primary Bootstrap class.", + "Then delete the p element that contains a dead link. Then remove the red-text class from your h2 element and replace it with the text-primary Bootstrap class.", "Finally, remove the \"smaller-image\" class from your first img element and replace it with the img-responsive class." ], "tests": [ From 0b45c69d32ea6cc8bdfb111ac65ad553486565a8 Mon Sep 17 00:00:00 2001 From: dokkillo Date: Wed, 19 Aug 2015 19:12:51 +0200 Subject: [PATCH 27/80] issue #2191 --- challenges/basic-javascript.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/basic-javascript.json b/challenges/basic-javascript.json index 1096e02868..9ea64d1d82 100644 --- a/challenges/basic-javascript.json +++ b/challenges/basic-javascript.json @@ -935,7 +935,7 @@ ], "challengeSeed":[ "var min = 0;", - "var max = 12;", + "var max = 9;", "function myFunction() {", " // Make myFunction return a random number between zero and nine instead of a decimal", " // Only change code below this line.", From 2c7313dcdba2e3a2612f76151e1fa22a8eefac8a Mon Sep 17 00:00:00 2001 From: dokkillo Date: Wed, 19 Aug 2015 20:29:53 +0200 Subject: [PATCH 28/80] issue #2133 --- challenges/html5-and-css.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/html5-and-css.json b/challenges/html5-and-css.json index b7a82a256c..710f8b441a 100644 --- a/challenges/html5-and-css.json +++ b/challenges/html5-and-css.json @@ -3117,7 +3117,7 @@ "difficulty": 1.46, "description": [ "Now let's start fresh and talk about CSS inheritance.", - "Every HTML page has body element.", + "Every HTML page has a body element.", "We can prove that the body element exists here by giving it a background-color of black.", "We can do this by adding body { background-color: black; } to our style element." ], From 2ab2604da64674dc7462e9ff75a9d03a2b81b771 Mon Sep 17 00:00:00 2001 From: dokkillo Date: Wed, 19 Aug 2015 21:00:39 +0200 Subject: [PATCH 29/80] issue #2118 --- challenges/bootstrap.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/bootstrap.json b/challenges/bootstrap.json index 610919a282..da7a510236 100644 --- a/challenges/bootstrap.json +++ b/challenges/bootstrap.json @@ -133,7 +133,7 @@ "", "

Click here for cat photos.

", "", - " ", + " ", "", "

Things cats love:

", "