git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9c173f7
)
Fixed the issue with queued effects becoming corrupted.
author
John Resig
<jeresig@gmail.com>
Thu, 17 Aug 2006 02:38:34 +0000
(
02:38
+0000)
committer
John Resig
<jeresig@gmail.com>
Thu, 17 Aug 2006 02:38:34 +0000
(
02:38
+0000)
src/fx/fx.js
patch
|
blob
|
history
diff --git
a/src/fx/fx.js
b/src/fx/fx.js
index
45cc2d9
..
de65cfa
100644
(file)
--- a/
src/fx/fx.js
+++ b/
src/fx/fx.js
@@
-475,11
+475,6
@@
jQuery.extend({
// Reset the overflow
y.overflow = z.el.oldOverflow;
// Reset the overflow
y.overflow = z.el.oldOverflow;
- // If a callback was provided, execute it
- if( z.o.complete && z.o.complete.constructor == Function )
- // Execute the complete function
- z.o.complete.apply( z.el );
-
// Reset the property, if the item has been hidden
if ( z.o.hide )
y[ prop ] = z.el.orig[ prop ].constructor == Number && prop != "opacity" ?
// Reset the property, if the item has been hidden
if ( z.o.hide )
y[ prop ] = z.el.orig[ prop ].constructor == Number && prop != "opacity" ?
@@
-487,6
+482,11
@@
jQuery.extend({
// set its height and/or width to auto
jQuery.setAuto( z.el, prop );
// set its height and/or width to auto
jQuery.setAuto( z.el, prop );
+
+ // If a callback was provided, execute it
+ if( z.o.complete && z.o.complete.constructor == Function )
+ // Execute the complete function
+ z.o.complete.apply( z.el );
} else {
// Figure out where in the animation we are and set the number
var p = (t - this.startTime) / z.o.duration;
} else {
// Figure out where in the animation we are and set the number
var p = (t - this.startTime) / z.o.duration;