From 2c05cb6150b9512d2d991c7e97efff8a0b19bde5 Mon Sep 17 00:00:00 2001
From: Jonas Trevisan <jonhkr@gmail.com>
Date: Tue, 17 Sep 2013 12:57:10 -0300
Subject: [PATCH] added queue setting to transition module

Former-commit-id: b9586d14b0b1f865cc900a43f6c2fb9132386775
Former-commit-id: edca1e0e018e538adb3a7a71a9508db793d6562e
---
 src/modules/dropdown.js   | 14 ++++++++++++--
 src/modules/transition.js |  7 ++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/modules/dropdown.js b/src/modules/dropdown.js
index 7285e4993..34241f703 100755
--- a/src/modules/dropdown.js
+++ b/src/modules/dropdown.js
@@ -349,7 +349,12 @@ $.fn.dropdown = function(parameters) {
                 callback();
               }
               else if($.fn.transition !== undefined) {
-                $currentMenu.transition(settings.transition + ' in', settings.duration, callback);
+                $currentMenu.transition({
+                  animation : settings.transition + ' in',
+                  duration  : settings.duration,
+                  complete  : callback,
+                  queue     : false
+                })
               }
               else if(settings.transition == 'slide down') {
                 $currentMenu
@@ -392,7 +397,12 @@ $.fn.dropdown = function(parameters) {
             if(dropdown.is.visible($currentMenu) ) {
               dropdown.verbose('Doing menu hide animation', $currentMenu);
               if($.fn.transition !== undefined) {
-                $currentMenu.transition(settings.transition + ' out', settings.duration, callback);
+                $currentMenu.transition({
+                  animation : settings.transition + ' out',
+                  duration  : settings.duration,
+                  complete  : callback,
+                  queue     : false
+                })
               }
               else if(settings.transition == 'none') {
                 callback();
diff --git a/src/modules/transition.js b/src/modules/transition.js
index 19e26c107..8e16235bc 100755
--- a/src/modules/transition.js
+++ b/src/modules/transition.js
@@ -101,7 +101,9 @@ $.fn.transition = function() {
           settings = overrideSettings || settings;
           module.debug('Preparing animation', settings.animation);
           if(module.is.animating()) {
-            module.queue(settings.animation);
+            if(settins.queue) {
+              module.queue(settings.animation);
+            }
             return false;
           }
           module.save.conditions();
@@ -621,6 +623,9 @@ $.fn.transition.settings = {
   animation    : 'fade',
   duration     : '700ms',
 
+  // queue up animations
+  queue        : true,
+
   className    : {
     transition : 'ui transition',
     animating  : 'animating',