Merge branch 'jonasob-username-matching' into devel

Usernames can now include dots (.) Thanks to jonasob !

2 files changed, 3 insertions, 3 deletions

diff --git a/client/components/lists/listBody.js b/client/components/lists/listBody.js
index bdc812c7..724e805b 100644
--- a/client/components/lists/listBody.js
+++ b/client/components/lists/listBody.js
@@ -180,7 +180,7 @@ BlazeComponent.extendComponent({
     $textarea.escapeableTextComplete([
       // User mentions
       {
-        match: /\B@(\w*)$/,
+        match: /\B@([\w.]*)$/,
         search(term, callback) {
           const currentBoard = Boards.findOne(Session.get('currentBoard'));
           callback($.map(currentBoard.activeMembers(), (member) => {
diff --git a/client/components/main/editor.js b/client/components/main/editor.js
index da15407a..5987b772 100755
--- a/client/components/main/editor.js
+++ b/client/components/main/editor.js
@@ -25,7 +25,7 @@ Template.editor.onRendered(() => {
 
     // User mentions
     {
-      match: /\B@(\w*)$/,
+      match: /\B@([\w.]*)$/,
       search(term, callback) {
         const currentBoard = Boards.findOne(Session.get('currentBoard'));
         callback(currentBoard.activeMembers().map((member) => {
@@ -60,7 +60,7 @@ Blaze.Template.registerHelper('mentions', new Template('mentions', function() {
     member.username = Users.findOne(member.userId).username;
     return member;
   });
-  const mentionRegex = /\B@(\w*)/gi;
+  const mentionRegex = /\B@([\w.]*)/gi;
   let content = Blaze.toHTML(view.templateContentBlock);
 
   let currentMention;