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
491d7e21
Commit
491d7e21
authored
Jan 12, 2012
by
cmc3cn
Committed by
Dave Methvin
Jan 12, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix #11119: The curCSS function needs only 2 arguments
parent
77de76b9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
css.js
src/css.js
+3
-3
No files found.
src/css.js
View file @
491d7e21
...
@@ -35,7 +35,7 @@ jQuery.extend({
...
@@ -35,7 +35,7 @@ jQuery.extend({
get
:
function
(
elem
,
computed
)
{
get
:
function
(
elem
,
computed
)
{
if
(
computed
)
{
if
(
computed
)
{
// We should always get a number back from opacity
// We should always get a number back from opacity
var
ret
=
curCSS
(
elem
,
"opacity"
,
"opacity"
);
var
ret
=
curCSS
(
elem
,
"opacity"
);
return
ret
===
""
?
"1"
:
ret
;
return
ret
===
""
?
"1"
:
ret
;
}
else
{
}
else
{
...
@@ -264,7 +264,7 @@ function getWidthOrHeight( elem, name, extra ) {
...
@@ -264,7 +264,7 @@ function getWidthOrHeight( elem, name, extra ) {
}
}
// Fall back to computed then uncomputed css if necessary
// Fall back to computed then uncomputed css if necessary
val
=
curCSS
(
elem
,
name
,
name
);
val
=
curCSS
(
elem
,
name
);
if
(
val
<
0
||
val
==
null
)
{
if
(
val
<
0
||
val
==
null
)
{
val
=
elem
.
style
[
name
];
val
=
elem
.
style
[
name
];
}
}
...
@@ -366,7 +366,7 @@ jQuery(function() {
...
@@ -366,7 +366,7 @@ jQuery(function() {
// Work around by temporarily setting element display to inline-block
// Work around by temporarily setting element display to inline-block
return
jQuery
.
swap
(
elem
,
{
"display"
:
"inline-block"
},
function
()
{
return
jQuery
.
swap
(
elem
,
{
"display"
:
"inline-block"
},
function
()
{
if
(
computed
)
{
if
(
computed
)
{
return
curCSS
(
elem
,
"margin-right"
,
"marginRight"
);
return
curCSS
(
elem
,
"margin-right"
);
}
else
{
}
else
{
return
elem
.
style
.
marginRight
;
return
elem
.
style
.
marginRight
;
}
}
...
...
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