Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JSON/API Lesson Cleanup #4022

Merged

Conversation

ltegman
Copy link
Member

@ltegman ltegman commented Oct 30, 2015

@dcsan dcsan added the status: waiting review To be applied to PR's that are ready for QA, especially when additional review is pending. label Oct 30, 2015
@bugron
Copy link
Contributor

bugron commented Oct 30, 2015

@ltegman I've caused conflicts by merging #3986 which solves the second point from your list, so, please, rebase it.

@ltegman
Copy link
Member Author

ltegman commented Oct 30, 2015

Resolved 😄

"assert(editor.match(/\\s*?\\}\\s*?\\)\\s*?\\;/gi) && editor.match(/\\,\\s*?function\\s*?\\(\\s*?\\w*?\\s*?\\)\\s*?\\{/gi) && editor.match(/\\s*?\\}\\s*?\\)\\s*?\\;/gi).length === editor.match(/\\s*?function\\s*?\\(\\s*?\\w*?\\s*?\\)\\s*?\\{/gi).length, 'Each callback function should have a closing set of brackets and parenthesis.')",
"assert(editor.match(/\\$\\s*?\\.\\s*?getJSON\\s*?\\(\\s*?\"\\\/json\\\/cats\\.json\\?callback\\=\"\\s*?\\,\\s*?function\\s*?\\(\\s*?json\\s*?\\)\\s*?\\{/gi), 'You should be making use of the getJSON method given in the description to load data from the json file.')",
"assert(editor.match(/\\$\\s*?\\(\\s*?\\\"\\.message\\\"\\s*?\\)\\s*?\\.\\s*?html\\s*?\\(\\s*?JSON\\s*?\\.\\s*?stringify\\s*?\\(\\s*?json\\s*?\\)\\s*?\\)/gi), 'Don\\'t forget to make the <code>.html</code> change the contents of the message box so that it contains the result of the getJSON.')"
"assert(editor.match(/\\$\\s*?\\.\\s*?getJSON\\s*?\\(\\s*?(\\\"|\\')\\\/json\\\/cats\\.json\"\\s*?\\,\\s*?function\\s*?\\(\\s*?json\\s*?\\)\\s*?\\{/gi), 'You should be making use of the getJSON method given in the description to load data from the json file.')",

This comment was marked as off-topic.

This comment was marked as off-topic.

+ Fixes Convert JSON to HTML lesson (Closes freeCodeCamp#4016)
+ Add Formatting to Geolocation lesson output (Closes freeCodeCamp#4010)
+ Fixes Render Images lesson
+ Removes unnecessary `?callback=` from JSON challenges. (Closes freeCodeCamp#3972)
+ Lots of other formatting and consistancy changes.
+ Also closes freeCodeCamp#3962 and closes freeCodeCamp#3969
@ltegman
Copy link
Member Author

ltegman commented Oct 30, 2015

Leftover regex \" replaced with (\\\"|\\') as per @BerkeleyTrue's comment.

BerkeleyTrue pushed a commit that referenced this pull request Oct 30, 2015
@BerkeleyTrue BerkeleyTrue merged commit 718681f into freeCodeCamp:staging Oct 30, 2015
@BerkeleyTrue BerkeleyTrue removed the status: waiting review To be applied to PR's that are ready for QA, especially when additional review is pending. label Oct 30, 2015
@BerkeleyTrue
Copy link
Contributor

👍

@ltegman ltegman deleted the fix/json-api-lesson-cleanup branch November 7, 2015 21:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants