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
06c18532
Commit
06c18532
authored
Nov 16, 2006
by
Brandon Aaron
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Restore display property in fx module after animation is completed.
parent
6404d6e3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
8 deletions
+12
-8
fx.js
src/fx/fx.js
+12
-8
No files found.
src/fx/fx.js
View file @
06c18532
...
@@ -422,6 +422,13 @@ jQuery.extend({
...
@@ -422,6 +422,13 @@ jQuery.extend({
// The styles
// The styles
var
y
=
z
.
el
.
style
;
var
y
=
z
.
el
.
style
;
// Store display property
var
oldDisplay
=
jQuery
.
css
(
z
.
el
,
'display'
);
// Set display property to block for animation
y
.
display
=
"block"
;
// Make sure that nothing sneaks out
y
.
overflow
=
"hidden"
;
// Simple function for setting a style value
// Simple function for setting a style value
z
.
a
=
function
(){
z
.
a
=
function
(){
...
@@ -432,8 +439,6 @@ jQuery.extend({
...
@@ -432,8 +439,6 @@ jQuery.extend({
jQuery
.
attr
(
y
,
"opacity"
,
z
.
now
);
// Let attr handle opacity
jQuery
.
attr
(
y
,
"opacity"
,
z
.
now
);
// Let attr handle opacity
else
if
(
parseInt
(
z
.
now
)
)
// My hate for IE will never die
else
if
(
parseInt
(
z
.
now
)
)
// My hate for IE will never die
y
[
prop
]
=
parseInt
(
z
.
now
)
+
"px"
;
y
[
prop
]
=
parseInt
(
z
.
now
)
+
"px"
;
y
.
display
=
"block"
;
};
};
// Figure out the maximum number to run to
// Figure out the maximum number to run to
...
@@ -488,9 +493,6 @@ jQuery.extend({
...
@@ -488,9 +493,6 @@ jQuery.extend({
z
.
custom
(
z
.
el
.
orig
[
prop
],
0
);
z
.
custom
(
z
.
el
.
orig
[
prop
],
0
);
};
};
// Make sure that nothing sneaks out
y
.
overflow
=
"hidden"
;
// Each step of an animation
// Each step of an animation
z
.
step
=
function
(
firstNum
,
lastNum
){
z
.
step
=
function
(
firstNum
,
lastNum
){
var
t
=
(
new
Date
()).
getTime
();
var
t
=
(
new
Date
()).
getTime
();
...
@@ -513,13 +515,15 @@ jQuery.extend({
...
@@ -513,13 +515,15 @@ jQuery.extend({
if
(
done
)
{
if
(
done
)
{
// Reset the overflow
// Reset the overflow
y
.
overflow
=
''
;
y
.
overflow
=
''
;
// Reset the display
y
.
display
=
oldDisplay
;
if
(
jQuery
.
css
(
z
.
el
,
'display'
)
==
'none'
)
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
(
z
.
o
.
hide
)
y
.
display
=
'none'
;
y
.
display
=
'none'
;
// Otherwise reset the display property
else
if
(
z
.
o
.
show
)
y
.
display
=
''
;
// 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
(
z
.
o
.
hide
||
z
.
o
.
show
)
...
...
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