nrd.li/mastodon
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Aria-labels actually didn't work in React, so removing. Fixing some bugs

Browse source
This commit is contained in:
Eugen Rochko 2016-11-03 19:52:09 +01:00
parent 159203a7bc
commit 0405ef977a
4 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/assets/javascripts/components/actions/compose.jsx
View file

@ -55,6 +55,7 @@ export function submitCompose() {
media_ids: getState().getIn(['compose', 'media_attachments']).map(item => item.get('id'))
}).then(function (response) {
dispatch(submitComposeSuccess(response.data));
dispatch(updateTimeline('home', response.data));
}).catch(function (error) {
dispatch(submitComposeFail(error));
});
@ -68,13 +69,9 @@ export function submitComposeRequest() {
};
export function submitComposeSuccess(status) {
return (dispatch, getState) => {
dispatch({
type: COMPOSE_SUBMIT_SUCCESS,
status: status
});
dispatch(updateTimeline('home', status));
return {
type: COMPOSE_SUBMIT_SUCCESS,
status: status
};
};

1
app/assets/javascripts/components/features/ui/components/compose_form.jsx
View file

@ -132,7 +132,6 @@ const ComposeForm = React.createClass({
const inputProps = {
placeholder: 'What is on your mind?',
arialabel: 'What is on your mind?',
value: this.props.text,
onKeyUp: this.handleKeyUp,
onChange: this.handleChange,

2
app/assets/javascripts/components/features/ui/components/follow_form.jsx
View file

@ -33,7 +33,7 @@ const FollowForm = React.createClass({
render () {
return (
<div style={{ display: 'flex', lineHeight: '20px', padding: '10px', background: '#373b4a' }}>
<input autoComplete='off' type='text' disabled={this.props.is_submitting} placeholder='username@domain' ariaLabel='Search for username@domain to follow this user' value={this.props.text} onKeyUp={this.handleKeyUp} onChange={this.handleChange} className='follow-form__input' style={{ flex: '1 1 auto', boxSizing: 'border-box', display: 'block', border: 'none', padding: '10px', fontFamily: 'Roboto', color: '#282c37', fontSize: '14px', margin: '0' }} />
<input autoComplete='off' type='text' disabled={this.props.is_submitting} placeholder='username@domain' value={this.props.text} onKeyUp={this.handleKeyUp} onChange={this.handleChange} className='follow-form__input' style={{ flex: '1 1 auto', boxSizing: 'border-box', display: 'block', border: 'none', padding: '10px', fontFamily: 'Roboto', color: '#282c37', fontSize: '14px', margin: '0' }} />
<div style={{ padding: '10px', paddingRight: '0' }}><IconButton title='Follow' size={20} icon='user-plus' onClick={this.handleSubmit} disabled={this.props.is_submitting} /></div>
</div>
);

3
app/assets/javascripts/components/reducers/accounts.jsx
View file

@ -71,11 +71,12 @@ export default function accounts(state = initialState, action) {
case ACCOUNT_TIMELINE_EXPAND_SUCCESS:
case CONTEXT_FETCH_SUCCESS:
return normalizeAccountsFromStatuses(state, action.statuses);
case TIMELINE_UPDATE:
case REBLOG_SUCCESS:
case FAVOURITE_SUCCESS:
case UNREBLOG_SUCCESS:
case UNFAVOURITE_SUCCESS:
return normalizeAccountFromStatus(state, action.response);
case TIMELINE_UPDATE:
case STATUS_FETCH_SUCCESS:
return normalizeAccountFromStatus(state, action.status);
default: