From de42c316c0afdcb461beb2d2603b4088d1ef8111 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Thu, 6 Aug 2015 13:28:26 +0930 Subject: [PATCH] Remove blockquotes from post previews Closes flarum/core#144 --- js/forum/src/components/PostPreview.js | 4 +--- js/lib/utils/string.js | 8 +++++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/js/forum/src/components/PostPreview.js b/js/forum/src/components/PostPreview.js index 055db98b2..c5014b260 100644 --- a/js/forum/src/components/PostPreview.js +++ b/js/forum/src/components/PostPreview.js @@ -1,7 +1,6 @@ import Component from 'flarum/Component'; import avatar from 'flarum/helpers/avatar'; import username from 'flarum/helpers/username'; -import humanTime from 'flarum/helpers/humanTime'; import highlight from 'flarum/helpers/highlight'; /** @@ -22,8 +21,7 @@ export default class PostPreview extends Component { {avatar(user)} - {username(user)} - {humanTime(post.time())} + {username(user)}{' '} {excerpt} diff --git a/js/lib/utils/string.js b/js/lib/utils/string.js index 6d5a14aa8..1f68e3892 100644 --- a/js/lib/utils/string.js +++ b/js/lib/utils/string.js @@ -34,9 +34,15 @@ export function slug(string) { * @return {String} */ export function getPlainContent(string) { - return $('
').html(string.replace(/(<\/p>|
)/g, '$1 ')).text(); + const dom = $('
').html(string.replace(/(<\/p>|
)/g, '$1  ')); + + dom.find(getPlainContent.removeSelectors.join(',')).remove(); + + return dom.text(); } +getPlainContent.removeSelectors = ['blockquote']; + /** * Make a string's first character uppercase. *