From 6052d19e903ce73cd9c500193c98b44ee3a3a847 Mon Sep 17 00:00:00 2001
From: Adrian Gillette <gillette@adrian.net>
Date: Sat, 21 Mar 2015 09:08:31 -0700
Subject: [PATCH] fix: corrected flip() to appropriately use custom transition
 and callback definitions

---
 src/scripts/directives/fa-flipper.js | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/scripts/directives/fa-flipper.js b/src/scripts/directives/fa-flipper.js
index d177f0e2..29722e01 100644
--- a/src/scripts/directives/fa-flipper.js
+++ b/src/scripts/directives/fa-flipper.js
@@ -28,10 +28,10 @@
       <fa-flipper>
         <fa-modifier fa-size="[200, 200]">
           <fa-surface fa-background-color="'yellow'" fa-click="flipIt()">Click me to see me flip!</fa-surface>
-        </fa-modifier>  
+        </fa-modifier>
         <fa-modifier fa-size="[200, 200]">
           <fa-surface fa-background-color="'red'" fa-click="flipIt()">Flip me again!</fa-surface>
-        </fa-modifier>  
+        </fa-modifier>
       </fa-flipper>
     </fa-app>
   </file>
@@ -79,11 +79,21 @@ angular.module('famous.angular')
               isolate.renderNode = new Flipper(options);
               $famousDecorator.addRole('renderable',isolate);
               isolate.show();
-           
+
               isolate.children = [];
 
               isolate.flip = function (overrideOptions) {
-                isolate.renderNode.flip(overrideOptions || scope.$eval(attrs.faOptions));
+                if (overrideOptions && overrideOptions.callback) {
+                  if (overrideOptions.transition) {
+                    isolate.renderNode.flip(overrideOptions.transition, overrideOptions.callback);
+                  } else {
+                    isolate.renderNode.flip(scope.$eval(attrs.faOptions.transition), overrideOptions.callback);
+                  }
+                } else if (overrideOptions && overrideOptions.transition) {
+                  isolate.renderNode.flip(overrideOptions.transition);
+                } else {
+                  isolate.renderNode.flip(scope.$eval(attrs.faOptions.transition));
+                }
               };
 
               $famousDecorator.sequenceWith(
@@ -122,4 +132,4 @@ angular.module('famous.angular')
         }
       };
     }
-  ]);
\ No newline at end of file
+  ]);