Skip to content

Conversation

spadin
Copy link
Contributor

@spadin spadin commented Jun 10, 2011

I created a page in the jQuery chapter explaining how to write a jQuery plugin using CoffeeScript.

@peterhellberg
Copy link
Member

Looks good :) I’ll add you to the collaborators list as soon as I get the correct admin rights sorted out.

@thirdtruck
Copy link
Member

You beat me to the punch, spadin. :) That's what I get for not checking the original repository more often, but at least it gives me the chance to handle my first multi-person merge conflict.

Could I get your input on the proposed edit, spadin, before I push it upstream? Thanks!
https://github.com/thirdtruck/coffeescript-cookbook.github.com/blob/master/chapters/jquery/ajax.textile

@spadin
Copy link
Contributor Author

spadin commented Jun 13, 2011

@thirdtruck I'm not sure how our two commits conflict. I created a new plugin.textile file and you're referring to ajax.textile.

peterhellberg added a commit that referenced this pull request Jun 19, 2011
Adding a jQuery plugin template.
@peterhellberg peterhellberg merged commit 4618c34 into coffeescript-cookbook:master Jun 19, 2011
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.

3 participants