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
20be650b
Commit
20be650b
authored
Nov 18, 2012
by
Dave Methvin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'x8908'
parents
d08d4833
5904468b
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
60 additions
and
1 deletion
+60
-1
css.js
src/css.js
+10
-0
manipulation.js
src/manipulation.js
+5
-1
support.js
src/support.js
+4
-0
manipulation.js
test/unit/manipulation.js
+41
-0
No files found.
src/css.js
View file @
20be650b
...
@@ -198,6 +198,7 @@ jQuery.extend({
...
@@ -198,6 +198,7 @@ jQuery.extend({
// If a hook was provided, use that value, otherwise just set the specified value
// If a hook was provided, use that value, otherwise just set the specified value
if
(
!
hooks
||
!
(
"set"
in
hooks
)
||
(
value
=
hooks
.
set
(
elem
,
value
,
extra
))
!==
undefined
)
{
if
(
!
hooks
||
!
(
"set"
in
hooks
)
||
(
value
=
hooks
.
set
(
elem
,
value
,
extra
))
!==
undefined
)
{
// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
// Fixes bug #5509
// Fixes bug #5509
try
{
try
{
...
@@ -515,6 +516,15 @@ jQuery.each([ "height", "width" ], function( i, name ) {
...
@@ -515,6 +516,15 @@ jQuery.each([ "height", "width" ], function( i, name ) {
};
};
});
});
if
(
!
jQuery
.
support
.
clearCloneStyle
)
{
// #8908, this part for IE9 only; see gh-886
jQuery
.
cssHooks
.
backgroundPosition
=
{
set
:
function
(
elem
,
value
)
{
return
value
===
""
?
"0% 0%"
:
value
;
}
};
}
if
(
!
jQuery
.
support
.
opacity
)
{
if
(
!
jQuery
.
support
.
opacity
)
{
jQuery
.
cssHooks
.
opacity
=
{
jQuery
.
cssHooks
.
opacity
=
{
get
:
function
(
elem
,
computed
)
{
get
:
function
(
elem
,
computed
)
{
...
...
src/manipulation.js
View file @
20be650b
...
@@ -596,8 +596,12 @@ jQuery.extend({
...
@@ -596,8 +596,12 @@ jQuery.extend({
clone
;
clone
;
if
(
jQuery
.
support
.
html5Clone
||
jQuery
.
isXMLDoc
(
elem
)
||
!
rnoshimcache
.
test
(
"<"
+
elem
.
nodeName
+
">"
)
)
{
if
(
jQuery
.
support
.
html5Clone
||
jQuery
.
isXMLDoc
(
elem
)
||
!
rnoshimcache
.
test
(
"<"
+
elem
.
nodeName
+
">"
)
)
{
clone
=
elem
.
cloneNode
(
true
);
// Break the original-clone style connection in IE9/10 (#8909)
if
(
!
jQuery
.
support
.
clearCloneStyle
&&
elem
.
nodeType
===
1
)
{
i
=
(
window
.
getComputedStyle
(
elem
,
null
)
||
{}
).
backgroundPosition
;
}
clone
=
elem
.
cloneNode
(
true
);
// IE<=8 does not properly clone detached, unknown element nodes
// IE<=8 does not properly clone detached, unknown element nodes
}
else
{
}
else
{
fragmentDiv
.
innerHTML
=
elem
.
outerHTML
;
fragmentDiv
.
innerHTML
=
elem
.
outerHTML
;
...
...
src/support.js
View file @
20be650b
...
@@ -169,6 +169,10 @@ jQuery.support = (function() {
...
@@ -169,6 +169,10 @@ jQuery.support = (function() {
}
}
}
}
div
.
style
.
backgroundClip
=
"content-box"
;
div
.
cloneNode
(
true
).
style
.
backgroundClip
=
""
;
support
.
clearCloneStyle
=
div
.
style
.
backgroundClip
===
"content-box"
;
// Run tests that need a body at doc ready
// Run tests that need a body at doc ready
jQuery
(
function
()
{
jQuery
(
function
()
{
var
container
,
div
,
tds
,
marginDiv
,
var
container
,
div
,
tds
,
marginDiv
,
...
...
test/unit/manipulation.js
View file @
20be650b
...
@@ -2023,6 +2023,47 @@ test("checked state is cloned with clone()", function(){
...
@@ -2023,6 +2023,47 @@ test("checked state is cloned with clone()", function(){
equal
(
jQuery
(
elem
).
clone
().
attr
(
"id"
,
"clone"
)[
0
].
checked
,
true
,
"Checked true state correctly cloned"
);
equal
(
jQuery
(
elem
).
clone
().
attr
(
"id"
,
"clone"
)[
0
].
checked
,
true
,
"Checked true state correctly cloned"
);
});
});
test
(
"Clearing a Cloned Element's Style Shouldn't Clear the Original Element's Style (#8908)"
,
function
()
{
expect
(
16
);
var
baseUrl
=
document
.
location
.
href
.
replace
(
/
([^\/]
*
)
$/
,
""
);
var
styles
=
[
{
name
:
"backgroundAttachment"
,
value
:
[
"fixed"
],
expected
:
[
"scroll"
]
},
{
name
:
"backgroundColor"
,
value
:
[
"rgb(255, 0, 0)"
,
"rgb(255,0,0)"
,
"#ff0000"
],
expected
:
[
"transparent"
]
},
{
name
:
"backgroundImage"
,
value
:
[
"url('test.png')"
,
"url("
+
baseUrl
+
"test.png)"
,
"url(
\"
"
+
baseUrl
+
"test.png
\"
)"
],
expected
:
[
"none"
,
"url(
\"
http://static.jquery.com/files/rocker/images/logo_jquery_215x53.gif
\"
)"
]
},
// Firefox returns auto's value
{
name
:
"backgroundPosition"
,
value
:
[
"5% 5%"
],
expected
:
[
"0% 0%"
,
"-1000px 0px"
,
"-1000px 0%"
]
},
{
name
:
"backgroundRepeat"
,
value
:
[
"repeat-y"
],
expected
:
[
"repeat"
,
"no-repeat"
]
},
// Firefox returns no-repeat
{
name
:
"backgroundClip"
,
value
:
[
"padding-box"
],
expected
:
[
"border-box"
]
},
{
name
:
"backgroundOrigin"
,
value
:
[
"content-box"
],
expected
:
[
"padding-box"
]
},
{
name
:
"backgroundSize"
,
value
:
[
"80px 60px"
],
expected
:
[
"auto auto"
]
}
];
jQuery
.
each
(
styles
,
function
(
index
,
style
)
{
var
$source
,
source
,
$clone
;
style
.
expected
=
style
.
expected
.
concat
(
[
""
,
"auto"
]
);
$source
=
jQuery
(
"<div />"
);
source
=
$source
[
0
];
if
(
source
.
style
[
style
.
name
]
===
undefined
)
{
ok
(
true
,
style
.
name
+
": style isn't supported and therefore not an issue"
);
ok
(
true
);
return
true
;
}
$source
.
css
(
style
.
name
,
style
.
value
[
0
]
);
$clone
=
$source
.
clone
();
$clone
.
css
(
style
.
name
,
""
);
ok
(
~
jQuery
.
inArray
(
$source
.
css
(
style
.
name
),
style
.
value
),
"Clearing clone.css() doesn't affect source.css(): "
+
style
.
name
+
"; result: "
+
$source
.
css
(
style
.
name
)
+
"; expected: "
+
style
.
value
.
join
(
","
)
);
ok
(
~
jQuery
.
inArray
(
$clone
.
css
(
style
.
name
),
style
.
expected
),
"Cloned element was reset to its default value: "
+
style
.
name
+
"; result: "
+
$clone
.
css
(
style
.
name
)
+
"; expected: "
+
style
.
expected
.
join
(
","
)
);
});
});
test
(
"manipulate mixed jQuery and text (#12384, #12346)"
,
function
()
{
test
(
"manipulate mixed jQuery and text (#12384, #12346)"
,
function
()
{
expect
(
2
);
expect
(
2
);
...
...
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