Browse Source

Remove unnecessary constructors (#3280)

tags/v1.4rc4
Yamagishi Kazutoshi 2 years ago
parent
commit
1ec7c87001
3 changed files with 15 additions and 37 deletions
  1. +3
    -10
      app/javascript/mastodon/components/account.js
  2. +12
    -21
      app/javascript/mastodon/components/autosuggest_textarea.js
  3. +0
    -6
      app/javascript/mastodon/features/ui/components/boost_modal.js

+ 3
- 10
app/javascript/mastodon/components/account.js View File

@@ -27,22 +27,15 @@ class Account extends ImmutablePureComponent {
intl: PropTypes.object.isRequired,
};

constructor (props, context) {
super(props, context);
this.handleFollow = this.handleFollow.bind(this);
this.handleBlock = this.handleBlock.bind(this);
this.handleMute = this.handleMute.bind(this);
}

handleFollow () {
handleFollow = () => {
this.props.onFollow(this.props.account);
}

handleBlock () {
handleBlock = () => {
this.props.onBlock(this.props.account);
}

handleMute () {
handleMute = () => {
this.props.onMute(this.props.account);
}


+ 12
- 21
app/javascript/mastodon/components/autosuggest_textarea.js View File

@@ -51,23 +51,14 @@ class AutosuggestTextarea extends ImmutablePureComponent {
autoFocus: true,
};

constructor (props, context) {
super(props, context);
this.state = {
suggestionsHidden: false,
selectedSuggestion: 0,
lastToken: null,
tokenStart: 0,
};
this.onChange = this.onChange.bind(this);
this.onKeyDown = this.onKeyDown.bind(this);
this.onBlur = this.onBlur.bind(this);
this.onSuggestionClick = this.onSuggestionClick.bind(this);
this.setTextarea = this.setTextarea.bind(this);
this.onPaste = this.onPaste.bind(this);
}
state = {
suggestionsHidden: false,
selectedSuggestion: 0,
lastToken: null,
tokenStart: 0,
};

onChange (e) {
onChange = (e) => {
const [ tokenStart, token ] = textAtCursorMatchesToken(e.target.value, e.target.selectionStart);

if (token !== null && this.state.lastToken !== token) {
@@ -85,7 +76,7 @@ class AutosuggestTextarea extends ImmutablePureComponent {
this.props.onChange(e);
}

onKeyDown (e) {
onKeyDown = (e) => {
const { suggestions, disabled } = this.props;
const { selectedSuggestion, suggestionsHidden } = this.state;

@@ -135,7 +126,7 @@ class AutosuggestTextarea extends ImmutablePureComponent {
this.props.onKeyDown(e);
}

onBlur () {
onBlur = () => {
// If we hide the suggestions immediately, then this will prevent the
// onClick for the suggestions themselves from firing.
// Setting a short window for that to take place before hiding the
@@ -145,7 +136,7 @@ class AutosuggestTextarea extends ImmutablePureComponent {
}, 100);
}

onSuggestionClick (e) {
onSuggestionClick = (e) => {
const suggestion = Number(e.currentTarget.getAttribute('data-index'));
e.preventDefault();
this.props.onSuggestionSelected(this.state.tokenStart, this.state.lastToken, suggestion);
@@ -158,11 +149,11 @@ class AutosuggestTextarea extends ImmutablePureComponent {
}
}

setTextarea (c) {
setTextarea = (c) => {
this.textarea = c;
}

onPaste (e) {
onPaste = (e) => {
if (e.clipboardData && e.clipboardData.files.length === 1) {
this.props.onPaste(e.clipboardData.files);
e.preventDefault();

+ 0
- 6
app/javascript/mastodon/features/ui/components/boost_modal.js View File

@@ -27,12 +27,6 @@ class BoostModal extends ImmutablePureComponent {
intl: PropTypes.object.isRequired,
};

constructor (props, context) {
super(props, context);
this.handleReblog = this.handleReblog.bind(this);
this.handleAccountClick = this.handleAccountClick.bind(this);
}

handleReblog = () => {
this.props.onReblog(this.props.status);
this.props.onClose();

Loading…
Cancel
Save