Browse Source

Transition hide now works correctly during an animation

1.0
jlukic 10 years ago
parent
commit
f7052b52fc
1 changed files with 9 additions and 4 deletions
  1. 13
      src/definitions/modules/transition.js

13
src/definitions/modules/transition.js

@ -155,9 +155,8 @@ $.fn.transition = function() {
reset: function() { reset: function() {
module.debug('Resetting animation to beginning conditions'); module.debug('Resetting animation to beginning conditions');
$module.off(animationEnd + eventNamespace);
module.remove.animationEndCallback();
module.restore.conditions(); module.restore.conditions();
module.hide();
module.remove.animating(); module.remove.animating();
}, },
@ -180,7 +179,6 @@ $.fn.transition = function() {
module.verbose('Animation is outward, hiding element'); module.verbose('Animation is outward, hiding element');
module.restore.conditions(); module.restore.conditions();
module.hide(); module.hide();
module.remove.display();
$.proxy(settings.onHide, this)(); $.proxy(settings.onHide, this)();
} }
else if( module.is.inward() ) { else if( module.is.inward() ) {
@ -217,7 +215,7 @@ $.fn.transition = function() {
module.save.conditions(); module.save.conditions();
} }
module.remove.direction(); module.remove.direction();
$module.off('.complete');
module.remove.animationEndCallback();
if(module.can.transition() && !module.has.direction()) { if(module.can.transition() && !module.has.direction()) {
module.set.direction(); module.set.direction();
} }
@ -368,6 +366,9 @@ $.fn.transition = function() {
}) })
; ;
}, },
animationEndCallback: function() {
$module.off('.complete');
},
display: function() { display: function() {
$module.css('display', ''); $module.css('display', '');
}, },
@ -593,6 +594,10 @@ $.fn.transition = function() {
hide: function() { hide: function() {
module.verbose('Hiding element'); module.verbose('Hiding element');
if( module.is.animating() ) {
module.reset();
}
module.remove.display();
module.remove.visible(); module.remove.visible();
module.set.hidden(); module.set.hidden();
module.repaint(); module.repaint();

Loading…
Cancel
Save