matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

generalize markdown to content_type

Browse Source
This commit is contained in:
Mary Kate
2020-07-28 13:24:31 -05:00
parent bc787e0bbe
commit daf039d9bb
5 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/soapbox/features/compose/components/compose_form.js
View File

@ -49,7 +49,7 @@ class ComposeForm extends ImmutablePureComponent {
text: PropTypes.string.isRequired,
suggestions: ImmutablePropTypes.list,
spoiler: PropTypes.bool,
markdown: PropTypes.bool,
content_type: PropTypes.string,
privacy: PropTypes.string,
spoilerText: PropTypes.string,
focusDate: PropTypes.instanceOf(Date),

2
app/soapbox/features/compose/containers/compose_form_container.js
View File

@ -16,7 +16,7 @@ const mapStateToProps = state => ({
suggestions: state.getIn(['compose', 'suggestions']),
spoiler: state.getIn(['compose', 'spoiler']),
spoilerText: state.getIn(['compose', 'spoiler_text']),
markdown: state.getIn(['compose', 'markdown']),
content_type: state.getIn(['compose', 'text/markdown']),
privacy: state.getIn(['compose', 'privacy']),
focusDate: state.getIn(['compose', 'focusDate']),
caretPosition: state.getIn(['compose', 'caretPosition']),

6
app/soapbox/features/compose/containers/markdown_button_container.js
View File

@ -10,15 +10,15 @@ const messages = defineMessages({
const mapStateToProps = (state, { intl }) => ({
label: 'MD',
title: intl.formatMessage(state.getIn(['compose', 'markdown']) ? messages.marked : messages.unmarked),
active: state.getIn(['compose', 'markdown']),
title: intl.formatMessage(state.getIn(['compose', 'content_type']) === 'text/markdown' ? messages.marked : messages.unmarked),
active: state.getIn(['compose', 'content_type']) === 'text/markdown',
ariaControls: 'markdown-input',
});
const mapDispatchToProps = dispatch => ({
onClick() {
dispatch(changeComposeMarkdown());
dispatch(changeComposeMarkdown(this.active ? 'text/plain' : 'text/markdown'));
},
});