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
0ed497b0
Commit
0ed497b0
authored
Jan 08, 2013
by
Dave Methvin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resurrect buildFragment and sacrifice jQuery.clean. See gh-1117.
parent
ce67f0ce
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
46 deletions
+32
-46
core.js
src/core.js
+1
-2
manipulation.js
src/manipulation.js
+23
-25
core.js
test/unit/core.js
+8
-1
manipulation.js
test/unit/manipulation.js
+0
-18
No files found.
src/core.js
View file @
0ed497b0
...
@@ -496,8 +496,7 @@ jQuery.extend({
...
@@ -496,8 +496,7 @@ jQuery.extend({
return
[
context
.
createElement
(
parsed
[
1
]
)
];
return
[
context
.
createElement
(
parsed
[
1
]
)
];
}
}
parsed
=
context
.
createDocumentFragment
();
parsed
=
jQuery
.
buildFragment
(
[
data
],
context
,
scripts
);
jQuery
.
clean
(
[
data
],
context
,
parsed
,
scripts
);
if
(
scripts
)
{
if
(
scripts
)
{
jQuery
(
scripts
).
remove
();
jQuery
(
scripts
).
remove
();
}
}
...
...
src/manipulation.js
View file @
0ed497b0
...
@@ -310,8 +310,7 @@ jQuery.fn.extend({
...
@@ -310,8 +310,7 @@ jQuery.fn.extend({
if
(
this
[
0
]
)
{
if
(
this
[
0
]
)
{
doc
=
this
[
0
].
ownerDocument
;
doc
=
this
[
0
].
ownerDocument
;
fragment
=
doc
.
createDocumentFragment
();
fragment
=
jQuery
.
buildFragment
(
args
,
doc
,
false
,
this
);
jQuery
.
clean
(
args
,
doc
,
fragment
,
undefined
,
this
);
first
=
fragment
.
firstChild
;
first
=
fragment
.
firstChild
;
if
(
fragment
.
childNodes
.
length
===
1
)
{
if
(
fragment
.
childNodes
.
length
===
1
)
{
...
@@ -556,7 +555,7 @@ function getAll( context, tag ) {
...
@@ -556,7 +555,7 @@ function getAll( context, tag ) {
found
;
found
;
}
}
// Used in
clean
, fixes the defaultChecked property
// Used in
buildFragment
, fixes the defaultChecked property
function
fixDefaultChecked
(
elem
)
{
function
fixDefaultChecked
(
elem
)
{
if
(
manipulation_rcheckableType
.
test
(
elem
.
type
)
)
{
if
(
manipulation_rcheckableType
.
test
(
elem
.
type
)
)
{
elem
.
defaultChecked
=
elem
.
checked
;
elem
.
defaultChecked
=
elem
.
checked
;
...
@@ -619,9 +618,10 @@ jQuery.extend({
...
@@ -619,9 +618,10 @@ jQuery.extend({
return
clone
;
return
clone
;
},
},
clean
:
function
(
elems
,
context
,
fragmen
t
,
scripts
,
selection
)
{
buildFragment
:
function
(
elems
,
contex
t
,
scripts
,
selection
)
{
var
elem
,
i
,
j
,
tmp
,
tag
,
wrap
,
tbody
,
var
elem
,
i
,
j
,
tmp
,
tag
,
wrap
,
tbody
,
ret
=
[],
ret
=
[],
fragment
=
context
.
createDocumentFragment
(),
safe
=
context
===
document
&&
safeFragment
;
safe
=
context
===
document
&&
safeFragment
;
// Ensure that context is a document
// Ensure that context is a document
...
@@ -708,29 +708,27 @@ jQuery.extend({
...
@@ -708,29 +708,27 @@ jQuery.extend({
jQuery
.
grep
(
getAll
(
ret
,
"input"
),
fixDefaultChecked
);
jQuery
.
grep
(
getAll
(
ret
,
"input"
),
fixDefaultChecked
);
}
}
if
(
fragment
)
{
for
(
i
=
0
;
(
elem
=
ret
[
i
])
!=
null
;
i
++
)
{
for
(
i
=
0
;
(
elem
=
ret
[
i
])
!=
null
;
i
++
)
{
safe
=
jQuery
.
contains
(
elem
.
ownerDocument
,
elem
);
safe
=
jQuery
.
contains
(
elem
.
ownerDocument
,
elem
);
// Append to fragment
// Append to fragment
// #4087 - If origin and destination elements are the same, and this is
// #4087 - If origin and destination elements are the same, and this is
// that element, do not append to fragment
// that element, do not append to fragment
if
(
!
selection
||
jQuery
.
inArray
(
elem
,
selection
)
===
-
1
)
{
if
(
!
selection
||
jQuery
.
inArray
(
elem
,
selection
)
===
-
1
)
{
fragment
.
appendChild
(
elem
);
fragment
.
appendChild
(
elem
);
}
}
tmp
=
getAll
(
elem
,
"script"
);
tmp
=
getAll
(
elem
,
"script"
);
// Preserve script evaluation history
// Preserve script evaluation history
if
(
safe
)
{
if
(
safe
)
{
setGlobalEval
(
tmp
);
setGlobalEval
(
tmp
);
}
}
// Capture executables
// Capture executables
if
(
scripts
)
{
if
(
scripts
)
{
for
(
j
=
0
;
(
elem
=
tmp
[
j
])
!=
null
;
j
++
)
{
for
(
j
=
0
;
(
elem
=
tmp
[
j
])
!=
null
;
j
++
)
{
if
(
rscriptType
.
test
(
elem
.
type
||
""
)
)
{
if
(
rscriptType
.
test
(
elem
.
type
||
""
)
)
{
scripts
.
push
(
elem
);
scripts
.
push
(
elem
);
}
}
}
}
}
}
}
...
@@ -738,7 +736,7 @@ jQuery.extend({
...
@@ -738,7 +736,7 @@ jQuery.extend({
elem
=
tmp
=
safe
=
null
;
elem
=
tmp
=
safe
=
null
;
return
re
t
;
return
fragmen
t
;
},
},
cleanData
:
function
(
elems
,
/* internal */
acceptData
)
{
cleanData
:
function
(
elems
,
/* internal */
acceptData
)
{
...
...
test/unit/core.js
View file @
0ed497b0
...
@@ -1210,7 +1210,7 @@ test("jQuery.proxy", function(){
...
@@ -1210,7 +1210,7 @@ test("jQuery.proxy", function(){
});
});
test
(
"jQuery.parseHTML"
,
function
()
{
test
(
"jQuery.parseHTML"
,
function
()
{
expect
(
1
3
);
expect
(
1
7
);
var
html
,
nodes
;
var
html
,
nodes
;
...
@@ -1237,6 +1237,13 @@ test("jQuery.parseHTML", function() {
...
@@ -1237,6 +1237,13 @@ test("jQuery.parseHTML", function() {
equal
(
jQuery
.
parseHTML
(
"
\
t<div></div>"
)[
0
].
nodeValue
,
"
\
t"
,
"Preserve leading whitespace"
);
equal
(
jQuery
.
parseHTML
(
"
\
t<div></div>"
)[
0
].
nodeValue
,
"
\
t"
,
"Preserve leading whitespace"
);
equal
(
jQuery
.
parseHTML
(
" <div/> "
)[
0
].
nodeType
,
3
,
"Leading spaces are treated as text nodes (#11290)"
);
equal
(
jQuery
.
parseHTML
(
" <div/> "
)[
0
].
nodeType
,
3
,
"Leading spaces are treated as text nodes (#11290)"
);
html
=
jQuery
.
parseHTML
(
"<div>test div</div>"
);
equal
(
html
[
0
].
parentNode
.
nodeType
,
11
,
"parentNode should be documentFragment"
);
equal
(
html
[
0
].
innerHTML
,
"test div"
,
"Content should be preserved"
);
equal
(
jQuery
.
parseHTML
(
"<span><span>"
).
length
,
1
,
"Incorrect html-strings should not break anything"
);
equal
(
jQuery
.
parseHTML
(
"<td><td>"
)[
1
].
parentNode
.
nodeType
,
11
,
"parentNode should be documentFragment"
);
});
});
test
(
"jQuery.parseJSON"
,
function
(){
test
(
"jQuery.parseJSON"
,
function
(){
...
...
test/unit/manipulation.js
View file @
0ed497b0
...
@@ -672,24 +672,6 @@ test( "append HTML5 sectioning elements (Bug #6485)", function() {
...
@@ -672,24 +672,6 @@ test( "append HTML5 sectioning elements (Bug #6485)", function() {
equal
(
aside
.
length
,
1
,
"HTML5 elements do not collapse their children"
);
equal
(
aside
.
length
,
1
,
"HTML5 elements do not collapse their children"
);
});
});
test
(
"jQuery.clean, #12392"
,
function
()
{
expect
(
6
);
var
elems
=
jQuery
.
clean
(
[
"<div>test div</div>"
,
"<p>test p</p>"
]
);
ok
(
elems
[
0
].
parentNode
==
null
||
elems
[
0
].
parentNode
.
nodeType
===
11
,
"parentNode should be documentFragment or null"
);
ok
(
elems
[
1
].
parentNode
==
null
||
elems
[
1
].
parentNode
.
nodeType
===
11
,
"parentNode should be documentFragment or null"
);
equal
(
elems
[
0
].
innerHTML
,
"test div"
,
"Content should be preserved"
);
equal
(
elems
[
1
].
innerHTML
,
"test p"
,
"Content should be preserved"
);
equal
(
jQuery
.
clean
([
"<span><span>"
]).
length
,
1
,
"Incorrect html-strings should not break anything"
);
elems
=
jQuery
.
clean
([
"<td><td>"
]);
ok
(
elems
[
1
].
parentNode
==
null
||
elems
[
1
].
parentNode
.
nodeType
===
11
,
"parentNode should be documentFragment or null"
);
});
if
(
jQuery
.
css
)
{
if
(
jQuery
.
css
)
{
test
(
"HTML5 Elements inherit styles from style rules (Bug #10501)"
,
function
()
{
test
(
"HTML5 Elements inherit styles from style rules (Bug #10501)"
,
function
()
{
...
...
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