Skip to content

Style and typography fixes, and code style adherence in the JavaScript 101 section. #312

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

Closed
wants to merge 3 commits into from
Closed

Style and typography fixes, and code style adherence in the JavaScript 101 section. #312

wants to merge 3 commits into from

Conversation

alimony
Copy link

@alimony alimony commented Mar 14, 2013

See commit messages for details.

@alimony
Copy link
Author

alimony commented Mar 14, 2013

Sigh, that was a mess of commits, I will have to clean it up.

@alimony
Copy link
Author

alimony commented Mar 14, 2013

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?

@rdworth
Copy link
Contributor

rdworth commented Mar 14, 2013

Markus Amalthea Magnuson 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.
@alimony
Copy link
Author

alimony commented Mar 14, 2013

@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, git reset --hard upstream/master and then rebasing branch over master did it this time, this pull request looks better now.

Sorry for the trouble.

@ajpiano ajpiano closed this in 6e0db70 Mar 15, 2013
@ajpiano
Copy link
Member

ajpiano commented Mar 15, 2013

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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants