Skip to content

Commit

Permalink
fx: animate() can now animate any property on a generic object or nat…
Browse files Browse the repository at this point in the history
…ive wrapper (i.e. window.outerWidth)
  • Loading branch information
Paul Bakaus committed Jun 20, 2008
1 parent bf14ac1 commit 91a84d2
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions src/fx.js
Expand Up @@ -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);
Expand Down Expand Up @@ -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));
Expand Down Expand Up @@ -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 );
}
}
});

0 comments on commit 91a84d2

Please sign in to comment.