Merge branch 'ahstro-3228' of https://github.com/ahstro/freecodecamp into ahstro-ahstro-3228

Conflicts:
	seed/challenges/basic-javascript.json
This commit is contained in:
Quincy Larson
2015-10-24 01:39:05 -07:00

View File

@ -1373,7 +1373,7 @@
"<code>}</code>" "<code>}</code>"
], ],
"tests": [ "tests": [
"assert((function(){var data = runSlots();if(data === null){return true}else{if(data[0] === data[1] && data[1] === data[2]){return true;}else{return false;}}})(), 'If all three of our random numbers are the same we should return that number. Otherwise we should return <code>null</code>.')" "assert((function(){var data = runSlots();return data === null || data.toString().length === 1;})(), 'If all three of our random numbers are the same we should return that number. Otherwise we should return <code>null</code>.')"
], ],
"challengeSeed": [ "challengeSeed": [
"fccss", "fccss",
@ -1556,9 +1556,10 @@
" ", " ",
" // Only change code above this line.", " // Only change code above this line.",
" ", " ",
" if(slotOne !== slotTwo || slotTwo !== slotThree){", " if(slotOne === slotTwo && slotTwo === slotThree){",
" return null;", " return slotOne;",
" }", " }",
" return null;",
" ", " ",
" if(slotOne !== undefined && slotTwo !== undefined && slotThree !== undefined){", " if(slotOne !== undefined && slotTwo !== undefined && slotThree !== undefined){",
" $(\".logger\").text(slotOne);", " $(\".logger\").text(slotOne);",
@ -1726,9 +1727,10 @@
" ", " ",
" // Only change code above this line.", " // Only change code above this line.",
" ", " ",
" if(slotOne !== slotTwo || slotTwo !== slotThree){", " if(slotOne === slotTwo && slotTwo === slotThree){",
" return null;", " return slotOne;",
" }", " }",
" return null;",
" ", " ",
" if(slotOne !== undefined && slotTwo !== undefined && slotThree !== undefined){", " if(slotOne !== undefined && slotTwo !== undefined && slotThree !== undefined){",
" $('.logger').html(slotOne);", " $('.logger').html(slotOne);",