From f1238398c07ec0321acba3fc3d4436644a2a7465 Mon Sep 17 00:00:00 2001
From: jlukic <jacklukic@gmail.com>
Date: Thu, 20 Nov 2014 13:27:22 -0500
Subject: [PATCH] Refix the transition fix, bobo mistake

---
 src/definitions/modules/transition.js | 59 ++++++++++++++-------------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/src/definitions/modules/transition.js b/src/definitions/modules/transition.js
index ed7760b8a..8e11a935e 100644
--- a/src/definitions/modules/transition.js
+++ b/src/definitions/modules/transition.js
@@ -193,7 +193,7 @@ $.fn.transition = function() {
             else {
               module.restore.conditions();
             }
-            module.remove.duration();
+            module.remove.animation();
             module.remove.animating();
           }
           $.proxy(settings.onComplete, this)();
@@ -233,6 +233,24 @@ $.fn.transition = function() {
             $.proxy(settings.onStart, this)();
             module.debug('Starting tween', animation, $module.attr('class'));
           },
+          duration: function(animationName, duration) {
+            duration = duration || settings.duration;
+            duration = (typeof duration == 'number')
+              ? duration + 'ms'
+              : duration
+            ;
+            module.verbose('Setting animation duration', duration);
+            $module
+              .css({
+                '-webkit-animation-duration': duration,
+                '-moz-animation-duration': duration,
+                '-ms-animation-duration': duration,
+                '-o-animation-duration': duration,
+                'animation-duration':  duration
+              })
+            ;
+            console.log(animationName + ' ' + duration);
+          },
           display: function() {
             var
               style              = module.get.style(),
@@ -269,23 +287,6 @@ $.fn.transition = function() {
               .addClass(className.looping)
             ;
           },
-          duration: function(duration) {
-            duration = duration || settings.duration;
-            duration = (typeof duration == 'number')
-              ? duration + 'ms'
-              : duration
-            ;
-            module.verbose('Setting animation duration', duration);
-            $module
-              .css({
-                '-webkit-animation-duration': duration + '0s 0s',
-                '-moz-animation-duration': duration + '0s 0s',
-                '-ms-animation-duration': duration + '0s 0s',
-                '-o-animation-duration': duration + '0s 0s',
-                'animation-duration': duration + '0s 0s'
-              })
-            ;
-          },
           hidden: function() {
             if(!module.is.hidden()) {
               $module
@@ -357,6 +358,17 @@ $.fn.transition = function() {
           animating: function() {
             $module.removeClass(className.animating);
           },
+          animation: function() {
+            $module
+              .css({
+                '-webkit-animation' : '',
+                '-moz-animation'    : '',
+                '-ms-animation'     : '',
+                '-o-animation'      : '',
+                'animation'         : ''
+              })
+            ;
+          },
           display: function() {
             $module.css('display', '');
           },
@@ -366,17 +378,6 @@ $.fn.transition = function() {
               .removeClass(className.outward)
             ;
           },
-          duration: function() {
-            $module
-              .css({
-                '-webkit-animation-duration' : '',
-                '-moz-animation-duration'    : '',
-                '-ms-animation-duration'     : '',
-                '-o-animation-duration'      : '',
-                'animation-duration'         : ''
-              })
-            ;
-          },
           hidden: function() {
             $module.removeClass(className.hidden);
           },