diff --git a/app/assets/javascripts/components/actions/accounts.jsx b/app/assets/javascripts/components/actions/accounts.jsx index da6c261f2e..aedc08a1de 100644 --- a/app/assets/javascripts/components/actions/accounts.jsx +++ b/app/assets/javascripts/components/actions/accounts.jsx @@ -14,6 +14,10 @@ export const ACCOUNT_UNFOLLOW_REQUEST = 'ACCOUNT_UNFOLLOW_REQUEST'; export const ACCOUNT_UNFOLLOW_SUCCESS = 'ACCOUNT_UNFOLLOW_SUCCESS'; export const ACCOUNT_UNFOLLOW_FAIL = 'ACCOUNT_UNFOLLOW_FAIL'; +export const ACCOUNT_TIMELINE_FETCH_REQUEST = 'ACCOUNT_TIMELINE_FETCH_REQUEST'; +export const ACCOUNT_TIMELINE_FETCH_SUCCESS = 'ACCOUNT_TIMELINE_FETCH_SUCCESS'; +export const ACCOUNT_TIMELINE_FETCH_FAIL = 'ACCOUNT_TIMELINE_FETCH_FAIL'; + export function setAccountSelf(account) { return { type: ACCOUNT_SET_SELF, @@ -33,6 +37,18 @@ export function fetchAccount(id) { }; }; +export function fetchAccountTimeline(id) { + return (dispatch, getState) => { + dispatch(fetchAccountTimelineRequest(id)); + + api(getState).get(`/api/accounts/${id}/statuses`).then(response => { + dispatch(fetchAccountTimelineSuccess(id, response.data)); + }).catch(error => { + dispatch(fetchAccountTimelineFail(id, error)); + }); + }; +}; + export function fetchAccountRequest(id) { return { type: ACCOUNT_FETCH_REQUEST, @@ -120,3 +136,26 @@ export function unfollowAccountFail(error) { error: error }; }; + +export function fetchAccountTimelineRequest(id) { + return { + type: ACCOUNT_TIMELINE_FETCH_REQUEST, + id: id + }; +}; + +export function fetchAccountTimelineSuccess(id, statuses) { + return { + type: ACCOUNT_TIMELINE_FETCH_SUCCESS, + id: id, + statuses: statuses + }; +}; + +export function fetchAccountTimelineFail(id, error) { + return { + type: ACCOUNT_TIMELINE_FETCH_FAIL, + id: id, + error: error + }; +}; diff --git a/app/assets/javascripts/components/components/column.jsx b/app/assets/javascripts/components/components/column.jsx index b3b13ba9e4..7109bcc19e 100644 --- a/app/assets/javascripts/components/components/column.jsx +++ b/app/assets/javascripts/components/components/column.jsx @@ -1,19 +1,57 @@ import ColumnHeader from './column_header'; import PureRenderMixin from 'react-addons-pure-render-mixin'; +const easingOutQuint = (x, t, b, c, d) => c*((t=t/d-1)*t*t*t*t + 1) + b; + +const scrollTop = (node) => { + const startTime = Date.now(); + const offset = node.scrollTop; + const targetY = -offset; + const duration = 1000; + let interrupt = false; + + const step = () => { + const elapsed = Date.now() - startTime; + const percentage = elapsed / duration; + + if (percentage > 1 || interrupt) { + return; + } + + node.scrollTo(0, easingOutQuint(0, elapsed, offset, targetY, duration)); + requestAnimationFrame(step); + }; + + step(); + + return () => { + interrupt = true; + }; +}; + + const Column = React.createClass({ propTypes: { heading: React.PropTypes.string, - icon: React.PropTypes.string, - fluid: React.PropTypes.bool + icon: React.PropTypes.string }, mixins: [PureRenderMixin], handleHeaderClick () { let node = ReactDOM.findDOMNode(this); - node.querySelector('.scrollable').scrollTo(0, 0); + this._interruptScrollAnimation = scrollTop(node.querySelector('.scrollable')); + }, + + handleWheel () { + if (typeof this._interruptScrollAnimation !== 'undefined') { + this._interruptScrollAnimation(); + } + }, + + handleScroll () { + // todo }, render () { @@ -25,14 +63,8 @@ const Column = React.createClass({ const style = { width: '350px', flex: '0 0 auto', background: '#282c37', margin: '10px', marginRight: '0', display: 'flex', flexDirection: 'column' }; - if (this.props.fluid) { - style.width = 'auto'; - style.flex = '1 1 auto'; - style.background = '#21242d'; - } - return ( -
{account.get('note')}
+- {account.get('display_name')} - {account.get('acct')} -
- - {account.get('url')} - -{account.get('note')}
- - {account.get('followers_count')} followers{action}
+