mention: Update mention and at.js to v1.5.1

yona-projects · Apr 5, 2017 · 9615366 · 9615366
1 parent 4faccb3
commit 9615366
Show file tree

Hide file tree

Showing 6 changed files with 1,662 additions and 807 deletions.
diff --git a/app/controllers/ProjectApp.java b/app/controllers/ProjectApp.java
@@ -436,9 +436,10 @@ private static List<Map<String, String>> getUserList(Project project, List<User>
     private static void addProjectNameToMentionList(List<Map<String, String>> users, Project project) {
         Map<String, String> projectUserMap = new HashMap<>();
         if(project != null){
-            projectUserMap.put("loginid", project.owner+"/" + project.name);
+            projectUserMap.put("loginid", project.owner + "/" + project.name);
             projectUserMap.put("username", project.name );
             projectUserMap.put("name", project.name);
+            projectUserMap.put("searchText", project.owner + "/" + project.name);
             projectUserMap.put("image", urlToProjectLogo(project).toString());
             users.add(projectUserMap);
         }
@@ -450,6 +451,7 @@ private static void addOrganizationNameToMentionList(List<Map<String, String>> u
             projectUserMap.put("loginid", project.organization.name);
             projectUserMap.put("username", project.organization.name);
             projectUserMap.put("name", project.organization.name);
+            projectUserMap.put("searchText", project.organization.name);
             projectUserMap.put("image", urlToOrganizationLogo(project.organization).toString());
             users.add(projectUserMap);
         }
@@ -807,8 +809,8 @@ private static void collectedUsersToMentionList(List<Map<String, String>> users,
             Map<String, String> projectUserMap = new HashMap<>();
             if (user != null && !user.loginId.equals(Constants.ADMIN_LOGIN_ID)) {
                 projectUserMap.put("loginid", user.loginId);
-                projectUserMap.put("username", user.name);
-                projectUserMap.put("name", user.name + user.loginId);
+                projectUserMap.put("searchText", user.name + user.loginId);
+                projectUserMap.put("name", user.name);
                 projectUserMap.put("image", user.avatarUrl());
                 users.add(projectUserMap);
             }

diff --git a/public/javascripts/common/yobi.Mention.js b/public/javascripts/common/yobi.Mention.js
@@ -133,14 +133,18 @@ yobi.Mention = function(htOptions) {
                 at: "@",
                 limit: 10,
                 data: aData.result,
-                tpl: "<li data-value='@${loginid}'><img style='width:20px;height:20px;' src='${image}'> ${username} <small>${loginid}</small></li>",
-                show_the_at: true
+                displayTpl: "<li data-value='@${loginid}'><img style='width:20px;height:20px;' src='${image}'> ${name} <small>${loginid}</small></li>",
+                suspendOnComposing: false,
+                searchKey: "searchText",
+                insertTpl: "@${loginid}"
             })
             .atwho({
                 at: "#",
                 limit: 10,
-                tpl: '<li data-value="#${issueNo}"><small>#${issueNo}</small> ${title}</li>',
+                displayTpl: "<li data-value='#${issueNo}'><small>#${issueNo}</small> ${title}</li>",
                 data: aData.issues,
+                suspendOnComposing: false,
+                insertTpl: "#${issueNo}",
                 callbacks: {
                     sorter: function(query, items, searchKey) {
                         var item, i, len, results;

diff --git a/public/javascripts/lib/atjs/jquery.atwho.css b/public/javascripts/lib/atjs/jquery.atwho.css
@@ -5,11 +5,35 @@
     display: none;
     margin-top: 18px;
     background: white;
+    color: black;
     border: 1px solid #DDD;
     border-radius: 3px;
     box-shadow: 0 0 5px rgba(0,0,0,0.1);
     min-width: 120px;
-    z-index: 1000;
+    z-index: 11110 !important;
+}
+
+.atwho-view .atwho-header {
+    padding: 5px;
+    margin: 5px;
+    cursor: pointer;
+    border-bottom: solid 1px #eaeff1;
+    color: #6f8092;
+    font-size: 11px;
+    font-weight: bold;
+}
+
+.atwho-view .atwho-header .small {
+    color: #6f8092;
+    float: right;
+    padding-top: 2px;
+    margin-right: -5px;
+    font-size: 12px;
+    font-weight: normal;
+}
+
+.atwho-view .atwho-header:hover {
+    cursor: default;
 }
 
 .atwho-view .cur {
@@ -31,6 +55,8 @@
     list-style:none;
     padding:0;
     margin:auto;
+    max-height: 50vh;
+    overflow-y: auto;
 }
 .atwho-view ul li {
     display: block;