From 3d503536afc814e700a6a0e03ae7d6b02252bc25 Mon Sep 17 00:00:00 2001 From: jlukic Date: Mon, 13 Oct 2014 19:09:45 -0400 Subject: [PATCH] Popup now doesnt queue animations, #1062 --- src/definitions/modules/popup.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/definitions/modules/popup.js b/src/definitions/modules/popup.js index 9edde27b0..31eac9090 100755 --- a/src/definitions/modules/popup.js +++ b/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();