vbatts/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Replacing follow requests in the settings area with in-UI column

Browse source
This commit is contained in:
Eugen Rochko 2016-12-26 21:33:51 +01:00
parent 004382e4d0
commit 3689c119f0
17 changed files with 334 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/components/components/status_list.jsx
View file

@ -27,11 +27,11 @@ const StatusList = React.createClass({
this._oldScrollPosition = scrollHeight - scrollTop;
if (scrollTop === scrollHeight - clientHeight) {
if (scrollTop === scrollHeight - clientHeight && this.props.onScrollToBottom) {
this.props.onScrollToBottom();
} else if (scrollTop < 100) {
} else if (scrollTop < 100 && this.props.onScrollToTop) {
this.props.onScrollToTop();
} else {
} else if (this.props.onScroll) {
this.props.onScroll();
}
},