From 01b225fd6d0267f3dccfad2f0746c3f2d23d7d27 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Mon, 27 Jul 2015 14:17:12 +0930 Subject: [PATCH] Make formatText util an object so it can be extended --- framework/core/js/forum/src/components/CommentPost.js | 4 ++-- .../core/js/forum/src/components/ReplyPlaceholder.js | 4 ++-- framework/core/js/forum/src/utils/Formatter.js | 11 +++++++++++ framework/core/js/forum/src/utils/formatText.js | 7 ------- 4 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 framework/core/js/forum/src/utils/Formatter.js delete mode 100644 framework/core/js/forum/src/utils/formatText.js diff --git a/framework/core/js/forum/src/components/CommentPost.js b/framework/core/js/forum/src/components/CommentPost.js index aca1e97aa..444563354 100644 --- a/framework/core/js/forum/src/components/CommentPost.js +++ b/framework/core/js/forum/src/components/CommentPost.js @@ -6,7 +6,7 @@ import PostEdited from 'flarum/components/PostEdited'; import EditPostComposer from 'flarum/components/EditPostComposer'; import Composer from 'flarum/components/Composer'; import ItemList from 'flarum/utils/ItemList'; -import formatText from 'flarum/utils/formatText'; +import Formatter from 'flarum/utils/Formatter'; import listItems from 'flarum/helpers/listItems'; import Button from 'flarum/components/Button'; @@ -43,7 +43,7 @@ export default class CommentPost extends Post { content() { const content = this.isEditing() - ? formatText(this.props.post.editedContent) + ? Formatter.format(this.props.post.editedContent) : this.props.post.contentHtml(); return [ diff --git a/framework/core/js/forum/src/components/ReplyPlaceholder.js b/framework/core/js/forum/src/components/ReplyPlaceholder.js index 1ec54251b..01a5b4bac 100644 --- a/framework/core/js/forum/src/components/ReplyPlaceholder.js +++ b/framework/core/js/forum/src/components/ReplyPlaceholder.js @@ -2,7 +2,7 @@ import Component from 'flarum/Component'; import avatar from 'flarum/helpers/avatar'; import username from 'flarum/helpers/username'; import DiscussionControls from 'flarum/utils/DiscussionControls'; -import formatText from 'flarum/utils/formatText'; +import Formatter from 'flarum/utils/Formatter'; /** * The `ReplyPlaceholder` component displays a placeholder for a reply, which, @@ -26,7 +26,7 @@ export default class ReplyPlaceholder extends Component {
- {m.trust(formatText(this.props.discussion.replyContent))} + {m.trust(Formatter.format(this.props.discussion.replyContent))}
); diff --git a/framework/core/js/forum/src/utils/Formatter.js b/framework/core/js/forum/src/utils/Formatter.js new file mode 100644 index 000000000..573f82ebf --- /dev/null +++ b/framework/core/js/forum/src/utils/Formatter.js @@ -0,0 +1,11 @@ +/*global s9e*/ + +export default { + format(text) { + const elm = document.createElement('div'); + + s9e.TextFormatter.preview(text || '', elm); + + return elm.innerHTML; + } +} diff --git a/framework/core/js/forum/src/utils/formatText.js b/framework/core/js/forum/src/utils/formatText.js deleted file mode 100644 index 1c21de3f4..000000000 --- a/framework/core/js/forum/src/utils/formatText.js +++ /dev/null @@ -1,7 +0,0 @@ -export default function formatText(text) { - const elm = document.createElement('div'); - - s9e.TextFormatter.preview(text || '', elm); - - return elm.innerHTML; -}