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
51d25807
Commit
51d25807
authored
Sep 17, 2010
by
John Resig
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'csshooks'
parents
fc5b69fc
192bab8e
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
226 additions
and
190 deletions
+226
-190
attributes.js
src/attributes.js
+0
-4
css.js
src/css.js
+175
-129
dimensions.js
src/dimensions.js
+3
-3
effects.js
src/effects.js
+9
-9
offset.js
src/offset.js
+12
-12
support.js
src/support.js
+1
-1
css.js
test/unit/css.js
+2
-10
effects.js
test/unit/effects.js
+24
-22
No files found.
src/attributes.js
View file @
51d25807
...
...
@@ -341,10 +341,6 @@ jQuery.extend({
// Non-existent attributes return null, we normalize to undefined
return
attr
===
null
?
undefined
:
attr
;
}
// elem is actually elem.style ... set the style
// Using attr for specific style information is now deprecated. Use style instead.
return
jQuery
.
style
(
elem
,
name
,
value
);
}
});
...
...
src/css.js
View file @
51d25807
This diff is collapsed.
Click to expand it.
src/dimensions.js
View file @
51d25807
...
...
@@ -8,14 +8,14 @@ jQuery.each([ "Height", "Width" ], function( i, name ) {
// innerHeight and innerWidth
jQuery
.
fn
[
"inner"
+
name
]
=
function
()
{
return
this
[
0
]
?
jQuery
.
css
(
this
[
0
],
type
,
false
,
"padding"
)
:
parseFloat
(
jQuery
.
css
(
this
[
0
],
type
,
undefined
,
"padding"
),
10
)
:
null
;
};
// outerHeight and outerWidth
jQuery
.
fn
[
"outer"
+
name
]
=
function
(
margin
)
{
return
this
[
0
]
?
jQuery
.
css
(
this
[
0
],
type
,
false
,
margin
?
"margin"
:
"border"
)
:
parseFloat
(
jQuery
.
css
(
this
[
0
],
type
,
undefined
,
margin
?
"margin"
:
"border"
),
10
)
:
null
;
};
...
...
@@ -50,7 +50,7 @@ jQuery.each([ "Height", "Width" ], function( i, name ) {
// Get or set width or height on the element
size
===
undefined
?
// Get width or height on the element
jQuery
.
css
(
elem
,
type
)
:
parseFloat
(
jQuery
.
css
(
elem
,
type
),
10
)
:
// Set the width or height on the element (default to pixels if value is unitless)
this
.
css
(
type
,
typeof
size
===
"string"
?
size
:
size
+
"px"
);
...
...
src/effects.js
View file @
51d25807
...
...
@@ -29,7 +29,7 @@ jQuery.fn.extend({
this
[
i
].
style
.
display
=
old
||
""
;
if
(
jQuery
.
css
(
this
[
i
],
"display"
)
===
"none"
)
{
if
(
jQuery
.
css
(
this
[
i
],
"display"
)
===
"none"
)
{
var
nodeName
=
this
[
i
].
nodeName
,
display
;
if
(
elemdisplay
[
nodeName
]
)
{
...
...
@@ -71,7 +71,7 @@ jQuery.fn.extend({
for
(
var
i
=
0
,
l
=
this
.
length
;
i
<
l
;
i
++
)
{
var
old
=
jQuery
.
data
(
this
[
i
],
"olddisplay"
);
if
(
!
old
&&
old
!==
"none"
)
{
jQuery
.
data
(
this
[
i
],
"olddisplay"
,
jQuery
.
css
(
this
[
i
],
"display"
)
);
jQuery
.
data
(
this
[
i
],
"olddisplay"
,
jQuery
.
css
(
this
[
i
],
"display"
)
);
}
}
...
...
@@ -139,7 +139,7 @@ jQuery.fn.extend({
if
(
(
p
===
"height"
||
p
===
"width"
)
&&
this
.
style
)
{
// Store display property
opt
.
display
=
jQuery
.
css
(
this
,
"display"
)
;
opt
.
display
=
this
.
style
.
display
;
// Make sure that nothing sneaks out
opt
.
overflow
=
this
.
style
.
overflow
;
...
...
@@ -316,13 +316,13 @@ jQuery.fx.prototype = {
},
// Get the current size
cur
:
function
(
force
)
{
cur
:
function
()
{
if
(
this
.
elem
[
this
.
prop
]
!=
null
&&
(
!
this
.
elem
.
style
||
this
.
elem
.
style
[
this
.
prop
]
==
null
)
)
{
return
this
.
elem
[
this
.
prop
];
}
var
r
=
parseFloat
(
jQuery
.
css
(
this
.
elem
,
this
.
prop
,
force
)
);
return
r
&&
r
>
-
10000
?
r
:
parseFloat
(
jQuery
.
curCSS
(
this
.
elem
,
this
.
prop
))
||
0
;
var
r
=
parseFloat
(
jQuery
.
css
(
this
.
elem
,
this
.
prop
),
10
);
return
r
&&
r
>
-
10000
?
r
:
0
;
},
// Start an animation from one number to another
...
...
@@ -397,7 +397,7 @@ jQuery.fx.prototype = {
var
old
=
jQuery
.
data
(
this
.
elem
,
"olddisplay"
);
this
.
elem
.
style
.
display
=
old
?
old
:
this
.
options
.
display
;
if
(
jQuery
.
css
(
this
.
elem
,
"display"
)
===
"none"
)
{
if
(
jQuery
.
css
(
this
.
elem
,
"display"
)
===
"none"
)
{
this
.
elem
.
style
.
display
=
"block"
;
}
}
...
...
@@ -410,7 +410,7 @@ jQuery.fx.prototype = {
// Reset the properties, if the item has been hidden or shown
if
(
this
.
options
.
hide
||
this
.
options
.
show
)
{
for
(
var
p
in
this
.
options
.
curAnim
)
{
jQuery
.
style
(
this
.
elem
,
p
,
this
.
options
.
orig
[
p
]
);
jQuery
.
style
(
this
.
elem
,
p
,
this
.
options
.
orig
[
p
]
);
}
}
...
...
@@ -467,7 +467,7 @@ jQuery.extend( jQuery.fx, {
step
:
{
opacity
:
function
(
fx
)
{
jQuery
.
style
(
fx
.
elem
,
"opacity"
,
fx
.
now
);
jQuery
.
style
(
fx
.
elem
,
"opacity"
,
fx
.
now
);
},
_default
:
function
(
fx
)
{
...
...
src/offset.js
View file @
51d25807
...
...
@@ -105,7 +105,7 @@ if ( "getBoundingClientRect" in document.documentElement ) {
jQuery
.
offset
=
{
initialize
:
function
()
{
var
body
=
document
.
body
,
container
=
document
.
createElement
(
"div"
),
innerDiv
,
checkDiv
,
table
,
td
,
bodyMarginTop
=
parseFloat
(
jQuery
.
c
urCSS
(
body
,
"marginTop"
,
true
)
)
||
0
,
var
body
=
document
.
body
,
container
=
document
.
createElement
(
"div"
),
innerDiv
,
checkDiv
,
table
,
td
,
bodyMarginTop
=
parseFloat
(
jQuery
.
c
ss
(
body
,
"marginTop"
)
)
||
0
,
html
=
"<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>"
;
jQuery
.
extend
(
container
.
style
,
{
position
:
"absolute"
,
top
:
0
,
left
:
0
,
margin
:
0
,
border
:
0
,
width
:
"1px"
,
height
:
"1px"
,
visibility
:
"hidden"
}
);
...
...
@@ -144,25 +144,25 @@ jQuery.offset = {
jQuery
.
offset
.
initialize
();
if
(
jQuery
.
offset
.
doesNotIncludeMarginInBodyOffset
)
{
top
+=
parseFloat
(
jQuery
.
c
urCSS
(
body
,
"marginTop"
,
true
)
)
||
0
;
left
+=
parseFloat
(
jQuery
.
c
urCSS
(
body
,
"marginLeft"
,
true
)
)
||
0
;
top
+=
parseFloat
(
jQuery
.
c
ss
(
body
,
"marginTop"
)
)
||
0
;
left
+=
parseFloat
(
jQuery
.
c
ss
(
body
,
"marginLeft"
)
)
||
0
;
}
return
{
top
:
top
,
left
:
left
};
},
setOffset
:
function
(
elem
,
options
,
i
)
{
var
position
=
jQuery
.
c
urCSS
(
elem
,
"position"
);
var
position
=
jQuery
.
c
ss
(
elem
,
"position"
);
// set position first, in-case top/left are set even on static elem
if
(
position
===
"static"
)
{
elem
.
style
.
position
=
"relative"
;
}
var
curElem
=
jQuery
(
elem
),
curOffset
=
curElem
.
offset
(),
curCSSTop
=
jQuery
.
curCSS
(
elem
,
"top"
,
true
),
curCSSLeft
=
jQuery
.
c
urCSS
(
elem
,
"left"
,
true
),
var
curElem
=
jQuery
(
elem
),
curOffset
=
curElem
.
offset
(),
curCSSTop
=
jQuery
.
css
(
elem
,
"top"
),
curCSSLeft
=
jQuery
.
c
ss
(
elem
,
"left"
),
calculatePosition
=
(
position
===
"absolute"
&&
jQuery
.
inArray
(
'auto'
,
[
curCSSTop
,
curCSSLeft
])
>
-
1
),
props
=
{},
curPosition
=
{},
curTop
,
curLeft
;
...
...
@@ -212,12 +212,12 @@ jQuery.fn.extend({
// Subtract element margins
// note: when an element has margin: auto the offsetLeft and marginLeft
// are the same in Safari causing offset.left to incorrectly be 0
offset
.
top
-=
parseFloat
(
jQuery
.
c
urCSS
(
elem
,
"marginTop"
,
true
)
)
||
0
;
offset
.
left
-=
parseFloat
(
jQuery
.
c
urCSS
(
elem
,
"marginLeft"
,
true
)
)
||
0
;
offset
.
top
-=
parseFloat
(
jQuery
.
c
ss
(
elem
,
"marginTop"
)
)
||
0
;
offset
.
left
-=
parseFloat
(
jQuery
.
c
ss
(
elem
,
"marginLeft"
)
)
||
0
;
// Add offsetParent borders
parentOffset
.
top
+=
parseFloat
(
jQuery
.
c
urCSS
(
offsetParent
[
0
],
"borderTopWidth"
,
true
)
)
||
0
;
parentOffset
.
left
+=
parseFloat
(
jQuery
.
c
urCSS
(
offsetParent
[
0
],
"borderLeftWidth"
,
true
)
)
||
0
;
parentOffset
.
top
+=
parseFloat
(
jQuery
.
c
ss
(
offsetParent
[
0
],
"borderTopWidth"
)
)
||
0
;
parentOffset
.
left
+=
parseFloat
(
jQuery
.
c
ss
(
offsetParent
[
0
],
"borderLeftWidth"
)
)
||
0
;
// Subtract the two offsets
return
{
...
...
src/support.js
View file @
51d25807
...
...
@@ -134,7 +134,7 @@
// release memory in IE
root
=
script
=
div
=
all
=
a
=
null
;
})();
})(
jQuery
);
jQuery
.
props
=
{
"for"
:
"htmlFor"
,
...
...
test/unit/css.js
View file @
51d25807
module
(
"css"
);
test
(
"css(String|Hash)"
,
function
()
{
expect
(
30
);
expect
(
28
);
equals
(
jQuery
(
'#main'
).
css
(
"display"
),
'none'
,
'Check for css property "display"'
);
...
...
@@ -19,10 +19,6 @@ test("css(String|Hash)", function() {
equals
(
parseFloat
(
jQuery
(
'#nothiddendiv'
).
css
(
'width'
)),
width
,
'Test negative width ignored'
)
equals
(
parseFloat
(
jQuery
(
'#nothiddendiv'
).
css
(
'height'
)),
height
,
'Test negative height ignored'
)
jQuery
(
'#floatTest'
).
css
({
styleFloat
:
'right'
});
equals
(
jQuery
(
'#floatTest'
).
css
(
'styleFloat'
),
'right'
,
'Modified CSS float using "styleFloat": Assert float is right'
);
jQuery
(
'#floatTest'
).
css
({
cssFloat
:
'left'
});
equals
(
jQuery
(
'#floatTest'
).
css
(
'cssFloat'
),
'left'
,
'Modified CSS float using "cssFloat": Assert float is left'
);
jQuery
(
'#floatTest'
).
css
({
'float'
:
'right'
});
equals
(
jQuery
(
'#floatTest'
).
css
(
'float'
),
'right'
,
'Modified CSS float using "float": Assert float is right'
);
jQuery
(
'#floatTest'
).
css
({
'font-size'
:
'30px'
});
...
...
@@ -65,7 +61,7 @@ test("css(String|Hash)", function() {
});
test
(
"css(String, Object)"
,
function
()
{
expect
(
21
);
expect
(
19
);
ok
(
jQuery
(
'#nothiddendiv'
).
is
(
':visible'
),
'Modifying CSS display: Assert element is visible'
);
jQuery
(
'#nothiddendiv'
).
css
(
"display"
,
'none'
);
ok
(
!
jQuery
(
'#nothiddendiv'
).
is
(
':visible'
),
'Modified CSS display: Assert element is hidden'
);
...
...
@@ -75,10 +71,6 @@ test("css(String, Object)", function() {
jQuery
(
"#nothiddendiv"
).
css
(
"top"
,
"-1em"
);
ok
(
jQuery
(
"#nothiddendiv"
).
css
(
"top"
),
-
16
,
"Check negative number in EMs."
);
jQuery
(
'#floatTest'
).
css
(
'styleFloat'
,
'left'
);
equals
(
jQuery
(
'#floatTest'
).
css
(
'styleFloat'
),
'left'
,
'Modified CSS float using "styleFloat": Assert float is left'
);
jQuery
(
'#floatTest'
).
css
(
'cssFloat'
,
'right'
);
equals
(
jQuery
(
'#floatTest'
).
css
(
'cssFloat'
),
'right'
,
'Modified CSS float using "cssFloat": Assert float is right'
);
jQuery
(
'#floatTest'
).
css
(
'float'
,
'left'
);
equals
(
jQuery
(
'#floatTest'
).
css
(
'float'
),
'left'
,
'Modified CSS float using "float": Assert float is left'
);
jQuery
(
'#floatTest'
).
css
(
'font-size'
,
'20px'
);
...
...
test/unit/effects.js
View file @
51d25807
...
...
@@ -240,11 +240,11 @@ test("stop()", function() {
$foo
.
animate
({
width
:
'show'
},
1000
);
setTimeout
(
function
(){
var
nw
=
$foo
.
width
();
ok
(
nw
!=
w
,
"An animation occurred "
+
nw
+
"px "
+
w
+
"px"
);
notEqual
(
nw
,
w
,
"An animation occurred "
+
nw
+
"px "
+
w
+
"px"
);
$foo
.
stop
();
nw
=
$foo
.
width
();
ok
(
nw
!=
w
,
"Stop didn't reset the animation "
+
nw
+
"px "
+
w
+
"px"
);
notEqual
(
nw
,
w
,
"Stop didn't reset the animation "
+
nw
+
"px "
+
w
+
"px"
);
setTimeout
(
function
(){
equals
(
nw
,
$foo
.
width
(),
"The animation didn't continue"
);
start
();
...
...
@@ -266,13 +266,12 @@ test("stop() - several in queue", function() {
setTimeout
(
function
(){
equals
(
$foo
.
queue
().
length
,
3
,
"All 3 still in the queue"
);
var
nw
=
$foo
.
width
();
ok
(
nw
!=
w
,
"An animation occurred "
+
nw
+
"px "
+
w
+
"px"
);
notEqual
(
nw
,
w
,
"An animation occurred "
+
nw
+
"px "
+
w
+
"px"
);
$foo
.
stop
();
nw
=
$foo
.
width
();
ok
(
nw
!=
w
,
"Stop didn't reset the animation "
+
nw
+
"px "
+
w
+
"px"
);
// Disabled, being flaky
//equals( $foo.queue().length, 1, "The next animation continued" );
notEqual
(
nw
,
w
,
"Stop didn't reset the animation "
+
nw
+
"px "
+
w
+
"px"
);
$foo
.
stop
(
true
);
start
();
},
100
);
...
...
@@ -390,16 +389,16 @@ jQuery.each( {
"CSS Auto"
:
function
(
elem
,
prop
){
jQuery
(
elem
).
addClass
(
"auto"
+
prop
)
.
text
(
"This is a long string of text."
);
return
""
;
return
prop
==
"opacity"
?
1
:
""
;
},
"JS Auto"
:
function
(
elem
,
prop
){
jQuery
(
elem
).
css
(
prop
,
"auto"
)
.
text
(
"This is a long string of text."
);
return
""
;
return
prop
==
"opacity"
?
1
:
""
;
},
"CSS 100"
:
function
(
elem
,
prop
){
jQuery
(
elem
).
addClass
(
"large"
+
prop
);
return
""
;
return
prop
==
"opacity"
?
1
:
""
;
},
"JS 100"
:
function
(
elem
,
prop
){
jQuery
(
elem
).
css
(
prop
,
prop
==
"opacity"
?
1
:
"100px"
);
...
...
@@ -407,7 +406,7 @@ jQuery.each( {
},
"CSS 50"
:
function
(
elem
,
prop
){
jQuery
(
elem
).
addClass
(
"med"
+
prop
);
return
""
;
return
prop
==
"opacity"
?
0.5
:
""
;
},
"JS 50"
:
function
(
elem
,
prop
){
jQuery
(
elem
).
css
(
prop
,
prop
==
"opacity"
?
0.50
:
"50px"
);
...
...
@@ -415,7 +414,7 @@ jQuery.each( {
},
"CSS 0"
:
function
(
elem
,
prop
){
jQuery
(
elem
).
addClass
(
"no"
+
prop
);
return
""
;
return
prop
==
"opacity"
?
0
:
""
;
},
"JS 0"
:
function
(
elem
,
prop
){
jQuery
(
elem
).
css
(
prop
,
prop
==
"opacity"
?
0
:
"0px"
);
...
...
@@ -475,15 +474,18 @@ jQuery.each( {
equals
(
this
.
style
.
display
,
"block"
,
"Showing, display should block: "
+
this
.
style
.
display
);
if
(
t_w
==
"hide"
||
t_w
==
"show"
)
equals
(
this
.
style
.
width
.
indexOf
(
f_w
),
0
,
"Width must be reset to "
+
f_w
+
": "
+
this
.
style
.
width
);
ok
(
f_w
===
""
?
this
.
style
.
width
===
f_w
:
this
.
style
.
width
.
indexOf
(
f_w
)
===
0
,
"Width must be reset to "
+
f_w
+
": "
+
this
.
style
.
width
);
if
(
t_h
==
"hide"
||
t_h
==
"show"
)
equals
(
this
.
style
.
height
.
indexOf
(
f_h
),
0
,
"Height must be reset to "
+
f_h
+
": "
+
this
.
style
.
height
);
ok
(
f_h
===
""
?
this
.
style
.
height
===
f_h
:
this
.
style
.
height
.
indexOf
(
f_h
)
===
0
,
"Height must be reset to "
+
f_h
+
": "
+
this
.
style
.
height
);
var
cur_o
=
jQuery
.
style
(
this
,
"opacity"
);
if
(
cur_o
!==
""
)
cur_o
=
parseFloat
(
cur_o
);
if
(
cur_o
!==
""
)
{
cur_o
=
jQuery
.
css
(
this
,
"opacity"
);
}
if
(
t_o
==
"hide"
||
t_o
==
"show"
)
if
(
t_o
==
"hide"
||
t_o
==
"show"
)
equals
(
cur_o
,
f_o
,
"Opacity must be reset to "
+
f_o
+
": "
+
cur_o
);
if
(
t_w
==
"hide"
)
...
...
@@ -492,7 +494,7 @@ jQuery.each( {
if
(
t_o
.
constructor
==
Number
)
{
equals
(
cur_o
,
t_o
,
"Final opacity should be "
+
t_o
+
": "
+
cur_o
);
ok
(
jQuery
.
c
urCSS
(
this
,
"opacity"
)
!=
""
||
cur_o
==
t_o
,
"Opacity should be explicitly set to "
+
t_o
+
", is instead: "
+
cur_o
);
ok
(
jQuery
.
c
ss
(
this
,
"opacity"
)
!=
""
||
cur_o
==
t_o
,
"Opacity should be explicitly set to "
+
t_o
+
", is instead: "
+
cur_o
);
}
if
(
t_w
.
constructor
==
Number
)
{
...
...
@@ -512,9 +514,9 @@ jQuery.each( {
}
if
(
t_h
==
"show"
)
{
var
old_h
=
jQuery
.
c
urCSS
(
this
,
"height"
);
jQuery
(
elem
).
append
(
"<br/>Some more text<br/>and some more..."
);
ok
(
old_h
!=
jQuery
.
css
(
this
,
"height"
)
,
"Make sure height is auto."
);
var
old_h
=
jQuery
.
c
ss
(
this
,
"height"
);
jQuery
(
this
).
append
(
"<br/>Some more text<br/>and some more..."
);
notEqual
(
jQuery
.
css
(
this
,
"height"
)
+
"px"
,
old_h
,
"Make sure height is auto."
);
}
start
();
...
...
@@ -532,7 +534,7 @@ jQuery.fn.saveState = function(){
var
self
=
this
;
self
.
save
=
{};
jQuery
.
each
(
check
,
function
(
i
,
c
){
self
.
save
[
c
]
=
jQuery
.
css
(
self
,
c
);
self
.
save
[
c
]
=
self
.
style
[
c
]
||
jQuery
.
css
(
self
,
c
);
});
});
};
...
...
@@ -540,8 +542,8 @@ jQuery.fn.saveState = function(){
jQuery
.
checkState
=
function
(){
var
self
=
this
;
jQuery
.
each
(
this
.
save
,
function
(
c
,
v
){
var
cur
=
jQuery
.
css
(
self
,
c
);
equals
(
v
,
cur
,
"Make sure that "
+
c
+
" is reset (Old: "
+
v
+
" Cur: "
+
cur
+
")"
);
var
cur
=
self
.
style
[
c
]
||
jQuery
.
css
(
self
,
c
);
equals
(
cur
,
v
,
"Make sure that "
+
c
+
" is reset (Old: "
+
v
+
" Cur: "
+
cur
+
")"
);
});
start
();
}
...
...
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