Browse Source

Dimmer now can be clicked even before element has finished animating in, #1363

pull/1407/head
jlukic 9 years ago
parent
commit
75b4f578ae
1 changed files with 7 additions and 5 deletions
  1. 12
      src/definitions/modules/sidebar.js

12
src/definitions/modules/sidebar.js

@ -425,6 +425,7 @@ $.fn.sidebar = function(parameters) {
module.set.transition(); module.set.transition();
module.repaint(); module.repaint();
animate = function() { animate = function() {
module.bind.clickaway();
module.add.bodyCSS(); module.add.bodyCSS();
module.set.animating(); module.set.animating();
module.set.visible(); module.set.visible();
@ -436,14 +437,14 @@ $.fn.sidebar = function(parameters) {
}; };
transitionEnd = function(event) { transitionEnd = function(event) {
if( event.target == $transition[0] ) { if( event.target == $transition[0] ) {
$transition.off(transitionEvent + eventNamespace, transitionEnd);
$transition.off(transitionEvent + elementNamespace, transitionEnd);
module.remove.animating(); module.remove.animating();
module.bind.clickaway();
module.bind.scrollLock(); module.bind.scrollLock();
$.proxy(callback, element)(); $.proxy(callback, element)();
} }
}; };
$transition.on(transitionEvent + eventNamespace, transitionEnd);
$transition.off(transitionEvent + elementNamespace);
$transition.on(transitionEvent + elementNamespace, transitionEnd);
requestAnimationFrame(animate); requestAnimationFrame(animate);
}, },
@ -476,7 +477,7 @@ $.fn.sidebar = function(parameters) {
}; };
transitionEnd = function(event) { transitionEnd = function(event) {
if( event.target == $transition[0] ) { if( event.target == $transition[0] ) {
$transition.off(transitionEvent + eventNamespace, transitionEnd);
$transition.off(transitionEvent + elementNamespace, transitionEnd);
module.remove.animating(); module.remove.animating();
module.remove.transition(); module.remove.transition();
module.remove.bodyCSS(); module.remove.bodyCSS();
@ -486,7 +487,8 @@ $.fn.sidebar = function(parameters) {
$.proxy(callback, element)(); $.proxy(callback, element)();
} }
}; };
$transition.on(transitionEvent + eventNamespace, transitionEnd);
$transition.off(transitionEvent + elementNamespace);
$transition.on(transitionEvent + elementNamespace, transitionEnd);
requestAnimationFrame(animate); requestAnimationFrame(animate);
}, },

Loading…
Cancel
Save