Commit 21c10194 authored by witches.live's avatar witches.live 🔮

Add default content type setting

parent 323cd380
Pipeline #10534 passed with stage
in 3 minutes and 49 seconds
......@@ -90,7 +90,7 @@ function mapStateToProps (state) {
media: state.getIn(['compose', 'media_attachments']),
preselectDate: state.getIn(['compose', 'preselectDate']),
privacy: state.getIn(['compose', 'privacy']),
contentType: state.getIn(['compose', 'content_type']),
contentType: state.getIn(['local_settings', 'content_type']),
progress: state.getIn(['compose', 'progress']),
inReplyTo: inReplyTo ? state.getIn(['statuses', inReplyTo]) : null,
replyAccount: inReplyTo ? state.getIn(['statuses', inReplyTo, 'account']) : null,
......
......@@ -6,6 +6,7 @@ import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
// Our imports
import LocalSettingsPageItem from './item';
import { type } from 'os';
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
......@@ -157,6 +158,19 @@ export default class LocalSettingsPage extends React.PureComponent {
>
<FormattedMessage id='settings.side_arm' defaultMessage='Secondary toot button:' />
</LocalSettingsPageItem>
<LocalSettingsPageItem
settings={settings}
item={['content_type']}
id='mastodon-settings--content_type'
options={[
{ value: 'plain', message: intl.formatMessage({ id: 'compose.content-type.plain' }) },
{ value: 'html', message: intl.formatMessage({ id: 'compose.content-type.html' }) },
{ value: 'markdown', message: intl.formatMessage({ id: 'compose.content-type.markdown' }) },
]}
onChange={onChange}
>
<FormattedMessage id='settings.content_type' defaultMessage='Default content type:' />
</LocalSettingsPageItem>
<LocalSettingsPageItem
settings={settings}
item={['side_arm_reply_mode']}
......
......@@ -12,6 +12,7 @@ const initialState = ImmutableMap({
swipe_to_change_columns: true,
side_arm : 'none',
side_arm_reply_mode : 'keep',
content_type : 'plain',
show_reply_count : false,
always_show_spoilers_field: false,
confirm_missing_media_description: false,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment