Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
J
jquery
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
夏彬
jquery
Commits
c10f8712
Commit
c10f8712
authored
Jul 16, 2009
by
Yehuda Katz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jQuery.extend(true, Object, Object) copies custom objects correctly.
- Also update jQuery.isObject to handle this case correctly
parent
8d52c278
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
5 deletions
+25
-5
core.js
src/core.js
+13
-3
core.js
test/unit/core.js
+12
-2
No files found.
src/core.js
View file @
c10f8712
...
@@ -243,9 +243,15 @@ jQuery.extend = jQuery.fn.extend = function() {
...
@@ -243,9 +243,15 @@ jQuery.extend = jQuery.fn.extend = function() {
// Recurse if we're merging object values
// Recurse if we're merging object values
if
(
deep
&&
copy
&&
typeof
copy
===
"object"
&&
!
copy
.
nodeType
)
{
if
(
deep
&&
copy
&&
typeof
copy
===
"object"
&&
!
copy
.
nodeType
)
{
target
[
name
]
=
jQuery
.
extend
(
deep
,
var
clone
;
// Never move original objects, clone them
src
||
(
jQuery
.
isArray
(
copy
)
?
[
]
:
{
}
),
copy
);
if
(
src
)
clone
=
src
;
else
if
(
jQuery
.
isArray
(
copy
)
)
clone
=
[
];
else
if
(
jQuery
.
isObject
(
copy
)
)
clone
=
{
};
else
clone
=
copy
;
// Never move original objects, clone them
target
[
name
]
=
jQuery
.
extend
(
deep
,
clone
,
copy
);
// Don't bring in undefined values
// Don't bring in undefined values
}
else
if
(
copy
!==
undefined
)
{
}
else
if
(
copy
!==
undefined
)
{
...
@@ -281,6 +287,10 @@ jQuery.extend({
...
@@ -281,6 +287,10 @@ jQuery.extend({
return
toString
.
call
(
obj
)
===
"[object Array]"
;
return
toString
.
call
(
obj
)
===
"[object Array]"
;
},
},
isObject
:
function
(
obj
)
{
return
this
.
constructor
.
call
(
obj
)
===
Object
;
},
// check if an element is in a (or is an) XML document
// check if an element is in a (or is an) XML document
isXMLDoc
:
function
(
elem
)
{
isXMLDoc
:
function
(
elem
)
{
return
elem
.
nodeType
===
9
&&
elem
.
documentElement
.
nodeName
!==
"HTML"
||
return
elem
.
nodeType
===
9
&&
elem
.
documentElement
.
nodeName
!==
"HTML"
||
...
...
test/unit/core.js
View file @
c10f8712
...
@@ -435,7 +435,7 @@ test("jQuery.merge()", function() {
...
@@ -435,7 +435,7 @@ test("jQuery.merge()", function() {
});
});
test
(
"jQuery.extend(Object, Object)"
,
function
()
{
test
(
"jQuery.extend(Object, Object)"
,
function
()
{
expect
(
2
1
);
expect
(
2
3
);
var
settings
=
{
xnumber1
:
5
,
xnumber2
:
7
,
xstring1
:
"peter"
,
xstring2
:
"pan"
},
var
settings
=
{
xnumber1
:
5
,
xnumber2
:
7
,
xstring1
:
"peter"
,
xstring2
:
"pan"
},
options
=
{
xnumber2
:
1
,
xstring2
:
"x"
,
xxx
:
"newstring"
},
options
=
{
xnumber2
:
1
,
xstring2
:
"x"
,
xxx
:
"newstring"
},
...
@@ -463,9 +463,19 @@ test("jQuery.extend(Object, Object)", function() {
...
@@ -463,9 +463,19 @@ test("jQuery.extend(Object, Object)", function() {
var
empty
=
{};
var
empty
=
{};
var
optionsWithLength
=
{
foo
:
{
length
:
-
1
}
};
var
optionsWithLength
=
{
foo
:
{
length
:
-
1
}
};
jQuery
.
extend
(
true
,
empty
,
optionsWithLength
);
jQuery
.
extend
(
true
,
empty
,
optionsWithLength
);
isObj
(
empty
.
foo
,
optionsWithLength
.
foo
,
"The length property must copy correctly"
);
isObj
(
empty
.
foo
,
optionsWithLength
.
foo
,
"The length property must copy correctly"
);
empty
=
{};
var
optionsWithDate
=
{
foo
:
{
date
:
new
Date
}
};
jQuery
.
extend
(
true
,
empty
,
optionsWithDate
);
isObj
(
empty
.
foo
,
optionsWithDate
.
foo
,
"Dates copy correctly"
);
var
myKlass
=
function
()
{};
empty
=
{};
var
optionsWithCustomObject
=
{
foo
:
{
date
:
new
myKlass
}
};
jQuery
.
extend
(
true
,
empty
,
optionsWithCustomObject
);
isObj
(
empty
.
foo
,
optionsWithCustomObject
.
foo
,
"Custom objects copy correctly"
);
var
nullUndef
;
var
nullUndef
;
nullUndef
=
jQuery
.
extend
({},
options
,
{
xnumber2
:
null
});
nullUndef
=
jQuery
.
extend
({},
options
,
{
xnumber2
:
null
});
ok
(
nullUndef
.
xnumber2
===
null
,
"Check to make sure null values are copied"
);
ok
(
nullUndef
.
xnumber2
===
null
,
"Check to make sure null values are copied"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment