git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for #237
[jquery.git]
/
src
/
fx
/
fx.js
diff --git
a/src/fx/fx.js
b/src/fx/fx.js
index
b51129e
..
6444986
100644
(file)
--- a/
src/fx/fx.js
+++ b/
src/fx/fx.js
@@
-315,7
+315,7
@@
jQuery.fn.extend({
animate: function(prop,speed,callback) {
return this.queue(function(){
animate: function(prop,speed,callback) {
return this.queue(function(){
- this.curAnim = prop;
+ this.curAnim = jQuery.extend({}, prop);
for ( var p in prop ) {
var e = new jQuery.fx( this, jQuery.speed(speed,callback), p );
for ( var p in prop ) {
var e = new jQuery.fx( this, jQuery.speed(speed,callback), p );
@@
-485,11
+485,10
@@
jQuery.extend({
// Remember where we started, so that we can go back to it later
z.el.orig[prop] = this.cur();
// Remember where we started, so that we can go back to it later
z.el.orig[prop] = this.cur();
+ var start = z.el.orig[prop];
+
// Begin the animation
// Begin the animation
- if (prop == "opacity")
- z.custom(z.el.orig[prop], 1);
- else
- z.custom(0, z.el.orig[prop]);
+ z.custom(0, z.el.orig[prop]);
// Stupid IE, look what you made me do
if ( prop != "opacity" )
// Stupid IE, look what you made me do
if ( prop != "opacity" )
@@
-510,7
+509,7
@@
jQuery.extend({
};
// Remember the overflow of the element
};
// Remember the overflow of the element
- if ( !z.el.oldOverlay )
+ if ( !z.el.oldOverflow )
z.el.oldOverflow = jQuery.css( z.el, "overflow" );
// Make sure that nothing sneaks out
z.el.oldOverflow = jQuery.css( z.el, "overflow" );
// Make sure that nothing sneaks out