From 3af7509945e2d803393349db0b1c005d0df3abc4 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Tue, 5 Jan 2016 09:27:57 +0800 Subject: [PATCH] FIX: Limit number of items for category hashtag autocomplete. --- .../discourse/components/d-editor.js.es6 | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6 index a67b4b8cc3f..fe7a44279b2 100644 --- a/app/assets/javascripts/discourse/components/d-editor.js.es6 +++ b/app/assets/javascripts/discourse/components/d-editor.js.es6 @@ -258,10 +258,23 @@ export default Ember.Component.extend({ return category.get('slug'); }, dataSource(term) { - return Category.list().filter(category => { - const regexp = new RegExp(term, 'i'); - return category.get('name').match(regexp); + const limit = 5; + const regexp = new RegExp(term, 'i'); + var count = 0; + var data = []; + + Category.listByActivity().some(category => { + console.log(category); + + if (category.get('name').match(regexp)) { + count++; + data.push(category); + } + + return count === limit; }); + + return data; }, triggerRule(textarea, opts) { const result = Discourse.Utilities.caretRowCol(textarea);