diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-07-28 23:08:38 +0200 |
|---|---|---|
| committer | ThibG <thib@sitedethib.com> | 2018-07-28 23:24:15 +0200 |
| commit | d3783b864c8881bc3d59b5aa42a70d35869ffef6 (patch) | |
| tree | 2fa83f007eb55b402fca2b9880c84bc1063a9e17 /app/javascript/flavours/glitch/features/composer/index.js | |
| parent | e3bf8c8aa16c6421c02f4550383f592de4e2bcfe (diff) | |
Refactor reply indicator and show compact list of attachments
Diffstat (limited to 'app/javascript/flavours/glitch/features/composer/index.js')
| -rw-r--r-- | app/javascript/flavours/glitch/features/composer/index.js | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/app/javascript/flavours/glitch/features/composer/index.js b/app/javascript/flavours/glitch/features/composer/index.js index b68afacac..d7f4641f6 100644 --- a/app/javascript/flavours/glitch/features/composer/index.js +++ b/app/javascript/flavours/glitch/features/composer/index.js @@ -78,6 +78,7 @@ function mapStateToProps (state) { preselectDate: state.getIn(['compose', 'preselectDate']), privacy: state.getIn(['compose', 'privacy']), progress: state.getIn(['compose', 'progress']), + inReplyTo: inReplyTo ? state.getIn(['statuses', inReplyTo]) : null, replyAccount: inReplyTo ? state.getIn(['statuses', inReplyTo, 'account']) : null, replyContent: inReplyTo ? state.getIn(['statuses', inReplyTo, 'contentHtml']) : null, resetFileKey: state.getIn(['compose', 'resetFileKey']), @@ -302,8 +303,7 @@ class Composer extends React.Component { onUpload, privacy, progress, - replyAccount, - replyContent, + inReplyTo, resetFileKey, sensitive, showSearch, @@ -328,10 +328,9 @@ class Composer extends React.Component { {privacy === 'direct' ? <ComposerDirectWarning /> : null} {privacy === 'private' && amUnlocked ? <ComposerWarning /> : null} {privacy !== 'public' && APPROX_HASHTAG_RE.test(text) ? <ComposerHashtagWarning /> : null} - {replyAccount && ( + {inReplyTo && ( <ComposerReply - account={replyAccount} - content={replyContent} + status={inReplyTo} intl={intl} onCancel={onCancelReply} /> @@ -417,8 +416,7 @@ Composer.propTypes = { preselectDate: PropTypes.instanceOf(Date), privacy: PropTypes.string, progress: PropTypes.number, - replyAccount: PropTypes.string, - replyContent: PropTypes.string, + inReplyTo: ImmutablePropTypes.map, resetFileKey: PropTypes.number, sideArm: PropTypes.string, sensitive: PropTypes.bool, |