Browse Source

Popup now doesnt queue animations, #1062

pull/1177/head
jlukic 10 years ago
parent
commit
3d503536af
1 changed files with 10 additions and 3 deletions
  1. 13
      src/definitions/modules/popup.js

13
src/definitions/modules/popup.js

@ -323,14 +323,17 @@ $.fn.popup = function(parameters) {
animate: {
show: function(callback) {
callback = callback || function(){};
$module
.addClass(className.visible)
;
if(settings.transition && $.fn.transition !== undefined && $module.transition('is supported')) {
$popup
.transition({
animation : settings.transition + ' in',
queue : false,
duration : settings.duration,
start: function() {
$module
.addClass(className.visible)
;
},
complete : function() {
module.bind.close();
$.proxy(callback, element)();
@ -339,6 +342,9 @@ $.fn.popup = function(parameters) {
;
}
else {
$module
.addClass(className.visible)
;
$popup
.stop()
.fadeIn(settings.duration, settings.easing, function() {
@ -356,6 +362,7 @@ $.fn.popup = function(parameters) {
$popup
.transition({
animation : settings.transition + ' out',
queue : false,
duration : settings.duration,
complete : function() {
module.reset();

Loading…
Cancel
Save