wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-09-12 13:01:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use Markdown for the "asset is closed" message.

Browse Source
This commit is contained in:
Fabian Neumann
2018-06-04 15:25:20 +02:00
parent d3158f5c7e
commit 2f4dfa080b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-admin/src/routes/Configure/components/StreamSettings.js
+4 -4
View File
@@ -3,7 +3,7 @@ import { SelectField, Option } from 'react-mdl-selectfield';
import t from 'coral-framework/services/i18n'; import t from 'coral-framework/services/i18n';
import styles from './StreamSettings.css'; import styles from './StreamSettings.css';
import { Textfield } from 'react-mdl'; import { Textfield } from 'react-mdl';
import { Icon, TextArea } from 'coral-ui'; import { Icon } from 'coral-ui';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import Slot from 'coral-framework/components/Slot'; import Slot from 'coral-framework/components/Slot';
import MarkdownEditor from 'coral-framework/components/MarkdownEditor'; import MarkdownEditor from 'coral-framework/components/MarkdownEditor';
@@ -66,8 +66,8 @@ class StreamSettings extends React.Component {
this.props.updatePending({ updater }); this.props.updatePending({ updater });
}; };
updateClosedMessage = event => { updateClosedMessage = value => {
const updater = { closedMessage: { $set: event.target.value } }; const updater = { closedMessage: { $set: value } };
this.props.updatePending({ updater }); this.props.updatePending({ updater });
}; };
@@ -178,7 +178,7 @@ class StreamSettings extends React.Component {
> >
<p>{t('configure.closed_comments_desc')}</p> <p>{t('configure.closed_comments_desc')}</p>
<div> <div>
<TextArea <MarkdownEditor
className={styles.descriptionBox} className={styles.descriptionBox}
onChange={this.updateClosedMessage} onChange={this.updateClosedMessage}
value={settings.closedMessage} value={settings.closedMessage}
client/coral-embed-stream/src/tabs/stream/components/Stream.js
+2 -2
View File
@@ -4,11 +4,11 @@ import StreamError from './StreamError';
import Comment from '../containers/Comment'; import Comment from '../containers/Comment';
import BannedAccount from '../../../components/BannedAccount'; import BannedAccount from '../../../components/BannedAccount';
import ChangeUsername from '../containers/ChangeUsername'; import ChangeUsername from '../containers/ChangeUsername';
import Markdown from 'coral-framework/components/Markdown';
import Slot from 'coral-framework/components/Slot'; import Slot from 'coral-framework/components/Slot';
import InfoBox from './InfoBox'; import InfoBox from './InfoBox';
import { can } from 'coral-framework/services/perms'; import { can } from 'coral-framework/services/perms';
import ModerationLink from './ModerationLink'; import ModerationLink from './ModerationLink';
import Markdown from 'coral-framework/components/Markdown';
import RestrictedMessageBox from 'coral-framework/components/RestrictedMessageBox'; import RestrictedMessageBox from 'coral-framework/components/RestrictedMessageBox';
import t, { timeago } from 'coral-framework/services/i18n'; import t, { timeago } from 'coral-framework/services/i18n';
import CommentBox from '../containers/CommentBox'; import CommentBox from '../containers/CommentBox';
@@ -298,7 +298,7 @@ class Stream extends React.Component {
) : ( ) : (
<div> <div>
{asset.isClosed ? ( {asset.isClosed ? (
<p>{asset.settings.closedMessage}</p> <Markdown content={asset.settings.closedMessage} />
) : ( ) : (
<Markdown content={asset.settings.disableCommentingMessage} /> <Markdown content={asset.settings.disableCommentingMessage} />
)} )}