Merge pull request #1449 from mrydengren/fixed/window-scroll-position

[fixed] correctly updates the window scroll position

Author: mjackson

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);
     }
   }
 

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>;
       }
     });