[fixed] correctly updates the window scroll position

danieljuhl · Jun 30, 2015 · f4ed900 · f4ed900
1 parent 3fe4d7d
commit f4ed900
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/modules/ScrollManagementMixin.js b/modules/ScrollManagementMixin.js
@@ -61,9 +61,7 @@ var ScrollManagementMixin = {
 
  if (locationState && this.props.shouldUpdateScrollPosition(this.state, prevState)) {
  var { scrollX, scrollY } = locationState;
-
- if (scrollX != null && scrollY != null)
- this.props.updateScrollPosition(location.navigationType, scrollX, scrollY);
+ this.props.updateScrollPosition(location.navigationType, scrollX || 0, scrollY || 0);
  }
  }
 

diff --git a/modules/__tests__/scrollManagement-test.js b/modules/__tests__/scrollManagement-test.js
@@ -24,7 +24,7 @@ describe('Scroll management', function () {
 
  Inbox = React.createClass({
  render() {
- return <p>This is the inbox.</p>;
+ return <p style={{padding: '100px 3000px 3000px 100px'}}>This is the inbox.</p>;
  }
  });