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
32842ac3
Commit
32842ac3
authored
Dec 01, 2012
by
Bennett Sorbo
Committed by
Dave Methvin
Dec 12, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix #12990. Don't add 'px' to column-count. Close gh-1050.
parent
93e18922
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
4 deletions
+16
-4
AUTHORS.txt
AUTHORS.txt
+2
-0
css.js
src/css.js
+1
-0
css.js
test/unit/css.js
+13
-4
No files found.
AUTHORS.txt
View file @
32842ac3
...
...
@@ -155,3 +155,5 @@ Marcel Greter <marcel.greter@ocbnet.ch>
Matthias Jäggli <matthias.jaeggli@gmail.com>
Yiming He <yiminghe@gmail.com>
Devin Cooper <cooper.semantics@gmail.com>
Bennett Sorbo <bsorbo@gmail.com>
\ No newline at end of file
src/css.js
View file @
32842ac3
...
...
@@ -155,6 +155,7 @@ jQuery.extend({
// Exclude the following css properties to add px
cssNumber
:
{
"columnCount"
:
true
,
"fillOpacity"
:
true
,
"fontWeight"
:
true
,
"lineHeight"
:
true
,
...
...
test/unit/css.js
View file @
32842ac3
...
...
@@ -823,11 +823,20 @@ if ( jQuery.fn.offset ) {
});
}
test
(
"Do not append px to 'fill-opacity' #9548"
,
function
()
{
expect
(
1
);
test
(
"Do not append px (#9548, #12990)"
,
function
()
{
expect
(
2
);
var
$div
=
jQuery
(
"<div>"
).
appendTo
(
"#qunit-fixture"
);
var
$div
=
jQuery
(
"<div>"
).
appendTo
(
"#qunit-fixture"
).
css
(
"fill-opacity"
,
1
);
equal
(
$div
.
css
(
"fill-opacity"
),
1
,
"Do not append px to 'fill-opacity'"
);
$div
.
css
(
"fill-opacity"
,
1
);
equal
(
$div
.
css
(
"fill-opacity"
),
1
,
"Do not append px to 'fill-opacity'"
);
$div
.
css
(
"column-count"
,
1
);
if
(
$div
.
css
(
"column-count"
)
)
{
equal
(
$div
.
css
(
"column-count"
),
1
,
"Do not append px to 'column-count'"
);
}
else
{
ok
(
true
,
"No support for column-count CSS property"
);
}
});
test
(
"css('width') and css('height') should respect box-sizing, see #11004"
,
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