Skip to content

Commit 64739e4

Browse files
committed
Merge pull request #330 from gaearon/remove-preserveScrollPosition
Remove remaining preserveScrollPosition definitions
2 parents 4e90bbe + da8e0e5 commit 64739e4

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

modules/components/Route.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,17 +78,10 @@ var Route = React.createClass({
7878

7979
propTypes: {
8080
handler: React.PropTypes.any.isRequired,
81-
preserveScrollPosition: React.PropTypes.bool.isRequired,
8281
path: React.PropTypes.string,
8382
name: React.PropTypes.string
8483
},
8584

86-
getDefaultProps: function () {
87-
return {
88-
preserveScrollPosition: false
89-
};
90-
},
91-
9285
render: function () {
9386
throw new Error(
9487
'The <Route> component should not be rendered directly. You may be ' +

modules/components/Routes.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,13 @@ var Routes = React.createClass({
7373

7474
propTypes: {
7575
onAbortedTransition: React.PropTypes.func.isRequired,
76-
onTransitionError: React.PropTypes.func.isRequired,
77-
preserveScrollPosition: React.PropTypes.bool
76+
onTransitionError: React.PropTypes.func.isRequired
7877
},
7978

8079
getDefaultProps: function () {
8180
return {
8281
onAbortedTransition: defaultAbortedTransitionHandler,
83-
onTransitionError: defaultTransitionErrorHandler,
84-
preserveScrollPosition: false
82+
onTransitionError: defaultTransitionErrorHandler
8583
};
8684
},
8785

0 commit comments

Comments
 (0)