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

IE XHR method polyfill #1459

Closed
wants to merge 5 commits into from
Closed

IE XHR method polyfill #1459

wants to merge 5 commits into from

Conversation

michaelpapworth
Copy link

At line 30 of /src/ajax/xhr.js I've added a prefilter which resolves bug #13240, my branch taken from the 1.11.0-beta2 tag since the issue only effects IE<9 therefore not required as part of 2.x

@dmethvin
Copy link
Member

This won't work because we don't support ActiveXObject in the 2.x branch. I'm backing out a commit I made that implied we did.

@dmethvin dmethvin closed this Dec 16, 2013
@dmethvin
Copy link
Member

Sorry, ignore that comment.

@dmethvin dmethvin reopened this Dec 16, 2013
@markelog
Copy link
Member

@michaelpapworth could please rebase this with current 1.x-master.

@mgol
Copy link
Member

mgol commented Dec 16, 2013

@michaelpapworth Please sing our CLA.

Also, you shouldn't base your patch on a release tag but on a pure 1.x-master branch as @markelog said. See http://contribute.jquery.org/commits-and-pull-requests/

@michaelpapworth
Copy link
Author

@mzgol I've signed the CLA and re-based my branch against 1.x-master.

Thanks

@mgol
Copy link
Member

mgol commented Dec 17, 2013

@michaelpapworth There's still a lot of noise here. Look at the commits tab - there should be only one commit and it should be yours. Since you based your patch on the release tag, there are all this unnecessary dist/ & bower_modules/ files here.

EDIT: you should revert all this three Dave commits and then squash everything using git rebase -i 1.x-master. See e.g. http://ariejan.net/2011/07/05/git-squash-your-latests-commits-into-one/ for how to do that.

@michaelpapworth michaelpapworth deleted the ie-xhrmethod-polyfill branch December 17, 2013 14:08
@michaelpapworth
Copy link
Author

I've had some issues trying to squash these, I've decided for the sake of a few lines of code I'll start over and submit a new pull request (#1460)

@mgol
Copy link
Member

mgol commented Dec 17, 2013

@michaelpapworth You didn't have to close it, you could re-create your patch on a separate branch and then reset your branch to it (with --hard). Then git push --force would reset your pull request to the new version, keeping all comments history etc.

@michaelpapworth
Copy link
Author

@mzgol I'm sorry but I'm relatively new to GitHub and unfamiliar with the command line Kung Fu that goes with it. Should I continue with the new pull and abandon this one?

@mgol
Copy link
Member

mgol commented Dec 17, 2013

@michaelpapworth Yes, since you've already created one, let's continue there.

@lock lock bot locked as resolved and limited conversation to collaborators Jan 22, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants