diff options
| author | ThibG <thib@sitedethib.com> | 2019-05-19 22:07:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-19 22:07:42 +0200 |
| commit | 0998e3ade8b03174c0a69ba4f78b31f92ccc1ade (patch) | |
| tree | f163dea0261fa79ca2052cd243ec9ac502b53cd2 /app/javascript | |
| parent | 46811f92e4b1705da5bb52e0e9e4e9e59ea1a15e (diff) | |
| parent | 08a2af27c3353555d729255fc42f6d49af20ed52 (diff) | |
Merge pull request #1055 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript')
| -rw-r--r-- | app/javascript/mastodon/features/compose/containers/compose_form_container.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/compose/containers/compose_form_container.js b/app/javascript/mastodon/features/compose/containers/compose_form_container.js index 93a468388..37a0e8845 100644 --- a/app/javascript/mastodon/features/compose/containers/compose_form_container.js +++ b/app/javascript/mastodon/features/compose/containers/compose_form_container.js @@ -20,7 +20,7 @@ const mapStateToProps = state => ({ focusDate: state.getIn(['compose', 'focusDate']), caretPosition: state.getIn(['compose', 'caretPosition']), preselectDate: state.getIn(['compose', 'preselectDate']), - is_submitting: state.getIn(['compose', 'is_submitting']), + isSubmitting: state.getIn(['compose', 'is_submitting']), isChangingUpload: state.getIn(['compose', 'is_changing_upload']), isUploading: state.getIn(['compose', 'is_uploading']), showSearch: state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']), |