Skip to content
Permalink
Browse files

Class Animation: Use .attr( "class" ) instead of .attr( "className" )…

… and adjust the queueing logic for jQuery 1.6 compatibility. Fixes #7275 - $.effects.animateClass broken in jQuery 1.6."
  • Loading branch information
scottgonzalez committed Apr 27, 2011
1 parent cd61fb1 commit 60d4e0ae42efd780e6147f981c55bdfeafdfaa54
Showing with 24 additions and 25 deletions.
  1. +24 −25 ui/jquery.effects.core.js
@@ -234,45 +234,44 @@ $.effects.animateClass = function( value, duration, easing, callback ) {
easing = null;
}

return this.queue( 'fx', function() {
return this.queue(function() {
var that = $( this ),
originalStyleAttr = that.attr( 'style' ) || ' ',
originalStyle = filterStyles( getElementStyles.call( this ) ),
newStyle,
className = that.attr( 'className' );
className = that.attr( 'class' );

$.each( classAnimationActions, function(i, action) {
if ( value[ action ] ) {
that[ action + 'Class' ]( value[ action ] );
}
});
newStyle = filterStyles( getElementStyles.call( this ) );
that.attr( 'className', className );

that.animate( styleDifference( originalStyle, newStyle ), duration, easing, function() {
$.each( classAnimationActions, function( i, action ) {
if ( value[ action ] ) {
that[ action + 'Class' ]( value[ action ] );
that.attr( 'class', className );

that.animate( styleDifference( originalStyle, newStyle ), {
queue: false,
duration: duration,
easing: easing,
complete: function() {
$.each( classAnimationActions, function( i, action ) {
if ( value[ action ] ) {
that[ action + 'Class' ]( value[ action ] );
}
});
// work around bug in IE by clearing the cssText before setting it
if ( typeof that.attr( 'style' ) == 'object' ) {
that.attr( 'style' ).cssText = '';
that.attr( 'style' ).cssText = originalStyleAttr;
} else {
that.attr( 'style', originalStyleAttr );
}
});
// work around bug in IE by clearing the cssText before setting it
if ( typeof that.attr( 'style' ) == 'object' ) {
that.attr( 'style' ).cssText = '';
that.attr( 'style' ).cssText = originalStyleAttr;
} else {
that.attr( 'style', originalStyleAttr );
}
if ( callback ) {
callback.apply( this, arguments );
if ( callback ) {
callback.apply( this, arguments );
}
$.dequeue( this );
}
});

// $.animate adds a function to the end of the queue
// but we want it at the front
var queue = $.queue( this ),
anim = queue.splice( queue.length - 1, 1 )[ 0 ];
queue.splice( 1, 0, anim );
$.dequeue( this );
});
};

0 comments on commit 60d4e0a

Please sign in to comment.
You can’t perform that action at this time.