Style and typography fixes, and code style adherence in the JavaScript 101 section.#312
Closed
alimony wants to merge 3 commits into
Closed
Style and typography fixes, and code style adherence in the JavaScript 101 section.#312alimony wants to merge 3 commits into
alimony wants to merge 3 commits into
Conversation
Author
|
Sigh, that was a mess of commits, I will have to clean it up. |
Author
|
Hmm, can't really get this to work, are all the previous commits' branches properly merged? Or am I just doing something wrong when rebasing my branch over master? |
Contributor
|
@alimony have you read http://contribute.jquery.org/commits-and-pull-requests/ ? |
added 3 commits
March 14, 2013 23:10
* Spaces to tabs. * Whitespace inside parentheses etc. * Insertion and removal of empty lines for spacing. * Comment reflow. * Remove a few redundant code blocks.
* Dot and parentheses on function names. * Better header style when only function names. * Inline code markup on more words. * Always link internal links with trailing slash. * Various small style adherence fixes.
Author
|
@rdworth Yes, I read it, but it seems like no matter how much I try to keep a straight brain when doing git stuff, it most often ends up messy :( Now, Sorry for the trouble. |
Member
|
Thanks @alimony. What happened here is definitely a good example of why it it's a good to make sure to stash and pull before committing :) |
rmurphey
added a commit
to rmurphey/learn.jquery.com
that referenced
this pull request
Mar 17, 2013
* master: (21 commits) 0.2.7 Remove remaining trailing whitespace from all pages. Fixes jquery#313. Style and typography fixes, and code style adherence in the JavaScript 101 section. Fixes jquery#312. 0.2.6 Correct comment in :input selector in Selecting Elements article. Fixes jquery#306. Expand the JavaScript 101 'Scope' article with more useful information and explanations. Fixes jquery#201. Added 0 to the list of falsy values in JavaScript 101 Conditional Code article. Fixes jquery#300. Fixes jquery#271 Inserted missing word in the JavaScript 101 Arrays article. Fixes jquery#299. Fixed inconsistency in showLinkLocation example in Basic Plugin Creation article. Fixes jquery#307. Fix example and other style cleanup in Basic Plugin Creation article. Fixes jquery#310. Fixes jquery#311. Update list of reserved words in JavaScript. Fixes jquery#301. Style and typography fixes and code style adherence in the Events section. Fixes jquery#294. Style and typography fixes, and code style adherence in the Effects section. Fixes jquery#290. Style and typography fixes, and code style adherence in the Code Organization section. Fixes jquery#287. Remove double ampersands in README header. Fixes jquery#284. Code and prose style improvements to all articles in Ajax chapter. Fixes jquery#283. Style fixes on the About page. Fixes jquery#279. Style guide fixes for the index, contributing, and About jQuery articles. Fixes jquery#270 relabel queue/dequeue content as advanced Added a missing 'i' in the for loop. Fixes jquery#280. ... Conflicts: page/ajax/ajax-and-forms.md page/ajax/jquery-ajax-methods.md page/effects/custom-effects.md page/effects/intro-to-effects.md page/events/event-basics.md page/events/event-helpers.md page/events/introduction-to-custom-events.md page/events/triggering-event-handlers.md
arthurvr
pushed a commit
to arthurvr/learn.jquery.com
that referenced
this pull request
Jan 4, 2015
…t 101 section. Fixes jquery#312.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See commit messages for details.