mastofe

commit: 0405ef977a3ba37b3da472733e59be6db7bd7b99
parent: 159203a7bcda8512a2b89d91c727446d8f51360b
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Thu,  3 Nov 2016 19:52:09 +0100

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

Diffstat:
M
app/assets/javascripts/components/actions/compose.jsx
11
++++-------
M
app/assets/javascripts/components/features/ui/components/compose_form.jsx
1
-
M
app/assets/javascripts/components/features/ui/components/follow_form.jsx
2
+-
M
app/assets/javascripts/components/reducers/accounts.jsx
3
++-

4 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/app/assets/javascripts/components/actions/compose.jsx b/app/assets/javascripts/components/actions/compose.jsx
@@ -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
   };
 };
 
diff --git a/app/assets/javascripts/components/features/ui/components/compose_form.jsx b/app/assets/javascripts/components/features/ui/components/compose_form.jsx
@@ -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,
diff --git a/app/assets/javascripts/components/features/ui/components/follow_form.jsx b/app/assets/javascripts/components/features/ui/components/follow_form.jsx
@@ -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>
     );
diff --git a/app/assets/javascripts/components/reducers/accounts.jsx b/app/assets/javascripts/components/reducers/accounts.jsx
@@ -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: