fx: animate() can now animate any property on a generic object or native wrapper (i.e. window.outerWidth)
This commit is contained in:
parent
bf14ac1236
commit
91a84d233d
|
@ -73,11 +73,9 @@ jQuery.fn.extend({
|
||||||
var optall = jQuery.speed(speed, easing, callback);
|
var optall = jQuery.speed(speed, easing, callback);
|
||||||
|
|
||||||
return this[ optall.queue === false ? "each" : "queue" ](function(){
|
return this[ optall.queue === false ? "each" : "queue" ](function(){
|
||||||
if ( this.nodeType != 1)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
var opt = jQuery.extend({}, optall), p,
|
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 ) {
|
for ( p in prop ) {
|
||||||
if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
|
if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
|
||||||
|
@ -271,7 +269,7 @@ jQuery.fx.prototype = {
|
||||||
|
|
||||||
// Get the current size
|
// Get the current size
|
||||||
cur: function(force){
|
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 ];
|
return this.elem[ this.prop ];
|
||||||
|
|
||||||
var r = parseFloat(jQuery.css(this.elem, this.prop, force));
|
var r = parseFloat(jQuery.css(this.elem, this.prop, force));
|
||||||
|
@ -421,7 +419,7 @@ jQuery.extend( jQuery.fx, {
|
||||||
},
|
},
|
||||||
|
|
||||||
_default: function(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 );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in a new issue