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

Upgrade to jQuery 2.0 #2721

Merged
merged 1 commit into from
Apr 30, 2013

Conversation

bertpareyn
Copy link
Contributor

#2720

@nicolaasmatthijs
Copy link
Contributor

Because of the upcoming History.js work, the changes to ba-bbq and hashchange can be removed from this PR.

@bertpareyn
Copy link
Contributor Author

I can undo the changes but be aware that this will cause 2 errors in the logs on every page. I'm not sure if the errors impact any other functionality.

@nicolaasmatthijs
Copy link
Contributor

Yeah, I'm only going to merge this once the History.js work is merged

@bertpareyn
Copy link
Contributor Author

Removed the ba-bbq and ba-hashchange changes. Ready for review

@nicolaasmatthijs
Copy link
Contributor

Cool, once the History.js PR is in, this is good to be merged.

@nicolaasmatthijs
Copy link
Contributor

Actually, it looks like require-jquery now officially exists for jQuery 2.0 as well (https://github.com/jrburke/require-jquery/blob/master/jquery-require-sample/webapp/scripts/require-jquery.js). I think we can bring in that one, as it looks like some additional fixes have been introduced as part of that work.

@nicolaasmatthijs
Copy link
Contributor

Assigning back to @BP323 for following up on the last comment.

@ghost ghost assigned bertpareyn Apr 29, 2013
@bertpareyn
Copy link
Contributor Author

It looks like he didn't merge my PR but copied it because the file is identical to the one I sent in this PR. I squashed the commits to make it cleaner though. Assigning back to @nicolaasmatthijs for review.

@nicolaasmatthijs nicolaasmatthijs merged commit 5225a22 into oaeproject:newframework Apr 30, 2013
@nicolaasmatthijs
Copy link
Contributor

Looks good. Merged.

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.

2 participants