Skip to content

#5991, #6282, jQuery.type #10

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.

Sign up for GitHub

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

Jump to bottom
Closed
rkatic wants to merge 27 commits into from
Closed

#5991, #6282, jQuery.type #10

rkatic wants to merge 27 commits into from

Conversation

@rkatic
Copy link
Contributor

@rkatic rkatic commented Sep 10, 2010

  • Distinguish plain objects from arrays in deep extending. Fixes #5991.
  • Added support for map of events in live, die, delegate and undelegate. Fixes #6282.
  • Made jQuery.type more consistent with host objects.

rkatic added 25 commits December 18, 2009 17:34
@rkatic
Made isPlainObject() supporting null, undefined, and window values on…
937036f 
… IE too. Also added some related tests. Fixes jquery#5669.
@rkatic
Merge branch 'master' of git://github.com/jquery/jquery
d987274 
Conflicts:
	src/core.js
@rkatic
Merge branch 'master' of git://github.com/jquery/jquery
391e712
@rkatic
Merge branch 'master' of git://github.com/jquery/jquery
6a56afd
@rkatic
Filtering elements only. Fixed #5920
849f158
@rkatic
Merge branch 'master' of git://github.com/jquery/jquery
edddcb3
@rkatic
Merge branch 'master' of git://github.com/jquery/jquery
26d836b
@rkatic
Ensured that arrays are not considered same as plain object on deep e…
ba8c934 
…xtending. Fixes #5991.
@rkatic
Forgotten to reset 'copyIsArray' in my last commit.
cff8cc4
@rkatic
Merge branch 'master' of git://github.com/jquery/jquery
ac20098
@rkatic
Added some tests for #5991.
1591ec2
@rkatic
Merge branch 'master' of git://github.com/jquery/jquery
ecc6034
@rkatic
Merge branch 'master' of git://github.com/jquery/jquery
a19a406
@rkatic
Merge branch 'master' of git://github.com/jquery/jquery
4c0ca98
@rkatic
Merge branch 'master' of git://github.com/jquery/jquery
c8fc687
@rkatic
Merge branch 'master' of git://github.com/jquery/jquery
5cba876
@rkatic
Added support for map of events in live, die, delegate and undelegate…
0ed8cc6 
…. Fixes #6282.
@rkatic
Correcting some imperfections in test added with commit 0ed8cc6.
33f74e3
@rkatic
Ensure that selector is not broken.
3a3a7cd
@rkatic
Merge commit 'jquery/master'
40c1d65
@rkatic
Merge branch 'master' of git://github.com/jquery/jquery
15f5d16
@rkatic
Made jQuery.type more consistent with host objects.
452c292
@rkatic
Merge branch 'master' of git://github.com/jquery/jquery
295d95a
@rkatic
Merge branch 'master' of git://github.com/jquery/jquery
a3bb2bd
@rkatic
Test jQuery.type also with document.
34b3216
@jeresig
Copy link
Member

jeresig commented Sep 22, 2010

I'm having trouble applying this pull - can you re-pull in from the current jQuery HEAD? Thanks!

$ curl http://github.com/jquery/jquery/pull/10.patch | git am
% Total % Received % Xferd Average Speed Time Time Time Current
Dload Upload Total Spent Left Speed
100 16719 100 16719 0 0 17537 0 --:--:-- --:--:-- --:--:-- 19020
Applying: Made isPlainObject() supporting null, undefined, and window values on IE too. Also added some related tests. Fixes #5669.
error: patch failed: src/core.js:425
error: src/core.js: patch does not apply
error: patch failed: test/unit/core.js:204
error: test/unit/core.js: patch does not apply
Patch failed at 0001 Made isPlainObject() supporting null, undefined, and window values on IE too. Also added some related tests. Fixes #5669.

@rkatic
Copy link
Contributor Author

rkatic commented Sep 22, 2010

Done. Try now.

@jeresig
Copy link
Member

jeresig commented Sep 23, 2010

I've landed all of this.

@lock lock bot locked as resolved and limited conversation to collaborators Jan 19, 2019
This pull request was closed.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@rkatic @jeresig @leeoniya