From 54b7c4eff4a29d7ddd0ebb21d1720dca5c8249dd Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Fri, 26 Jun 2015 12:08:23 +0930 Subject: [PATCH] Only show search suggestion excerpt if we have it MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We won’t have it if we didn’t do a fulltext search --- .../js/forum/src/components/discussions-search-results.js | 7 ++++--- framework/core/less/lib/search.less | 4 +--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/framework/core/js/forum/src/components/discussions-search-results.js b/framework/core/js/forum/src/components/discussions-search-results.js index f18cf123f..b6f679878 100644 --- a/framework/core/js/forum/src/components/discussions-search-results.js +++ b/framework/core/js/forum/src/components/discussions-search-results.js @@ -24,11 +24,12 @@ export default class DiscussionsSearchResults { config: m.route })), (this.results[string] && this.results[string].length) ? this.results[string].map(discussion => { - var post = discussion.relevantPosts()[0]; + var relevantPosts = discussion.relevantPosts(); + var post = relevantPosts && relevantPosts[0]; return m('li.discussion-search-result', {'data-index': 'discussions'+discussion.id()}, - m('a', { href: app.route.discussion(discussion, post.number()), config: m.route }, + m('a', { href: app.route.discussion(discussion, post && post.number()), config: m.route }, m('div.title', highlight(discussion.title(), string)), - m('div.excerpt', highlight(truncate(post.contentPlain(), 100), string)) + post ? m('div.excerpt', highlight(truncate(post.contentPlain(), 100), string)) : '' ) ); }) : '' diff --git a/framework/core/less/lib/search.less b/framework/core/less/lib/search.less index 35f5052ff..52130f36b 100644 --- a/framework/core/less/lib/search.less +++ b/framework/core/less/lib/search.less @@ -68,10 +68,8 @@ } .discussion-search-result { - & .title { - margin-bottom: 3px; - } & .excerpt { + margin-top: 3px; color: @fl-body-muted-color; font-size: 11px; }