diff --git a/app/soapbox/actions/compose.js b/app/soapbox/actions/compose.js
index 28442f994..8466d8069 100644
--- a/app/soapbox/actions/compose.js
+++ b/app/soapbox/actions/compose.js
@@ -43,6 +43,7 @@ export const COMPOSE_UNMOUNT = 'COMPOSE_UNMOUNT';
export const COMPOSE_SENSITIVITY_CHANGE = 'COMPOSE_SENSITIVITY_CHANGE';
export const COMPOSE_SPOILERNESS_CHANGE = 'COMPOSE_SPOILERNESS_CHANGE';
+export const COMPOSE_TYPE_CHANGE = 'COMPOSE_TYPE_CHANGE';
export const COMPOSE_SPOILER_TEXT_CHANGE = 'COMPOSE_SPOILER_TEXT_CHANGE';
export const COMPOSE_VISIBILITY_CHANGE = 'COMPOSE_VISIBILITY_CHANGE';
export const COMPOSE_LISTABILITY_CHANGE = 'COMPOSE_LISTABILITY_CHANGE';
@@ -175,6 +176,7 @@ export function submitCompose(routerHistory, group) {
sensitive: getState().getIn(['compose', 'sensitive']),
spoiler_text: getState().getIn(['compose', 'spoiler_text'], ''),
visibility: getState().getIn(['compose', 'privacy']),
+ content_type: getState().getIn(['compose', 'content_type']),
poll: getState().getIn(['compose', 'poll'], null),
group_id: group ? group.get('id') : null,
}, {
@@ -495,6 +497,13 @@ export function changeComposeSpoilerness() {
};
};
+export function changeComposeContentType(value) {
+ return {
+ type: COMPOSE_TYPE_CHANGE,
+ value,
+ };
+};
+
export function changeComposeSpoilerText(text) {
return {
type: COMPOSE_SPOILER_TEXT_CHANGE,
diff --git a/app/soapbox/features/compose/components/compose_form.js b/app/soapbox/features/compose/components/compose_form.js
index ae64a75f1..af8ce4263 100644
--- a/app/soapbox/features/compose/components/compose_form.js
+++ b/app/soapbox/features/compose/components/compose_form.js
@@ -11,6 +11,7 @@ import PollButtonContainer from '../containers/poll_button_container';
import UploadButtonContainer from '../containers/upload_button_container';
import { defineMessages, injectIntl } from 'react-intl';
import SpoilerButtonContainer from '../containers/spoiler_button_container';
+import MarkdownButtonContainer from '../containers/markdown_button_container';
import PrivacyDropdownContainer from '../containers/privacy_dropdown_container';
import EmojiPickerDropdown from '../containers/emoji_picker_dropdown_container';
import PollFormContainer from '../containers/poll_form_container';
@@ -303,6 +304,7 @@ class ComposeForm extends ImmutablePureComponent {
+
{maxTootChars &&
}
diff --git a/app/soapbox/features/compose/containers/markdown_button_container.js b/app/soapbox/features/compose/containers/markdown_button_container.js
new file mode 100644
index 000000000..0b4a642ca
--- /dev/null
+++ b/app/soapbox/features/compose/containers/markdown_button_container.js
@@ -0,0 +1,26 @@
+import { connect } from 'react-redux';
+import TextIconButton from '../components/text_icon_button';
+import { changeComposeContentType } from '../../../actions/compose';
+import { injectIntl, defineMessages } from 'react-intl';
+
+const messages = defineMessages({
+ marked: { id: 'compose_form.markdown.marked', defaultMessage: 'Post markdown enabled' },
+ unmarked: { id: 'compose_form.markdown.unmarked', defaultMessage: 'Post markdown disabled' },
+});
+
+const mapStateToProps = (state, { intl }) => ({
+ label: 'MD',
+ 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(changeComposeContentType(this.active ? 'text/plain' : 'text/markdown'));
+ },
+
+});
+
+export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(TextIconButton));
diff --git a/app/soapbox/reducers/__tests__/compose-test.js b/app/soapbox/reducers/__tests__/compose-test.js
index d063bc77e..230036fe8 100644
--- a/app/soapbox/reducers/__tests__/compose-test.js
+++ b/app/soapbox/reducers/__tests__/compose-test.js
@@ -32,6 +32,7 @@ describe('compose reducer', () => {
default_sensitive: false,
idempotencyKey: null,
tagHistory: [],
+ content_type: 'text/markdown',
});
});
@@ -787,4 +788,11 @@ describe('compose reducer', () => {
// });
// });
+ it('sets the post content-type', () => {
+ const action = {
+ type: actions.COMPOSE_TYPE_CHANGE,
+ value: 'text/plain',
+ };
+ expect(reducer(undefined, action).toJS()).toMatchObject({ content_type: 'text/plain' });
+ });
});
diff --git a/app/soapbox/reducers/compose.js b/app/soapbox/reducers/compose.js
index d9d554d47..28074b347 100644
--- a/app/soapbox/reducers/compose.js
+++ b/app/soapbox/reducers/compose.js
@@ -21,6 +21,7 @@ import {
COMPOSE_TAG_HISTORY_UPDATE,
COMPOSE_SENSITIVITY_CHANGE,
COMPOSE_SPOILERNESS_CHANGE,
+ COMPOSE_TYPE_CHANGE,
COMPOSE_SPOILER_TEXT_CHANGE,
COMPOSE_VISIBILITY_CHANGE,
COMPOSE_COMPOSING_CHANGE,
@@ -50,6 +51,7 @@ const initialState = ImmutableMap({
sensitive: false,
spoiler: false,
spoiler_text: '',
+ content_type: 'text/markdown',
privacy: null,
text: '',
focusDate: null,
@@ -94,6 +96,7 @@ function clearAll(state) {
map.set('text', '');
map.set('spoiler', false);
map.set('spoiler_text', '');
+ map.set('content_type', 'text/markdown');
map.set('is_submitting', false);
map.set('is_changing_upload', false);
map.set('in_reply_to', null);
@@ -215,6 +218,11 @@ export default function compose(state = initialState, action) {
map.set('sensitive', !state.get('sensitive'));
}
+ map.set('idempotencyKey', uuid());
+ });
+ case COMPOSE_TYPE_CHANGE:
+ return state.withMutations(map => {
+ map.set('content_type', action.value);
map.set('idempotencyKey', uuid());
});
case COMPOSE_SPOILERNESS_CHANGE:
@@ -249,6 +257,7 @@ export default function compose(state = initialState, action) {
map.set('focusDate', new Date());
map.set('caretPosition', null);
map.set('idempotencyKey', uuid());
+ map.set('content_type', 'text/markdown');
if (action.status.get('spoiler_text', '').length > 0) {
map.set('spoiler', true);
@@ -332,6 +341,7 @@ export default function compose(state = initialState, action) {
map.set('focusDate', new Date());
map.set('caretPosition', null);
map.set('idempotencyKey', uuid());
+ map.set('content_type', 'text/markdown');
if (action.status.get('spoiler_text').length > 0) {
map.set('spoiler', true);
diff --git a/app/styles/components/status.scss b/app/styles/components/status.scss
index 0d349764b..7137874de 100644
--- a/app/styles/components/status.scss
+++ b/app/styles/components/status.scss
@@ -1,3 +1,38 @@
+.status__content {
+ p,
+ li {
+ strong {
+ font-weight: bold;
+ }
+ }
+
+ p,
+ li {
+ em {
+ font-style: italic;
+ }
+ }
+
+ ul,
+ ol,
+ blockquote {
+ margin-bottom: 20px;
+ margin-left: 15px;
+ }
+
+ ul {
+ list-style: disc inside none;
+ }
+
+ ol {
+ list-style: decimal inside none;
+ }
+
+ blockquote p {
+ font-style: italic;
+ }
+}
+
.status__content--with-action {
cursor: pointer;
}