diff options
Diffstat (limited to 'ui/jquery.effects.core.js')
| -rw-r--r-- | ui/jquery.effects.core.js | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/ui/jquery.effects.core.js b/ui/jquery.effects.core.js index 626ab1a89..fe2bf298d 100644 --- a/ui/jquery.effects.core.js +++ b/ui/jquery.effects.core.js @@ -268,16 +268,15 @@ $.effects.animateClass = function( value, duration, easing, callback ) { // map all animated objects again - this time collecting a promise allAnimations = allAnimations.map(function() { var styleInfo = this, - dfd = $.Deferred(); - - this.el.animate( this.diff, { - duration: o.duration, - easing: o.easing, - queue: false, - complete: function() { - dfd.resolve( styleInfo ); - } - }); + dfd = $.Deferred(), + opts = jQuery.extend({}, o, { + queue: false, + complete: function() { + dfd.resolve( styleInfo ); + } + }); + + this.el.animate( this.diff, opts ); return dfd.promise(); }); @@ -429,6 +428,15 @@ $.extend( $.effects, { }, active = document.activeElement; + // support: Firefox + // Firefox incorrectly exposes anonymous content + // https://bugzilla.mozilla.org/show_bug.cgi?id=561664 + try { + active.id; + } catch( e ) { + active = document.body; + } + element.wrap( wrapper ); // Fixes #7595 - Elements lose focus when wrapped. @@ -722,7 +730,7 @@ $.each( baseEasings, function( name, easeIn ) { $.easing[ "easeInOut" + name ] = function( p ) { return p < 0.5 ? easeIn( p * 2 ) / 2 : - easeIn( p * -2 + 2 ) / -2 + 1; + 1 - easeIn( p * -2 + 2 ) / 2; }; }); |