Merge pull request #330 from gaearon/remove-preserveScrollPosition

Remove remaining preserveScrollPosition definitions
remix-run · Oct 3, 2014 · 64739e4 · 64739e4
2 parents 4e90bbe + da8e0e5
commit 64739e4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/modules/components/Route.js b/modules/components/Route.js
@@ -78,17 +78,10 @@ var Route = React.createClass({
 
   propTypes: {
     handler: React.PropTypes.any.isRequired,
-    preserveScrollPosition: React.PropTypes.bool.isRequired,
     path: React.PropTypes.string,
     name: React.PropTypes.string
   },
 
-  getDefaultProps: function () {
-    return {
-      preserveScrollPosition: false
-    };
-  },
-
   render: function () {
     throw new Error(
       'The <Route> component should not be rendered directly. You may be ' +

diff --git a/modules/components/Routes.js b/modules/components/Routes.js
@@ -73,15 +73,13 @@ var Routes = React.createClass({
 
   propTypes: {
     onAbortedTransition: React.PropTypes.func.isRequired,
-    onTransitionError: React.PropTypes.func.isRequired,
-    preserveScrollPosition: React.PropTypes.bool
+    onTransitionError: React.PropTypes.func.isRequired
   },
 
   getDefaultProps: function () {
     return {
       onAbortedTransition: defaultAbortedTransitionHandler,
-      onTransitionError: defaultTransitionErrorHandler,
-      preserveScrollPosition: false
+      onTransitionError: defaultTransitionErrorHandler
     };
   },