mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-10 01:25:15 +00:00
Live update account timelines, small fix for replyCompose
This commit is contained in:
parent
0967961de7
commit
ee770c3fd3
|
@ -4,6 +4,7 @@ export const COMPOSE_CHANGE = 'COMPOSE_CHANGE';
|
|||
export const COMPOSE_SUBMIT_REQUEST = 'COMPOSE_SUBMIT_REQUEST';
|
||||
export const COMPOSE_SUBMIT_SUCCESS = 'COMPOSE_SUBMIT_SUCCESS';
|
||||
export const COMPOSE_SUBMIT_FAIL = 'COMPOSE_SUBMIT_FAIL';
|
||||
export const COMPOSE_REPLY = 'COMPOSE_REPLY';
|
||||
export const COMPOSE_REPLY_CANCEL = 'COMPOSE_REPLY_CANCEL';
|
||||
export const COMPOSE_UPLOAD_REQUEST = 'COMPOSE_UPLOAD_REQUEST';
|
||||
export const COMPOSE_UPLOAD_SUCCESS = 'COMPOSE_UPLOAD_SUCCESS';
|
||||
|
|
|
@ -17,7 +17,7 @@ const Header = React.createClass({
|
|||
|
||||
return (
|
||||
<div style={{ flex: '0 0 auto', background: '#2f3441', textAlign: 'center', backgroundImage: `url(${account.get('header')})`, backgroundSize: 'cover' }}>
|
||||
<div style={{ background: 'rgba(47, 52, 65, 0.6)', padding: '30px 10px' }}>
|
||||
<div style={{ background: 'rgba(47, 52, 65, 0.8)', padding: '30px 10px' }}>
|
||||
<div style={{ width: '90px', margin: '0 auto', marginBottom: '15px', borderRadius: '90px', overflow: 'hidden' }} className='transparent-background'>
|
||||
<img src={account.get('avatar')} alt='' style={{ display: 'block', width: '90px', height: '90px', borderRadius: '90px' }} />
|
||||
</div>
|
||||
|
|
|
@ -101,6 +101,7 @@ function accountTimelineToMaps(state, accountId, statuses) {
|
|||
function updateTimelineWithMaps(state, timeline, status) {
|
||||
state = statusToMaps(state, status);
|
||||
state = state.update(timeline, list => list.unshift(status.get('id')));
|
||||
state = state.updateIn(['accounts_timelines', status.getIn(['account', 'id'])], Immutable.List(), list => list.unshift(status.get('id')));
|
||||
|
||||
return state;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue