tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make pre-selection of usernames optional when replying to a toot

Browse Source 
Fixes #751
This commit is contained in:
Thibaut Girka
2018-09-28 20:58:03 +02:00
parent 15134beb1e
commit 86b2b009dd
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/javascript/flavours/glitch/features/composer/index.js
View File

@ -102,6 +102,7 @@ function mapStateToProps (state) {
anyMedia: state.getIn(['compose', 'media_attachments']).size > 0,
spoilersAlwaysOn: spoilersAlwaysOn,
mediaDescriptionConfirmation: state.getIn(['local_settings', 'confirm_missing_media_description']),
preselectOnReply: state.getIn(['local_settings', 'preselect_on_reply']),
};
};
@ -328,13 +329,14 @@ class Composer extends React.Component {
isSubmitting,
preselectDate,
text,
preselectOnReply,
} = this.props;
let selectionEnd, selectionStart;
// Caret/selection handling.
if (focusDate !== prevProps.focusDate) {
switch (true) {
case preselectDate !== prevProps.preselectDate:
case preselectDate !== prevProps.preselectDate && preselectOnReply:
selectionStart = text.search(/\s/) + 1;
selectionEnd = text.length;
break;
@ -533,6 +535,7 @@ Composer.propTypes = {
anyMedia: PropTypes.bool,
spoilersAlwaysOn: PropTypes.bool,
mediaDescriptionConfirmation: PropTypes.bool,
preselectOnReply: PropTypes.bool,
// Dispatch props.
onCancelReply: PropTypes.func,