summaryrefslogtreecommitdiffstats
path: root/client/components/lists/listBody.js
diff options
context:
space:
mode:
authorXavier Priour <xavier.priour@bubblyware.com>2015-12-13 20:02:51 +0100
committerXavier Priour <xavier.priour@bubblyware.com>2015-12-13 20:02:51 +0100
commite304185c23014fe3a4511d213535549e4bfeb207 (patch)
tree1e3a33f06db36b52f9bbfafb6163a652883a0cdf /client/components/lists/listBody.js
parent18697d45f652a119ba21b0cef42fbf732902bfa9 (diff)
parent0954cff5b470712210275a9c0699d85d6579ab54 (diff)
downloadwekan-e304185c23014fe3a4511d213535549e4bfeb207.tar.gz
wekan-e304185c23014fe3a4511d213535549e4bfeb207.tar.bz2
wekan-e304185c23014fe3a4511d213535549e4bfeb207.zip
Merge remote-tracking branch 'upstream/devel' into devel
Diffstat (limited to 'client/components/lists/listBody.js')
-rw-r--r--client/components/lists/listBody.js9
1 files changed, 7 insertions, 2 deletions
diff --git a/client/components/lists/listBody.js b/client/components/lists/listBody.js
index 36b60d06..c3a85614 100644
--- a/client/components/lists/listBody.js
+++ b/client/components/lists/listBody.js
@@ -57,6 +57,7 @@ BlazeComponent.extendComponent({
// We keep the form opened, empty it, and scroll to it.
textarea.val('').focus();
+ autosize.update(textarea);
if (position === 'bottom') {
this.scrollToBottom();
}
@@ -180,13 +181,17 @@ BlazeComponent.extendComponent({
onRendered() {
const editor = this;
- this.$('textarea').escapeableTextComplete([
+ const $textarea = this.$('textarea');
+
+ autosize($textarea);
+
+ $textarea.escapeableTextComplete([
// User mentions
{
match: /\B@(\w*)$/,
search(term, callback) {
const currentBoard = Boards.findOne(Session.get('currentBoard'));
- callback($.map(currentBoard.members, (member) => {
+ callback($.map(currentBoard.activeMembers(), (member) => {
const user = Users.findOne(member.userId);
return user.username.indexOf(term) === 0 ? user : null;
}));