kallithea Changeset - 81c70071b6f2

Changeset - 81c70071b6f2

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Thomas De Schampheleire - 10 years ago 2015-06-30 22:30:57
thomas.de.schampheleire@gmail.com

autocomplete: consistently show 'username (Full Name)'

1 file changed with 10 insertions and 6 deletions:

kallithea/public/js/base.js

0 comments (0 inline, 0 general)

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -1180,14 +1180,13 @@ var autocompleteFormatter = function (oR @@
     // group
     if (oResultData.grname != undefined) {
         var grname = oResultData.grname;
         var grmembers = oResultData.grmembers;
         var grnameMatchIndex = grname.toLowerCase().indexOf(query);
         var grprefix = "{0}: ".format(_TM['Group']);
         var grsuffix = " (" + grmembers + "  )";
         var grsuffix = " ({0}  {1})".format(grmembers, _TM['members']);
         var grsuffix = " ({0} {1})".format(grmembers, _TM['members']);
         if (grnameMatchIndex > -1) {
             return autocompleteGravatar(grprefix + autocompleteHighlightMatch(grname, query, grnameMatchIndex) + grsuffix, null, null, true);
+        }
         return autocompleteGravatar(grprefix + oResultData.grname + grsuffix, null, null, true);
@@ @@ -1198,13 +1197,13 @@ var autocompleteFormatter = function (oR @@
         var nname = oResultData.nname;
         // Guard against null value
         var fnameMatchIndex = fname.toLowerCase().indexOf(query),
             lnameMatchIndex = lname.toLowerCase().indexOf(query),
             nnameMatchIndex = nname.toLowerCase().indexOf(query),
             displayfname, displaylname, displaynname;
+            displayfname, displaylname, displaynname, displayname;
         if (fnameMatchIndex > -1) {
             displayfname = autocompleteHighlightMatch(fname, query, fnameMatchIndex);
         } else {
             displayfname = fname;
+        }
@@ @@ -1213,18 +1212,23 @@ var autocompleteFormatter = function (oR @@
             displaylname = autocompleteHighlightMatch(lname, query, lnameMatchIndex);
         } else {
             displaylname = lname;
+        }
         if (nnameMatchIndex > -1) {
-            displaynname = "(" + autocompleteHighlightMatch(nname, query, nnameMatchIndex) + ")";
             displaynname = autocompleteHighlightMatch(nname, query, nnameMatchIndex);
         } else {
-            displaynname = nname ? "(" + nname + ")" : "";
             displaynname = nname;
+        }
         return autocompleteGravatar(displayfname + " " + displaylname + " " + displaynname, oResultData.gravatar_lnk, oResultData.gravatar_size);
         displayname = displaynname;
         if (displayfname && displaylname) {
             displayname = "{0} {1} ({2})".format(displayfname, displaylname, displayname);
+        }
         return autocompleteGravatar(displayname, oResultData.gravatar_lnk, oResultData.gravatar_size);
     } else {
         return '';
+    }
 };
 // Generate a basic autocomplete instance that can be tweaked further by the caller

0 comments (0 inline, 0 general)