Skip to content

Update jQuery to 1.7 #30

Merged
merged 1 commit into from Nov 9, 2011

9 participants

@evanwalsh

The new version of jQuery has been released and I've updated the assets and the version file.

@adamyonk
adamyonk commented Nov 4, 2011

Ship it!

@JangoSteve
Ruby on Rails member

Could you rebase these two commits into one please (no need to create a new pull request though, just force push it to update this one)? I'll have to update jquery-ujs with jquery 1.7 and make sure all the tests are passing before pulling this in.

@evanwalsh

All right. Commit dbfa580 should have all the changes needed. Still getting the hang of this advanced git stuff. Thanks!

@kaluznyo
kaluznyo commented Nov 7, 2011

up ?

@halorgium

halorgium@f60adfa has the squashed commit.
I can't seem to push to this pull request.

@JangoSteve
Ruby on Rails member

@evanwalsh, you now have 4 commits in this pull request instead of one. You can squash the commits down by doing an interactive rebase. Then force-push them to your master branch with git push -f origin master. That will then automatically update this pull request.

@overture8

+1

@kenips
kenips commented Nov 9, 2011

What is the planned version number for the next release? I'd like to see it moving to 1.1.x since jQuery 1.7 has some major changes. That way I can make sure all the old projects are capped at 1.0.x until they are ready for jQuery 1.7.

@nicolai86

+1

@evanwalsh

There. Finally got it. Thanks for your help, @JangoSteve.

@JangoSteve
Ruby on Rails member

@evanwalsh, almost there! Now you checked in a merge conflict in https://github.com/rails/jquery-rails/pull/30/files#diff-0. Fix that and I'll pull this in in the morning.

@evanwalsh

Ok. I fixed it.

My first pull request and this is what happens @_@.

@kenips
kenips commented Nov 9, 2011

Note that we're also hitting the following jQuery 1.7 deprecations in jquery_ujs.js

.live(): line 289, 293, 309, 317, 347, 359, 363
.data(“events”): line 255

The .live()s are easy to fix with .on(), but I'm not sure how to go about fixing .data("events").

@vizjerai
vizjerai commented Nov 9, 2011

.data("events") is supposed to be accessible through .events If that doesn't work they could be read through an internal method ._data(element, "events") But it may get removed or renamed in the future.

source: http://blog.jquery.com/2011/11/08/building-a-slimmer-jquery/

@JangoSteve
Ruby on Rails member

@kenips and @vizjerai, that'll all be taken care of over on rails/jquery-ujs. We can continue the discussion there if you'd like.

@evanwalsh haha no worries. The first of many in your open-source career ;-)

@JangoSteve JangoSteve merged commit d03c90e into rails:master Nov 9, 2011
@kenips
kenips commented Nov 9, 2011

@JangoSteve sounds good. If version bump could happen after pulling-in new ujs that'd be great.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.