Keep timelines in the UI trimmed when possible

1 files changed, 10 insertions, 4 deletions

diff --git a/app/assets/javascripts/components/components/status_list.jsx b/app/assets/javascripts/components/components/status_list.jsx
index f989ef895..b48d94405 100644
--- a/app/assets/javascripts/components/components/status_list.jsx
+++ b/app/assets/javascripts/components/components/status_list.jsx
@@ -1,14 +1,16 @@
-import Status              from './status';
-import ImmutablePropTypes  from 'react-immutable-proptypes';
-import PureRenderMixin     from 'react-addons-pure-render-mixin';
+import Status from './status';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import PureRenderMixin from 'react-addons-pure-render-mixin';
 import { ScrollContainer } from 'react-router-scroll';
-import StatusContainer     from '../containers/status_container';
+import StatusContainer from '../containers/status_container';
 
 const StatusList = React.createClass({
 
   propTypes: {
     statusIds: ImmutablePropTypes.list.isRequired,
     onScrollToBottom: React.PropTypes.func,
+    onScrollToTop: React.PropTypes.func,
+    onScroll: React.PropTypes.func,
     trackScroll: React.PropTypes.bool
   },
 
@@ -27,6 +29,10 @@ const StatusList = React.createClass({
 
     if (scrollTop === scrollHeight - clientHeight) {
       this.props.onScrollToBottom();
+    } else if (scrollTop < 100) {
+      this.props.onScrollToTop();
+    } else {
+      this.props.onScroll();
     }
   },