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
14b88f60
Commit
14b88f60
authored
Oct 17, 2007
by
John Resig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for bug #1546 where a deep copy was attempted of DOM elements (which isn't needed).
parent
9ac9aaee
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
core.js
src/core.js
+1
-1
core.js
test/unit/core.js
+5
-4
No files found.
src/core.js
View file @
14b88f60
...
@@ -534,7 +534,7 @@ jQuery.extend = jQuery.fn.extend = function() {
...
@@ -534,7 +534,7 @@ jQuery.extend = jQuery.fn.extend = function() {
continue
;
continue
;
// Recurse if we're merging object values
// Recurse if we're merging object values
if
(
deep
&&
typeof
options
[
name
]
==
"object"
&&
target
[
name
]
)
if
(
deep
&&
typeof
options
[
name
]
==
"object"
&&
target
[
name
]
&&
!
options
[
name
].
nodeType
)
jQuery
.
extend
(
target
[
name
],
options
[
name
]
);
jQuery
.
extend
(
target
[
name
],
options
[
name
]
);
// Don't bring in undefined values
// Don't bring in undefined values
...
...
test/unit/core.js
View file @
14b88f60
...
@@ -778,7 +778,7 @@ test("is(String)", function() {
...
@@ -778,7 +778,7 @@ test("is(String)", function() {
});
});
test
(
"$.extend(Object, Object)"
,
function
()
{
test
(
"$.extend(Object, Object)"
,
function
()
{
expect
(
1
0
);
expect
(
1
1
);
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"
},
...
@@ -786,9 +786,9 @@ test("$.extend(Object, Object)", function() {
...
@@ -786,9 +786,9 @@ test("$.extend(Object, Object)", function() {
merged
=
{
xnumber1
:
5
,
xnumber2
:
1
,
xstring1
:
"peter"
,
xstring2
:
"x"
,
xxx
:
"newstring"
},
merged
=
{
xnumber1
:
5
,
xnumber2
:
1
,
xstring1
:
"peter"
,
xstring2
:
"x"
,
xxx
:
"newstring"
},
deep1
=
{
foo
:
{
bar
:
true
}
},
deep1
=
{
foo
:
{
bar
:
true
}
},
deep1copy
=
{
foo
:
{
bar
:
true
}
},
deep1copy
=
{
foo
:
{
bar
:
true
}
},
deep2
=
{
foo
:
{
baz
:
true
}
},
deep2
=
{
foo
:
{
baz
:
true
}
,
foo2
:
document
},
deep2copy
=
{
foo
:
{
baz
:
true
}
},
deep2copy
=
{
foo
:
{
baz
:
true
}
,
foo2
:
document
},
deepmerged
=
{
foo
:
{
bar
:
true
,
baz
:
true
}
};
deepmerged
=
{
foo
:
{
bar
:
true
,
baz
:
true
}
,
foo2
:
document
};
jQuery
.
extend
(
settings
,
options
);
jQuery
.
extend
(
settings
,
options
);
isObj
(
settings
,
merged
,
"Check if extended: settings must be extended"
);
isObj
(
settings
,
merged
,
"Check if extended: settings must be extended"
);
...
@@ -801,6 +801,7 @@ test("$.extend(Object, Object)", function() {
...
@@ -801,6 +801,7 @@ test("$.extend(Object, Object)", function() {
jQuery
.
extend
(
true
,
deep1
,
deep2
);
jQuery
.
extend
(
true
,
deep1
,
deep2
);
isObj
(
deep1
.
foo
,
deepmerged
.
foo
,
"Check if foo: settings must be extended"
);
isObj
(
deep1
.
foo
,
deepmerged
.
foo
,
"Check if foo: settings must be extended"
);
isObj
(
deep2
.
foo
,
deep2copy
.
foo
,
"Check if not deep2: options must not be modified"
);
isObj
(
deep2
.
foo
,
deep2copy
.
foo
,
"Check if not deep2: options must not be modified"
);
equals
(
deep1
.
foo2
,
document
,
"Make sure that a deep clone was not attempted on the document"
);
var
defaults
=
{
xnumber1
:
5
,
xnumber2
:
7
,
xstring1
:
"peter"
,
xstring2
:
"pan"
},
var
defaults
=
{
xnumber1
:
5
,
xnumber2
:
7
,
xstring1
:
"peter"
,
xstring2
:
"pan"
},
defaultsCopy
=
{
xnumber1
:
5
,
xnumber2
:
7
,
xstring1
:
"peter"
,
xstring2
:
"pan"
},
defaultsCopy
=
{
xnumber1
:
5
,
xnumber2
:
7
,
xstring1
:
"peter"
,
xstring2
:
"pan"
},
...
...
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