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
2ae872c5
Commit
2ae872c5
authored
Oct 09, 2010
by
jeresig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make sure null/NaN values aren't set in .css(). Fixes #7116.
parent
2ca36598
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
2 deletions
+27
-2
css.js
src/css.js
+6
-1
css.js
test/unit/css.js
+21
-1
No files found.
src/css.js
View file @
2ae872c5
...
...
@@ -70,7 +70,7 @@ jQuery.extend({
style
:
function
(
elem
,
name
,
value
,
extra
)
{
// Don't set styles on text and comment nodes
if
(
!
elem
||
elem
.
nodeType
===
3
||
elem
.
nodeType
===
8
||
!
elem
.
style
)
{
return
undefined
;
return
;
}
// Make sure that we're working with the right name
...
...
@@ -81,6 +81,11 @@ jQuery.extend({
// Check if we're setting a value
if
(
value
!==
undefined
)
{
// Make sure that NaN and null values aren't set. See: #7116
if
(
typeof
value
===
"number"
&&
isNaN
(
value
)
||
value
==
null
)
{
return
;
}
// If a number was passed in, add 'px' to the (except for certain CSS properties)
if
(
typeof
value
===
"number"
&&
!
jQuery
.
cssNumber
[
origName
]
)
{
value
+=
"px"
;
...
...
test/unit/css.js
View file @
2ae872c5
module
(
"css"
);
test
(
"css(String|Hash)"
,
function
()
{
expect
(
29
);
expect
(
33
);
equals
(
jQuery
(
'#main'
).
css
(
"display"
),
'none'
,
'Check for css property "display"'
);
...
...
@@ -61,6 +61,26 @@ test("css(String|Hash)", function() {
equals
(
prctval
,
checkval
,
"Verify fontSize % set."
);
equals
(
typeof
child
.
css
(
"width"
),
"string"
,
"Make sure that a string width is returned from css('width')."
);
var
old
=
child
[
0
].
style
.
height
;
// Test NaN
child
.
css
(
"height"
,
parseFloat
(
"zoo"
));
equals
(
child
[
0
].
style
.
height
,
old
,
"Make sure height isn't changed on NaN."
);
// Test null
child
.
css
(
"height"
,
null
);
equals
(
child
[
0
].
style
.
height
,
old
,
"Make sure height isn't changed on null."
);
old
=
child
[
0
].
style
.
fontSize
;
// Test NaN
child
.
css
(
"font-size"
,
parseFloat
(
"zoo"
));
equals
(
child
[
0
].
style
.
fontSize
,
old
,
"Make sure font-size isn't changed on NaN."
);
// Test null
child
.
css
(
"font-size"
,
null
);
equals
(
child
[
0
].
style
.
fontSize
,
old
,
"Make sure font-size isn't changed on null."
);
});
test
(
"css(String, Object)"
,
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