Commit Graph

313 Commits

Author SHA1 Message Date
Arsen Melikyan
f58e3c07bc Merge pull request #3125 from natac13/change-test-in-javascript-challenges-and-add-optional-spaces-in-jquery-aswell
Test improvements, single and double quote jQuery selectors
2015-09-09 08:39:42 +04:00
Aniruddh Agarwal
9067154566 Fix typo in basic-javascript waypoint
Waypoint 'Invert Regular Expression Matches with JavaScript' had a semi-colon in the description for the regex example which is not needed.
closes #3148
2015-09-09 11:52:21 +08:00
Arsen Melikyan
90805e1aaa Merge pull request #3181 from awesomeaniruddh/awesomeaniruddh-3169
Fixed typo in Basic Javascript Waypoint
2015-09-09 07:44:40 +04:00
Arsen Melikyan
09c7475145 Merge pull request #3102 from AryanJ-NYC/AryanJ-NYC-1875
Clarified instructions for shift() challenge
2015-09-09 07:25:03 +04:00
Aniruddh Agarwal
1c618799b4 Fixed typo in Basic Javascript Waypoint
Waypoint 'Sift through Text with Regular Expressions' had `...` in its description instead of `.`. Made the required changes.
closes #3169
2015-09-09 10:02:08 +08:00
Aryan Jabbari
b54b2de9ab Clarifies instructions for shift() challenge; closes #1875 2015-09-08 17:31:15 -04:00
Anton Strömkvist
c815084d10 Merge pull request #3087 from bugron/bugron-toLowerCase_fix
Fixes 'd[0].toLowerCase() is not a function' error
2015-09-08 22:33:54 +02:00
Anton Strömkvist
bd0f7c1c23 Merge pull request #3091 from bugron/bugron-divide_fix
fixes a condition in assert
2015-09-08 22:29:04 +02:00
Anton Strömkvist
3c28cc3cc6 Merge pull request #3088 from bugron/bugron-add_two_num-fix
fixes assert and adds a dot
2015-09-08 22:24:11 +02:00
Arsen Melikyan
83c1b5c8aa Merge pull request #3153 from ahstro/ahstro-3152
Move brace out of user-edit scope
2015-09-08 23:25:25 +04:00
Anton Strömkvist
4b2c209a22 Merge pull request #2921 from bugron/bugron-2803
fixes an idle test and some text
2015-09-08 21:07:55 +02:00
Arsen Melikyan
91d3959bfd Merge pull request #2953 from dmytroyarmak/dmytroyarmak-2948
Add output block to "Iterate with JavaScript For Loops" challange
2015-09-08 21:37:00 +04:00
bugron
e0db3181d3 fixes an idle test and some text 2015-09-08 19:13:20 +04:00
Dmytro Yarmak
ccb88cadf3 Add output block to "Iterate with JavaScript While Loops" challange 2015-09-08 10:59:14 +03:00
Anton Strömkvist
7a3e84cb0d Merge pull request #2739 from bugron/bugron-1881
Changes nonexistent variable name to proper one
2015-09-08 01:57:41 +02:00
ahstro
0055c3b271 Move brace out of user-edit scope
Move the closing brace of a function down below the
`// Only change code above this line`-comment in
`Use Conditional Logic with IfElse Statements`

Fix #3152
2015-09-07 22:56:27 +02:00
Jakob Dahl
033175ae23 Updated and rebased pr 2015-09-07 03:08:08 +02:00
natac13
34246716c0 Test improvements
changed the jquery selector to account for single and double quotes
as well as optional spaces on:
[Give your JavaScript Slot Machine some stylish images](http://www.freecodecamp.com/challenges/waypoint-give-your-javascript-slot-machine-some-stylish-images)
[Bring your JavaScript Slot Machine to Life](http://www.freecodecamp.com/challenges/waypoint-bring-your-javascript-slot-machine-to-life)
[Target the same element with multiple jQuery Selectors](http://www.freecodecamp.com/challenges/waypoint-target-the-same-element-with-multiple-jquery-selectors)
[Target the Parent of an Element Using jQuery](http://www.freecodecamp.com/challenges/waypoint-target-the-parent-of-an-element-using-jquery)
2015-09-06 13:12:06 -04:00
Arsen Melikyan
c8dee301ee Merge pull request #3109 from AryanJ-NYC/AryanJ-NYC-2136
Added details to instructions of JS arrays waypoint
2015-09-06 10:18:44 +04:00
Aryan Jabbari
0f46ed8c9d Used strict equality for second assert 2015-09-06 00:39:07 -04:00
Aryan Jabbari
2817ec49a9 Checks that length is used twice for JS bracket notation challenges; closes #3105 2015-09-06 00:37:12 -04:00
Aryan Jabbari
aa34bf1a41 Added details to instructions of JS arrays waypoint; closes #2136 2015-09-05 20:53:54 -04:00
bugron
f417adc2d1 fixes a condition in assert 2015-09-05 19:20:41 +04:00
bugron
f4512dd929 fixes assert and some text 2015-09-05 18:05:09 +04:00
bugron
7289607f07 Fixes 'd[0].toLowerCase() is not a function' error 2015-09-05 16:38:09 +04:00
Quincy Larson
6bcc72ece7 Merge pull request #3002 from dmytroyarmak/dmytroyarmak-2999
Improve test cases for Generate Random Whole Numbers within a Range
2015-09-04 15:27:36 -07:00
natac13
d789633494 Added tests to JavaScript Give Slot Machine Some Style
The challenge could be passed by copying the code 3 times.
Made new tests to stop this

closes #2111
2015-09-04 13:48:51 -04:00
Dmytro Yarmak
dd5feb4a2c Improve test cases for Generate Random Whole Numbers within a Range 2015-09-02 23:17:33 +03:00
Dmytro Yarmak
bdd2803923 Add output block to "Iterate with JavaScript For Loops" challange 2015-09-01 13:41:40 +03:00
Atik Shaikh
da6fdcb9e5 Update basic-javascript.json 2015-08-31 00:49:27 +05:30
Ben McMahon
20d58b5208 Merge pull request #2490 from abhisekp/patch-3
Add correction to Waypoint - Sift through Text with Regular Expressions
2015-08-30 16:16:48 +01:00
Abhisek Pattnaik
a2db581771 Change challenge seed 2015-08-30 20:37:32 +05:30
Abhisek Pattnaik
a0f700b7db Merge remote-tracking branch 'upstream/staging' into patch-3 2015-08-30 13:49:04 +05:30
Natac13
20462582f4 fixed minor typo where there was a 's' left when the sentence was changed. Issue #2853 2015-08-29 18:30:16 -04:00
Ben McMahon
e3e1f16195 Merge pull request #2820 from AEA2002/staging
Minor edit in Find the Nth Character
2015-08-29 19:25:29 +01:00
Ben McMahon
fc5316f545 Merge pull request #2821 from uwaseem/uwaseem-1979
Fixed typo for issue 1979
2015-08-29 19:23:46 +01:00
bugron
beab6a4472 fixes 'editor.getValue(...).match(...) is null' 2015-08-29 02:35:06 +04:00
waseem
eec0d073f1 Fixed typo for issue 1979 2015-08-29 04:08:48 +08:00
ahstro
33ed3ae8b0 return(foo) => return foo 2015-08-27 22:19:03 +02:00
Arsen Melikyan
b24f367749 Changes nonexistent variable name to proper one 2015-08-26 18:59:59 +04:00
AEA2002
b9cfc09eb9 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..."
2015-08-25 18:34:31 -04:00
Aniruddh Agarwal
57c3261415 replaced + by . 2015-08-25 22:42:58 +08:00
Aniruddh Agarwal
0cc032a6e9 fixed conflicts 2015-08-25 22:21:33 +08:00
Aniruddh Agarwal
beb537d5eb Cleaned up description for 'Sift through Text with Regular Expressions' waypoint 2015-08-25 20:26:32 +08:00
Aniruddh Agarwal
5ce26c5b4b Expanded description of 'Build Javacript Objects' waypoint 2015-08-25 19:36:47 +08:00
Quincy Larson
048a7d3dce Merge pull request #2620 from bugron/bugron-1522
Fixes missing backslash in waypoints' instructions'
2015-08-24 19:02:22 -07:00
Quincy Larson
e5a9b697ae Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-24 17:54:00 -07:00
bugron
f750182a4b Adds a desctiption to avoid confusion in JS challenges 2015-08-25 04:41:02 +04:00
Berkeley Martinez
26e1f3fdac Merge pull request #2568 from AryanJ-NYC/AryanJ-NYC-1876
Fixed #1876; fixed some grammar issues; adhered to JS comment convent…
2015-08-24 11:14:32 -07:00
Berkeley Martinez
c82909de0c Merge pull request #2596 from suhussai/suhussai-2592
Typo Fix. Closes #2592
2015-08-24 11:03:34 -07:00
Arsen Melikyan
d54bbaaf2d Fixes missing backslash in waypoints' instructions'
In three waypoints: [Find Numbers with Regular Expressions](http://www.freecodecamp.com/challenges/waypoint-find-numbers-with-regular-expressions), [Find White Space with Regular Expressions](http://www.freecodecamp.com/challenges/waypoint-find-white-space-with-regular-expressions), [Invert Regular Expression Matches with JavaScript](http://www.freecodecamp.com/challenges/waypoint-invert-regular-expression-matches-with-javascript) there are confusing instructions: /d+/gi instead of /\d+/gi, /s+/gi instead of /\s+/gi, /S+/gi instead of /\S+/gi.This commit fixed them.
2015-08-24 14:48:38 +04:00
benmcmahon100
8136443f87 Fix #2605 2015-08-24 00:22:35 +01:00
suhussai
2cc09ce374 Typo Fix. Closes #2592
Changed "greater then" to "greater than" in Waypoint 30, http://freecodecamp.com/challenges/waypoint-generate-random-whole-numbers-with-javascript
2015-08-23 12:20:28 -06:00
Aryan Jabbari
ba0ff40604 Fixed #1876; fixed some grammar issues; adhered to JS comment conventions 2015-08-23 05:19:45 -04:00
Quincy Larson
9fc3fd72b1 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-22 18:08:37 -07:00
Quincy Larson
ebf1530d6f update JavaScript copy from pull request 2015-08-22 17:40:59 -07:00
Berkeley Martinez
810e40e4db Merge pull request #2505 from issyl0/fix_typo_iterate_with_js
In the while loop iterator section, advise while loops, not for loops
2015-08-22 17:22:14 -07:00
Abhisek Pattnaik
3b6da88e7f Fix error in string 2015-08-23 03:26:20 +05:30
Abhisek Pattnaik
e87913edad Fix Add your JavaScript Slot Machine Instructions 2015-08-23 03:22:05 +05:30
Isabell Long
1206655940 In the while loop iterator section, advise while loops, not for loops
- Fixes #2504.
2015-08-22 20:27:08 +01:00
Berkeley Martinez
f90f59f0c6 Merge pull request #2498 from issyl0/add_full_stops
Add full stops at the end of "Random Whole Number" waypoint
2015-08-22 10:14:04 -07:00
Isabell Long
a816dc5a19 Add periods at the end of sentences in the Random Whole Number waypoint
- Partially fixes #1991.
2015-08-22 18:08:58 +01:00
waseem
7fad44e648 Fixed grammar - replaced 'but' with 'by' 2015-08-22 22:21:15 +08:00
Abhisek Pattnaik
c5c68c252c Correct Sift through Text with Regular Expressions
- Change information text
- Change regular expression
- Change code in editor
- Change assertion
2015-08-22 19:05:41 +05:30
benmcmahon100
cd511ad314 Merge remote-tracking branch 'origin/staging' into staging 2015-08-21 22:40:18 +01:00
benmcmahon100
ae6746f978 Fix a syntax(ish) error 2015-08-21 22:37:34 +01:00
benmcmahon100
ae43cb0fa3 Merge pull request #2451 from ahstro/ahstro-2440
Moved myArray into 'Only change code'-block
2015-08-21 22:34:16 +01:00
benmcmahon100
0f1baeeb68 Merge remote-tracking branch 'origin/staging' into staging 2015-08-21 22:01:11 +01:00
benmcmahon100
e33a929f0c Fix #2444 2015-08-21 22:01:03 +01:00
Berkeley Martinez
c32e89baff fix delete is a keyword not a function 2015-08-21 12:37:47 -07:00
ahstro
ae6271964f Moved myArray into 'Only change code'-block 2015-08-21 21:22:25 +02:00
benmcmahon100
9584c7870a Update JSON 2015-08-21 20:20:56 +01:00
benmcmahon100
4de75fc9e7 Fix #2364 2015-08-20 23:38:16 +01:00
dokkillo
87c01aae52 issue 2270 2015-08-20 17:21:10 +02:00
benmcmahon100
f1053a2f68 Merge pull request #2235 from dokkillo/dokkillo-2218
issue #2218
2015-08-19 23:14:09 +01:00
dokkillo
2d06e35afe issue #2218 2015-08-19 23:45:58 +02:00
benmcmahon100
576dcf1345 Merge pull request #1975 from AryanJ-NYC/AryanJ-NYC-1909
Fixed #1909 #1972
2015-08-19 21:31:16 +01:00
benmcmahon100
e05aab352d Merge pull request #1977 from AryanJ-NYC/AryanJ-NYC-1944
Fixed #1944
2015-08-19 21:30:58 +01:00
benmcmahon100
c6cb1a0742 Merge pull request #1985 from AryanJ-NYC/AryanJ-NYC-1982
Fixed #1982
2015-08-19 21:30:25 +01:00
benmcmahon100
c3da5e9373 Merge pull request #1990 from AryanJ-NYC/AryanJ-NYC-1924
Fixes #1924
2015-08-19 21:30:17 +01:00
benmcmahon100
e18c3547e3 Merge pull request #1998 from itxchy/patch-2
Issue: Grammar #1994
2015-08-19 21:29:25 +01:00
benmcmahon100
7f712ffca3 Merge pull request #2003 from michael-krebs/michael-krebs-1986
fix #1986
2015-08-19 21:28:13 +01:00
benmcmahon100
c8de9d63fb Merge pull request #2004 from michael-krebs/michael-krebs-1988
fix #1988
2015-08-19 21:27:54 +01:00
benmcmahon100
a2d48f8b60 Merge pull request #2006 from itxchy/patch-4
Fixed: Misspell #1877
2015-08-19 21:27:34 +01:00
benmcmahon100
502a255253 Merge pull request #2069 from AryanJ-NYC/AryanJ-NYC-2036
Fixes #2036
2015-08-19 21:24:24 +01:00
benmcmahon100
45f0de877a Merge pull request #2074 from jbmartinez/jbmartinez-2049
Fixed #2049
2015-08-19 21:23:05 +01:00
benmcmahon100
79e259a0e7 Merge pull request #2127 from ptsurbeleu/staging
fix issue #2124 and rephrase the challenge a bit to avoid confusion
2015-08-19 21:22:12 +01:00
benmcmahon100
ca80196412 Merge pull request #2213 from dokkillo/staging
issue #2191
2015-08-19 19:11:27 +01:00
dokkillo
933d1edeee issue #2191 2015-08-19 19:12:51 +02:00
Ionut Costica
8e705b14ec Fix for Issue #2179, #2141, #2077, #1999
Fixes #2179, #2141, #2077, #1999
2015-08-19 15:43:39 +03:00
Ionut Costica
a519565edf Fix for Issue #2175
Fixes #2175
2015-08-19 15:08:57 +03:00
Pavel Tsurbeleu
0df76dc7b7 fix issue #2124 and rephrase the challenge a bit to avoid confusion 2015-08-18 15:17:26 -07:00
Juan Martínez
91795de83f Fixed #2049 2015-08-18 14:05:51 +00:00
Aryan Jabbari
1822a207d3 Fixes #2036 2015-08-18 09:34:34 -04:00
Matt Trifilo
e06b348918 Fixed: Misspell #1877
Issue #1877's description's hint mentioned the wrong variable.
2015-08-17 23:29:11 -05:00
Michael Krebs
3e520811d0 fix #1988 2015-08-18 00:22:33 -04:00
Michael Krebs
817684de4e fix #1986 2015-08-18 00:17:56 -04:00
Matt Trifilo
9a828c9d3e Issue: Grammar #1994
Put in the proposed grammar changes from [this issue](https://github.com/FreeCodeCamp/FreeCodeCamp/issues/1994).
2015-08-17 23:01:52 -05:00
Aryan Jabbari
5d54d98190 Fixes #1924 2015-08-17 22:54:08 -04:00
Aryan Jabbari
b3875a3d6e Fixed #1982 2015-08-17 22:31:37 -04:00
Aryan Jabbari
fa31cdca0e Fixed #1944 2015-08-17 22:21:57 -04:00
Aryan Jabbari
32eeefa439 Fixed #1909 #1972 2015-08-17 22:19:14 -04:00
Aryan Jabbari
4d56972e21 Fixed #1926 2015-08-17 16:42:20 -04:00
Aryan Jabbari
0cab1ebfe5 Moved closing code to line 961 2015-08-17 16:34:45 -04:00
Aryan Jabbari
8722a0a294 Fixes #1878 2015-08-17 16:19:02 -04:00
benmcmahon100
7c360285aa Spaced out code a bit more on the shift challenge 2015-08-17 21:12:19 +01:00
benmcmahon100
0bbb5cf122 fixed the moved some comments in a seed that were causing confusion 2015-08-17 21:11:01 +01:00
benmcmahon100
9727f3e520 Merge pull request #1812 from AryanJ-NYC/AryanJ-NYC-1807
Fixes #1807
2015-08-17 20:22:55 +01:00
benmcmahon100
b35c77deb7 Fix #1871 2015-08-17 20:11:04 +01:00
benmcmahon100
93a7fa1c34 Fix #1870 #1874 and there was another issue but i cant find it related to the arithmetic on decimals challenge 2015-08-17 20:08:21 +01:00
benmcmahon100
4b2a53f974 Merge pull request #1857 from AryanJ-NYC/AryanJ-NYC-1856
Fixes #1856
2015-08-17 14:53:40 +01:00
Aryan Jabbari
6cf25e6a35 Fixes #1856 2015-08-17 09:52:34 -04:00
benmcmahon100
d601240b98 Merge remote-tracking branch 'origin/staging' into staging 2015-08-17 14:28:54 +01:00
benmcmahon100
946717fc65 Fix #1838 2015-08-17 14:28:30 +01:00
benmcmahon100
06c3d78c64 Update basic-javascript.json 2015-08-17 14:16:16 +01:00
benmcmahon100
e63c387ef7 Merge pull request #1815 from AryanJ-NYC/AryanJ-NYC-1813
Fixed #1813
2015-08-17 14:15:37 +01:00
Aryan Jabbari
fda754f187 Fixed #1813 2015-08-16 20:47:43 -04:00
Aryan Jabbari
854406e5fa Fixes #1807 2015-08-16 20:14:12 -04:00
Aryan Jabbari
ae4ec8e9fd Deleted extra comma 2015-08-16 20:08:37 -04:00
Aryan Jabbari
1790b14808 Fixes #1801 2015-08-16 20:06:47 -04:00
benmcmahon100
9c7b651827 Fixed a challenge test on modify array data with indexes 2015-08-16 20:17:06 +01:00
Quincy Larson
bce3b34f9b improvements to javascript challenges 2015-08-16 04:05:15 -07:00
Quincy Larson
1fbb2a32f8 fix nested array challenge 2015-08-15 15:56:56 -07:00
Quincy Larson
40e14c3999 fix critical failing test in early waypoint 2015-08-15 15:33:21 -07:00
Quincy Larson
f2ee2e4031 update JavaScript challenges 2015-08-15 13:57:44 -07:00
Quincy Larson
98bf10a7d3 QA javascript challenges and remove slot machine for now 2015-08-15 11:11:25 -07:00
Quincy Larson
2bbad67141 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-14 17:29:28 -07:00
Quincy Larson
aed4b6bfe1 improvements to copy of text and test output 2015-08-14 17:26:24 -07:00
benmcmahon100
326c22276d Added a helper function to main.js for challenge making 2015-08-15 01:08:33 +01:00
Quincy Larson
e6297de282 add semicolons to end of all tests in js-style challenges 2015-08-14 14:48:59 -07:00
Quincy Larson
3a81e6efb3 improve javascript challenge copy 2015-08-14 14:40:02 -07:00
Quincy Larson
338485db8e Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-14 13:50:31 -07:00
Quincy Larson
28e0ad29cf more improvements to javascript challenges 2015-08-14 13:50:20 -07:00
benmcmahon100
d0b5bcd0b0 Fixed a weird error involving RegEx and single quotes 2015-08-14 20:26:05 +01:00
benmcmahon100
8a9a8710da Allow optional white space when nesting arrays 2015-08-14 12:08:40 +01:00
Quincy Larson
af3f6bb109 more improvements to javascript challenges 2015-08-14 01:13:07 -07:00
Quincy Larson
99e7116ee5 make additional improvements to JavaScript challenge copy 2015-08-13 23:44:13 -07:00
Quincy Larson
f3cef6de46 finish jquery and start modifying javascript 2015-08-13 22:07:54 -07:00
Quincy Larson
fea723efbd Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/basic-javascript.json
	seed/challenges/object-oriented-and-functional-programming.json
2015-08-13 15:39:30 -07:00
Quincy Larson
3f05565739 use double quotes for all string literals in waypoints 2015-08-13 15:32:40 -07:00
benmcmahon100
095552dbbe Added a more specific example 2015-08-13 21:25:31 +01:00
Quincy Larson
d138757c52 Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/bootstrap.json
	seed/challenges/jquery.json
2015-08-12 02:06:03 -07:00
benmcmahon100
1dc66b7671 First four OOP challenges and the final slot machine challenge. 2015-08-12 00:11:56 +01:00
benmcmahon100
9df99eb635 Removed new incomplete JS Challenges and moved to OOPF branch. 2015-08-11 15:39:07 +01:00
Quincy Larson
db6db2e403 Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/bootstrap.json
2015-08-10 22:03:51 -07:00
sonorangirl
fb44b50941 Made some spaces optional for 4th test 2015-08-10 19:32:52 -07:00
sonorangirl
8efe8ee825 Fixed RegEx so that 4th test would pass 2015-08-10 19:22:18 -07:00
sonorangirl
8a16942036 Fixed typos in 1st slot machine challenge 2015-08-10 18:05:07 -07:00
Isabell Long
76e4fc2d33 Fix typos in the Basic Javascript challenge
- Partially fixes #1519 - looks like some of those typos had already
  been fixed.
2015-08-09 19:32:10 +00:00
Berkeley Martinez
1d724f145e Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging 2015-08-09 22:58:46 -07:00