From 91a84d233d887dfe08f659779a31d43fb36cf3aa Mon Sep 17 00:00:00 2001 From: Paul Bakaus Date: Fri, 20 Jun 2008 09:02:48 +0000 Subject: [PATCH] fx: animate() can now animate any property on a generic object or native wrapper (i.e. window.outerWidth) --- src/fx.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/fx.js b/src/fx.js index ee8ab81..b9ca81e 100644 --- a/src/fx.js +++ b/src/fx.js @@ -73,12 +73,10 @@ jQuery.fn.extend({ var optall = jQuery.speed(speed, easing, callback); return this[ optall.queue === false ? "each" : "queue" ](function(){ - if ( this.nodeType != 1) - return false; - + var opt = jQuery.extend({}, optall), p, - hidden = jQuery(this).is(":hidden"), self = this; - + hidden = this.nodeType != 1 ? false : jQuery(this).is(":hidden"), self = this; + for ( p in prop ) { if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden ) return opt.complete.call(this); @@ -271,7 +269,7 @@ jQuery.fx.prototype = { // Get the current size cur: function(force){ - if ( this.elem[this.prop] != null && this.elem.style[this.prop] == null ) + 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)); @@ -421,7 +419,7 @@ jQuery.extend( jQuery.fx, { }, _default: function(fx){ - fx.elem.style[ fx.prop ] = fx.now + fx.unit; + ( fx.elem.style && ( fx.elem.style[ fx.prop ] = fx.now + fx.unit ) ) || ( fx.elem[ fx.prop ] = fx.now ); } } }); -- 1.7.10.4