gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging

Browse Source
This commit is contained in:
Quincy Larson
2015-08-22 15:16:30 -07:00
parent a1cd8c8720 a28a79124c
commit bb64ff18a1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/js/main_0.0.3.js
View File

@ -62,8 +62,8 @@ $(document).ready(function() {
$('.close-modal').unbind('click'); $('.close-modal').unbind('click');
$('.close-modal').on('click', function(){ $('.close-modal').on('click', function(){
setTimeout(function() { setTimeout(function() {
$('#issue-modal').modal('hide'); $('#help-modal').modal('hide');
}, 2000); }, 200);
}); });
$('#report-issue').unbind('click'); $('#report-issue').unbind('click');

4
seed/challenges/basic-javascript.json
View File

@ -1277,8 +1277,8 @@
"description":[ "description":[
"Now that our slots will each generate random numbers, we need to check whether they've all returned the same number.", "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.", "If they have, we should notify our user that they've won.",
"Otherwise, we should return <code>null</code>, which is a JavaScript data structure that means nothing.", "Otherwise, we should return <code>null</code>, 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 change the value of win to the number that we have three of or leave it as null.", "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 <code>if statement</code> with multiple conditions in order to check whether all numbers are equal.", "Let's create an <code>if statement</code> with multiple conditions in order to check whether all numbers are equal.",
"<code>if(slotOne !== slotTwo || slotTwo !== slotThree){</code>", "<code>if(slotOne !== slotTwo || slotTwo !== slotThree){</code>",
"<code>&thinsp;&thinsp;return(null);</code>", "<code>&thinsp;&thinsp;return(null);</code>",