Merge pull request #110 from akiran/flicker-issue

Fix for touchstonejs/touchstonejs-starter#51
touchstonejs · Apr 23, 2016 · 1078c4d · 1078c4d
2 parents a98266e + ab54045
commit 1078c4d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/core/ViewManager.js b/src/core/ViewManager.js
@@ -146,8 +146,8 @@ var ViewManager = React.createClass({
 				var transitionDurationEnter = 10;
 				var transitionDurationLeave = 340;
 			} else {
-				var transitionDurationEnter = 500;
-				var transitionDurationLeave = 500;
+				var transitionDurationEnter = this.state.options.transition === 'instant'? 50: 500;
+				var transitionDurationLeave = this.state.options.transition === 'instant'? 50: 500;
 			}
 		}
 		return (