Minor code cleanup (mastodon#10613)

ProjectMyosotis · Oct 2, 2019 · fe918e7 · fe918e7
1 parent 044ee51
commit fe918e7
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 26 deletions.
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -40,17 +40,16 @@ class ComposeForm extends ImmutablePureComponent {
  static propTypes = {
  intl: PropTypes.object.isRequired,
  text: PropTypes.string.isRequired,
- suggestion_token: PropTypes.string,
  suggestions: ImmutablePropTypes.list,
  spoiler: PropTypes.bool,
  privacy: PropTypes.string,
- spoiler_text: PropTypes.string,
+ spoilerText: PropTypes.string,
  focusDate: PropTypes.instanceOf(Date),
  caretPosition: PropTypes.number,
  preselectDate: PropTypes.instanceOf(Date),
- is_submitting: PropTypes.bool,
- is_changing_upload: PropTypes.bool,
- is_uploading: PropTypes.bool,
+ isSubmitting: PropTypes.bool,
+ isChangingUpload: PropTypes.bool,
+ isUploading: PropTypes.bool,
  onChange: PropTypes.func.isRequired,
  onSubmit: PropTypes.func.isRequired,
  onClearSuggestions: PropTypes.func.isRequired,
@@ -85,10 +84,10 @@ class ComposeForm extends ImmutablePureComponent {
  }
 
  // Submit disabled:
- const { is_submitting, is_changing_upload, is_uploading, anyMedia } = this.props;
- const fulltext = [this.props.spoiler_text, countableText(this.props.text)].join('');
+ const { isSubmitting, isChangingUpload, isUploading, anyMedia } = this.props;
+ const fulltext = [this.props.spoilerText, countableText(this.props.text)].join('');
 
- if (is_submitting || is_uploading || is_changing_upload || length(fulltext) > 1024 || (fulltext.length !== 0 && fulltext.trim().length === 0 && !anyMedia)) {
+ if (isSubmitting || isUploading || isChangingUpload || length(fulltext) > 1024 || (fulltext.length !== 0 && fulltext.trim().length === 0 && !anyMedia)) {
  return;
  }
 
@@ -133,7 +132,7 @@ class ComposeForm extends ImmutablePureComponent {
 
  this.autosuggestTextarea.textarea.setSelectionRange(selectionStart, selectionEnd);
  this.autosuggestTextarea.textarea.focus();
- } else if(prevProps.is_submitting && !this.props.is_submitting) {
+ } else if(prevProps.isSubmitting && !this.props.isSubmitting) {
  this.autosuggestTextarea.textarea.focus();
  } else if (this.props.spoiler !== prevProps.spoiler) {
  if (this.props.spoiler) {
@@ -162,9 +161,9 @@ class ComposeForm extends ImmutablePureComponent {
 
  render () {
  const { intl, onPaste, showSearch, anyMedia } = this.props;
- const disabled = this.props.is_submitting;
- const text = [this.props.spoiler_text, countableText(this.props.text)].join('');
- const disabledButton = disabled || this.props.is_uploading || this.props.is_changing_upload || length(text) > 1024 || (text.length !== 0 && text.trim().length === 0 && !anyMedia);
+ const disabled = this.props.isSubmitting;
+ const text = [this.props.spoilerText, countableText(this.props.text)].join('');
+ const disabledButton = disabled || this.props.isUploading || this.props.isChangingUpload || length(text) > 1024 || (text.length !== 0 && text.trim().length === 0 && !anyMedia);
  let publishText = '';
 
  if (this.props.privacy === 'private' || this.props.privacy === 'direct') {
@@ -182,7 +181,7 @@ class ComposeForm extends ImmutablePureComponent {
  <div className={`spoiler-input ${this.props.spoiler ? 'spoiler-input--visible' : ''}`}>
  <label>
  <span style={{ display: 'none' }}>{intl.formatMessage(messages.spoiler_placeholder)}</span>
- <input placeholder={intl.formatMessage(messages.spoiler_placeholder)} value={this.props.spoiler_text} onChange={this.handleChangeSpoilerText} onKeyDown={this.handleKeyDown} tabIndex={this.props.spoiler ? 0 : -1} type='text' className='spoiler-input__input' id='cw-spoiler-input' ref={this.setSpoilerText} />
+ <input placeholder={intl.formatMessage(messages.spoiler_placeholder)} value={this.props.spoilerText} onChange={this.handleChangeSpoilerText} onKeyDown={this.handleKeyDown} tabIndex={this.props.spoiler ? 0 : -1} type='text' className='spoiler-input__input' id='cw-spoiler-input' ref={this.setSpoilerText} />
  </label>
  </div>
 

diff --git a/app/javascript/mastodon/features/compose/components/search.js b/app/javascript/mastodon/features/compose/components/search.js
@@ -73,7 +73,7 @@ class Search extends React.PureComponent {
  }
  }
 
- handleKeyDown = (e) => {
+ handleKeyUp = (e) => {
  if (e.key === 'Enter') {
  e.preventDefault();
  this.props.onSubmit();
@@ -82,10 +82,6 @@ class Search extends React.PureComponent {
  }
  }
 
- noop () {
-
- }
-
  handleFocus = () => {
  this.setState({ expanded: true });
  this.props.onShow();
@@ -110,7 +106,7 @@ class Search extends React.PureComponent {
  placeholder={intl.formatMessage(messages.placeholder)}
  value={value}
  onChange={this.handleChange}
- onKeyUp={this.handleKeyDown}
+ onKeyUp={this.handleKeyUp}
  onFocus={this.handleFocus}
  onBlur={this.handleBlur}
  />

diff --git a/app/javascript/mastodon/features/compose/containers/compose_form_container.js b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
@@ -1,6 +1,5 @@
 import { connect } from 'react-redux';
 import ComposeForm from '../components/compose_form';
-import { uploadCompose } from '../../../actions/compose';
 import {
  changeCompose,
  submitCompose,
@@ -9,21 +8,21 @@ import {
  selectComposeSuggestion,
  changeComposeSpoilerText,
  insertEmojiCompose,
+ uploadCompose,
 } from '../../../actions/compose';
 
 const mapStateToProps = state => ({
  text: state.getIn(['compose', 'text']),
- suggestion_token: state.getIn(['compose', 'suggestion_token']),
  suggestions: state.getIn(['compose', 'suggestions']),
  spoiler: state.getIn(['compose', 'spoiler']),
- spoiler_text: state.getIn(['compose', 'spoiler_text']),
+ spoilerText: state.getIn(['compose', 'spoiler_text']),
  privacy: state.getIn(['compose', 'privacy']),
  focusDate: state.getIn(['compose', 'focusDate']),
  caretPosition: state.getIn(['compose', 'caretPosition']),
  preselectDate: state.getIn(['compose', 'preselectDate']),
  is_submitting: state.getIn(['compose', 'is_submitting']),
- is_changing_upload: state.getIn(['compose', 'is_changing_upload']),
- is_uploading: state.getIn(['compose', 'is_uploading']),
+ isChangingUpload: state.getIn(['compose', 'is_changing_upload']),
+ isUploading: state.getIn(['compose', 'is_uploading']),
  showSearch: state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']),
  anyMedia: state.getIn(['compose', 'media_attachments']).size > 0,
 });
@@ -46,8 +45,8 @@ const mapDispatchToProps = (dispatch) => ({
  dispatch(fetchComposeSuggestions(token));
  },
 
- onSuggestionSelected (position, token, accountId) {
- dispatch(selectComposeSuggestion(position, token, accountId));
+ onSuggestionSelected (position, token, suggestion) {
+ dispatch(selectComposeSuggestion(position, token, suggestion));
  },
 
  onChangeSpoilerText (checked) {