aboutsummaryrefslogtreecommitdiffstats
path: root/src/fx.js
diff options
context:
space:
mode:
authorPaul Bakaus <paul.bakaus@googlemail.com>2008-06-20 09:02:48 +0000
committerPaul Bakaus <paul.bakaus@googlemail.com>2008-06-20 09:02:48 +0000
commit91a84d233d887dfe08f659779a31d43fb36cf3aa (patch)
treedbf7ceadaf24d92cd7cd7dd4f0edeb902c6905ce /src/fx.js
parentbf14ac123622da377624ab2e4babddcce4f9cdba (diff)
downloadjquery-91a84d233d887dfe08f659779a31d43fb36cf3aa.tar.gz
jquery-91a84d233d887dfe08f659779a31d43fb36cf3aa.zip
fx: animate() can now animate any property on a generic object or native wrapper (i.e. window.outerWidth)
Diffstat (limited to 'src/fx.js')
-rw-r--r--src/fx.js12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/fx.js b/src/fx.js
index ee8ab81a9..b9ca81eb5 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 );
}
}
});