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
f6205e05
Commit
f6205e05
authored
Jan 07, 2007
by
John Resig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Started cleaning up fx, made easing easier to use.
parent
458d427c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
76 additions
and
80 deletions
+76
-80
fx.js
src/fx/fx.js
+76
-80
No files found.
src/fx/fx.js
View file @
f6205e05
...
@@ -24,10 +24,10 @@ jQuery.fn.extend({
...
@@ -24,10 +24,10 @@ jQuery.fn.extend({
* @cat Effects/Animations
* @cat Effects/Animations
* @see hide(String|Number,Function)
* @see hide(String|Number,Function)
*/
*/
show
:
function
(
speed
,
callback
,
easing
){
show
:
function
(
speed
,
callback
){
return
speed
?
this
.
animate
({
return
speed
?
this
.
animate
({
height
:
"show"
,
width
:
"show"
,
opacity
:
"show"
height
:
"show"
,
width
:
"show"
,
opacity
:
"show"
},
speed
,
callback
,
easing
)
:
this
.
_show
();
},
speed
,
callback
)
:
this
.
_show
();
},
},
// Overwrite the old hide method
// Overwrite the old hide method
...
@@ -54,10 +54,10 @@ jQuery.fn.extend({
...
@@ -54,10 +54,10 @@ jQuery.fn.extend({
* @cat Effects/Animations
* @cat Effects/Animations
* @see show(String|Number,Function)
* @see show(String|Number,Function)
*/
*/
hide
:
function
(
speed
,
callback
,
easing
){
hide
:
function
(
speed
,
callback
){
return
speed
?
this
.
animate
({
return
speed
?
this
.
animate
({
height
:
"hide"
,
width
:
"hide"
,
opacity
:
"hide"
height
:
"hide"
,
width
:
"hide"
,
opacity
:
"hide"
},
speed
,
callback
,
easing
)
:
this
.
_hide
();
},
speed
,
callback
)
:
this
.
_hide
();
},
},
/**
/**
...
@@ -82,8 +82,8 @@ jQuery.fn.extend({
...
@@ -82,8 +82,8 @@ jQuery.fn.extend({
* @see slideUp(String|Number,Function)
* @see slideUp(String|Number,Function)
* @see slideToggle(String|Number,Function)
* @see slideToggle(String|Number,Function)
*/
*/
slideDown
:
function
(
speed
,
callback
,
easing
){
slideDown
:
function
(
speed
,
callback
){
return
this
.
animate
({
height
:
"show"
},
speed
,
callback
,
easing
);
return
this
.
animate
({
height
:
"show"
},
speed
,
callback
);
},
},
/**
/**
...
@@ -108,8 +108,8 @@ jQuery.fn.extend({
...
@@ -108,8 +108,8 @@ jQuery.fn.extend({
* @see slideDown(String|Number,Function)
* @see slideDown(String|Number,Function)
* @see slideToggle(String|Number,Function)
* @see slideToggle(String|Number,Function)
*/
*/
slideUp
:
function
(
speed
,
callback
,
easing
){
slideUp
:
function
(
speed
,
callback
){
return
this
.
animate
({
height
:
"hide"
},
speed
,
callback
,
easing
);
return
this
.
animate
({
height
:
"hide"
},
speed
,
callback
);
},
},
/**
/**
...
@@ -134,10 +134,10 @@ jQuery.fn.extend({
...
@@ -134,10 +134,10 @@ jQuery.fn.extend({
* @see slideDown(String|Number,Function)
* @see slideDown(String|Number,Function)
* @see slideUp(String|Number,Function)
* @see slideUp(String|Number,Function)
*/
*/
slideToggle
:
function
(
speed
,
callback
,
easing
){
slideToggle
:
function
(
speed
,
callback
){
return
this
.
each
(
function
(){
return
this
.
each
(
function
(){
var
state
=
jQuery
(
this
).
is
(
":hidden"
)
?
"show"
:
"hide"
;
var
state
=
jQuery
(
this
).
is
(
":hidden"
)
?
"show"
:
"hide"
;
jQuery
(
this
).
animate
({
height
:
state
},
speed
,
callback
,
easing
);
jQuery
(
this
).
animate
({
height
:
state
},
speed
,
callback
);
});
});
},
},
...
@@ -164,8 +164,8 @@ jQuery.fn.extend({
...
@@ -164,8 +164,8 @@ jQuery.fn.extend({
* @see fadeOut(String|Number,Function)
* @see fadeOut(String|Number,Function)
* @see fadeTo(String|Number,Number,Function)
* @see fadeTo(String|Number,Number,Function)
*/
*/
fadeIn
:
function
(
speed
,
callback
,
easing
){
fadeIn
:
function
(
speed
,
callback
){
return
this
.
animate
({
opacity
:
"show"
},
speed
,
callback
,
easing
);
return
this
.
animate
({
opacity
:
"show"
},
speed
,
callback
);
},
},
/**
/**
...
@@ -191,8 +191,8 @@ jQuery.fn.extend({
...
@@ -191,8 +191,8 @@ jQuery.fn.extend({
* @see fadeIn(String|Number,Function)
* @see fadeIn(String|Number,Function)
* @see fadeTo(String|Number,Number,Function)
* @see fadeTo(String|Number,Number,Function)
*/
*/
fadeOut
:
function
(
speed
,
callback
,
easing
){
fadeOut
:
function
(
speed
,
callback
){
return
this
.
animate
({
opacity
:
"hide"
},
speed
,
callback
,
easing
);
return
this
.
animate
({
opacity
:
"hide"
},
speed
,
callback
);
},
},
/**
/**
...
@@ -219,8 +219,8 @@ jQuery.fn.extend({
...
@@ -219,8 +219,8 @@ jQuery.fn.extend({
* @see fadeIn(String|Number,Function)
* @see fadeIn(String|Number,Function)
* @see fadeOut(String|Number,Function)
* @see fadeOut(String|Number,Function)
*/
*/
fadeTo
:
function
(
speed
,
to
,
callback
,
easing
){
fadeTo
:
function
(
speed
,
to
,
callback
){
return
this
.
animate
({
opacity
:
to
},
speed
,
callback
,
easing
);
return
this
.
animate
({
opacity
:
to
},
speed
,
callback
);
},
},
/**
/**
...
@@ -251,13 +251,14 @@ jQuery.fn.extend({
...
@@ -251,13 +251,14 @@ jQuery.fn.extend({
* @param String easing (optional) easing effect
* @param String easing (optional) easing effect
* @cat Effects/Animations
* @cat Effects/Animations
*/
*/
animate
:
function
(
prop
,
speed
,
callback
,
easing
)
{
animate
:
function
(
prop
,
speed
,
easing
,
callback
)
{
return
this
.
queue
(
function
(){
return
this
.
queue
(
function
(){
this
.
curAnim
=
jQuery
.
extend
({},
prop
);
this
.
curAnim
=
jQuery
.
extend
({},
prop
);
var
opt
=
jQuery
.
speed
(
speed
,
easing
,
callback
);
for
(
var
p
in
prop
)
{
for
(
var
p
in
prop
)
{
var
e
=
new
jQuery
.
fx
(
this
,
jQuery
.
speed
(
speed
,
callback
),
p
,
easing
);
var
e
=
new
jQuery
.
fx
(
this
,
opt
,
p
);
if
(
prop
[
p
].
constructor
==
Number
)
if
(
prop
[
p
].
constructor
==
Number
)
e
.
custom
(
e
.
cur
(),
prop
[
p
]
);
e
.
custom
(
e
.
cur
(),
prop
[
p
]
);
else
else
...
@@ -295,26 +296,31 @@ jQuery.fn.extend({
...
@@ -295,26 +296,31 @@ jQuery.fn.extend({
jQuery
.
extend
({
jQuery
.
extend
({
speed
:
function
(
s
,
o
)
{
speed
:
function
(
speed
,
easing
,
fn
)
{
o
=
o
||
{};
var
opt
=
speed
.
constructor
==
Object
?
speed
:
{
complete
:
fn
||
!
fn
&&
easing
||
if
(
o
.
constructor
==
Function
)
speed
.
constructor
==
Function
&&
speed
,
o
=
{
complete
:
o
};
duration
:
speed
,
easing
:
fn
&&
easing
||
easing
&&
easing
.
constructor
!=
Function
&&
easing
};
var
ss
=
{
slow
:
600
,
fast
:
200
};
opt
.
duration
=
(
opt
.
duration
.
constructor
==
Number
?
o
.
duration
=
(
s
&&
s
.
constructor
==
Number
?
s
:
ss
[
s
])
||
400
;
opt
.
duration
:
{
slow
:
600
,
fast
:
200
}[
opt
.
duration
])
||
400
;
// Queueing
// Queueing
o
.
oldComplete
=
o
.
complete
;
o
pt
.
oldComplete
=
opt
.
complete
;
o
.
complete
=
function
(){
o
pt
.
complete
=
function
(){
jQuery
.
dequeue
(
this
,
"fx"
);
jQuery
.
dequeue
(
this
,
"fx"
);
if
(
o
.
oldComplete
&&
o
.
oldComplete
.
constructor
==
Function
)
if
(
o
pt
.
oldComplete
&&
opt
.
oldComplete
.
constructor
==
Function
)
o
.
oldComplete
.
apply
(
this
);
o
pt
.
oldComplete
.
apply
(
this
);
};
};
return
o
;
return
o
pt
;
},
},
easing
:
{},
queue
:
{},
queue
:
{},
dequeue
:
function
(
elem
,
type
){
dequeue
:
function
(
elem
,
type
){
...
@@ -337,26 +343,15 @@ jQuery.extend({
...
@@ -337,26 +343,15 @@ jQuery.extend({
* people. You've been warned.
* people. You've been warned.
*/
*/
fx
:
function
(
elem
,
options
,
prop
,
easing
){
fx
:
function
(
elem
,
options
,
prop
){
var
z
=
this
;
var
z
=
this
;
// The users options
z
.
o
=
{
duration
:
options
.
duration
||
400
,
complete
:
options
.
complete
,
step
:
options
.
step
,
easing
:
easing
||
'linear'
};
// The element
z
.
el
=
elem
;
// The styles
// The styles
var
y
=
z
.
el
.
style
;
var
y
=
elem
.
style
;
// Store display property
// Store display property
var
oldDisplay
=
jQuery
.
css
(
z
.
el
,
'display'
);
var
oldDisplay
=
jQuery
.
css
(
elem
,
'display'
);
// Set display property to block for animation
// Set display property to block for animation
y
.
display
=
"block"
;
y
.
display
=
"block"
;
// Make sure that nothing sneaks out
// Make sure that nothing sneaks out
...
@@ -375,12 +370,12 @@ jQuery.extend({
...
@@ -375,12 +370,12 @@ jQuery.extend({
// Figure out the maximum number to run to
// Figure out the maximum number to run to
z
.
max
=
function
(){
z
.
max
=
function
(){
return
parseFloat
(
jQuery
.
css
(
z
.
el
,
prop
)
);
return
parseFloat
(
jQuery
.
css
(
elem
,
prop
)
);
};
};
// Get the current size
// Get the current size
z
.
cur
=
function
(){
z
.
cur
=
function
(){
var
r
=
parseFloat
(
jQuery
.
curCSS
(
z
.
el
,
prop
)
);
var
r
=
parseFloat
(
jQuery
.
curCSS
(
elem
,
prop
)
);
return
r
&&
r
>
-
10000
?
r
:
z
.
max
();
return
r
&&
r
>
-
10000
?
r
:
z
.
max
();
};
};
...
@@ -397,15 +392,15 @@ jQuery.extend({
...
@@ -397,15 +392,15 @@ jQuery.extend({
// Simple 'show' function
// Simple 'show' function
z
.
show
=
function
(){
z
.
show
=
function
(){
if
(
!
z
.
el
.
orig
)
z
.
el
.
orig
=
{};
if
(
!
elem
.
orig
)
elem
.
orig
=
{};
// Remember where we started, so that we can go back to it later
// Remember where we started, so that we can go back to it later
z
.
el
.
orig
[
prop
]
=
this
.
cur
();
elem
.
orig
[
prop
]
=
this
.
cur
();
z
.
o
.
show
=
true
;
options
.
show
=
true
;
// Begin the animation
// Begin the animation
z
.
custom
(
0
,
z
.
el
.
orig
[
prop
]);
z
.
custom
(
0
,
elem
.
orig
[
prop
]);
// Stupid IE, look what you made me do
// Stupid IE, look what you made me do
if
(
prop
!=
"opacity"
)
if
(
prop
!=
"opacity"
)
...
@@ -414,38 +409,38 @@ jQuery.extend({
...
@@ -414,38 +409,38 @@ jQuery.extend({
// Simple 'hide' function
// Simple 'hide' function
z
.
hide
=
function
(){
z
.
hide
=
function
(){
if
(
!
z
.
el
.
orig
)
z
.
el
.
orig
=
{};
if
(
!
elem
.
orig
)
elem
.
orig
=
{};
// Remember where we started, so that we can go back to it later
// Remember where we started, so that we can go back to it later
z
.
el
.
orig
[
prop
]
=
this
.
cur
();
elem
.
orig
[
prop
]
=
this
.
cur
();
z
.
o
.
hide
=
true
;
options
.
hide
=
true
;
// Begin the animation
// Begin the animation
z
.
custom
(
z
.
el
.
orig
[
prop
],
0
);
z
.
custom
(
elem
.
orig
[
prop
],
0
);
};
};
//Simple 'toggle' function
//Simple 'toggle' function
z
.
toggle
=
function
()
{
z
.
toggle
=
function
()
{
if
(
!
z
.
el
.
orig
)
z
.
el
.
orig
=
{};
if
(
!
elem
.
orig
)
elem
.
orig
=
{};
// Remember where we started, so that we can go back to it later
// Remember where we started, so that we can go back to it later
z
.
el
.
orig
[
prop
]
=
this
.
cur
();
elem
.
orig
[
prop
]
=
this
.
cur
();
if
(
oldDisplay
==
'none'
)
{
if
(
oldDisplay
==
'none'
)
{
z
.
o
.
show
=
true
;
options
.
show
=
true
;
// Stupid IE, look what you made me do
// Stupid IE, look what you made me do
if
(
prop
!=
"opacity"
)
if
(
prop
!=
"opacity"
)
y
[
prop
]
=
"1px"
;
y
[
prop
]
=
"1px"
;
// Begin the animation
// Begin the animation
z
.
custom
(
0
,
z
.
el
.
orig
[
prop
]);
z
.
custom
(
0
,
elem
.
orig
[
prop
]);
}
else
{
}
else
{
z
.
o
.
hide
=
true
;
options
.
hide
=
true
;
// Begin the animation
// Begin the animation
z
.
custom
(
z
.
el
.
orig
[
prop
],
0
);
z
.
custom
(
elem
.
orig
[
prop
],
0
);
}
}
};
};
...
@@ -453,7 +448,7 @@ jQuery.extend({
...
@@ -453,7 +448,7 @@ jQuery.extend({
z
.
step
=
function
(
firstNum
,
lastNum
){
z
.
step
=
function
(
firstNum
,
lastNum
){
var
t
=
(
new
Date
()).
getTime
();
var
t
=
(
new
Date
()).
getTime
();
if
(
t
>
z
.
o
.
duration
+
z
.
startTime
)
{
if
(
t
>
options
.
duration
+
z
.
startTime
)
{
// Stop the timer
// Stop the timer
clearInterval
(
z
.
timer
);
clearInterval
(
z
.
timer
);
z
.
timer
=
null
;
z
.
timer
=
null
;
...
@@ -461,11 +456,11 @@ jQuery.extend({
...
@@ -461,11 +456,11 @@ jQuery.extend({
z
.
now
=
lastNum
;
z
.
now
=
lastNum
;
z
.
a
();
z
.
a
();
if
(
z
.
el
.
curAnim
)
z
.
el
.
curAnim
[
prop
]
=
true
;
if
(
elem
.
curAnim
)
elem
.
curAnim
[
prop
]
=
true
;
var
done
=
true
;
var
done
=
true
;
for
(
var
i
in
z
.
el
.
curAnim
)
for
(
var
i
in
elem
.
curAnim
)
if
(
z
.
el
.
curAnim
[
i
]
!==
true
)
if
(
elem
.
curAnim
[
i
]
!==
true
)
done
=
false
;
done
=
false
;
if
(
done
)
{
if
(
done
)
{
...
@@ -474,35 +469,36 @@ jQuery.extend({
...
@@ -474,35 +469,36 @@ jQuery.extend({
// Reset the display
// Reset the display
y
.
display
=
oldDisplay
;
y
.
display
=
oldDisplay
;
if
(
jQuery
.
css
(
z
.
el
,
'display'
)
==
'none'
)
if
(
jQuery
.
css
(
elem
,
'display'
)
==
'none'
)
y
.
display
=
'block'
;
y
.
display
=
'block'
;
// Hide the element if the "hide" operation was done
// Hide the element if the "hide" operation was done
if
(
z
.
o
.
hide
)
if
(
options
.
hide
)
y
.
display
=
'none'
;
y
.
display
=
'none'
;
// Reset the properties, if the item has been hidden or shown
// Reset the properties, if the item has been hidden or shown
if
(
z
.
o
.
hide
||
z
.
o
.
show
)
if
(
options
.
hide
||
options
.
show
)
for
(
var
p
in
z
.
el
.
curAnim
)
for
(
var
p
in
elem
.
curAnim
)
if
(
p
==
"opacity"
)
if
(
p
==
"opacity"
)
jQuery
.
attr
(
y
,
p
,
z
.
el
.
orig
[
p
]);
jQuery
.
attr
(
y
,
p
,
elem
.
orig
[
p
]);
else
else
y
[
p
]
=
''
;
y
[
p
]
=
''
;
}
}
// If a callback was provided, execute it
// If a callback was provided, execute it
if
(
done
&&
z
.
o
.
complete
&&
z
.
o
.
complete
.
constructor
==
Function
)
if
(
done
&&
options
.
complete
&&
options
.
complete
.
constructor
==
Function
)
// Execute the complete function
// Execute the complete function
z
.
o
.
complete
.
apply
(
z
.
el
);
options
.
complete
.
apply
(
elem
);
}
else
{
}
else
{
var
n
=
t
-
this
.
startTime
;
var
n
=
t
-
this
.
startTime
;
// Figure out where in the animation we are and set the number
// Figure out where in the animation we are and set the number
var
p
=
n
/
z
.
o
.
duration
;
var
p
=
n
/
options
.
duration
;
//if the easing function exists then use it else use default linear easing
if
(
jQuery
.
easing
&&
jQuery
.
easing
[
z
.
o
.
easing
])
// If the easing function exists, then use it
z
.
now
=
jQuery
.
easing
[
z
.
o
.
easing
](
p
,
n
,
firstNum
,
(
lastNum
-
firstNum
),
z
.
o
.
duration
);
z
.
now
=
options
.
easing
&&
jQuery
.
easing
[
options
.
easing
]
?
else
jQuery
.
easing
[
options
.
easing
](
p
,
n
,
firstNum
,
(
lastNum
-
firstNum
),
options
.
duration
)
:
z
.
now
=
((
-
Math
.
cos
(
p
*
Math
.
PI
)
/
2
)
+
0.5
)
*
(
lastNum
-
firstNum
)
+
firstNum
;
// else use default linear easing
((
-
Math
.
cos
(
p
*
Math
.
PI
)
/
2
)
+
0.5
)
*
(
lastNum
-
firstNum
)
+
firstNum
;
// Perform the next step of the animation
// Perform the next step of the animation
z
.
a
();
z
.
a
();
...
...
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