kallithea Changeset - 3cfa0a577f5a

Changeset - 3cfa0a577f5a

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Thomas De Schampheleire - 10 years ago 2015-06-25 21:15:46
thomas.de.schampheleire@gmail.com

autocomplete: factor out _gravatar function

(including rename of input arguments, and simpler return)

1 file changed with 16 insertions and 38 deletions:

kallithea/public/js/base.js

0 comments (0 inline, 0 general)

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -1154,12 +1154,23 @@ var autocompleteHighlightMatch = functio @@
     return full.substring(0, matchindex)
     + "<span class='match'>"
     + full.substr(matchindex, snippet.length)
     + "</span>" + full.substring(matchindex + snippet.length);
 };
 var autocompleteGravatar = function(res, link, size, group) {
     var elem = '<img alt="gravatar" class="perm-gravatar-ac" style="width: {0}px; height: {0}px" src="{1}"/>'.format(size, link);
     if (!link) {
         elem = '<i class="icon-user perm-gravatar-ac" style="font-size: {0}px;"></i>'.format(size);
+    }
     if (group !== undefined) {
         elem = '<i class="perm-gravatar-ac icon-users"></i>';
+    }
     return '<div class="ac-container-wrap">{0}{1}</div>'.format(elem, res);
+}
 var _MembersAutoComplete = function (divid, cont, users_list, groups_list) {
     var matchUsers = function (sQuery) {
         return autocompleteMatchUsers(sQuery, users_list);
+    }
     var matchGroups = function (sQuery) {
@@ @@ -1199,36 +1210,25 @@ var _MembersAutoComplete = function (div @@
     ownerAC.animHoriz = false;
     ownerAC.animSpeed = 0.1;
     // Custom formatter to highlight the matching letters
     var custom_formatter = function (oResultData, sQuery, sResultMatch) {
             var query = sQuery.toLowerCase();
             var _gravatar = function(res, em, size, group){
                 var elem = '<img alt="gravatar" class="perm-gravatar-ac" style="width: {0}px; height: {0}px" src="{1}"/>'.format(size, em);
                 if (!em) {
                     elem = '<i class="icon-user perm-gravatar-ac" style="font-size: {0}px;"></i>'.format(size);
+                }
                 if (group !== undefined){
                     elem = '<i class="perm-gravatar-ac icon-users"></i>'
+                }
                 var tmpl = '<div class="ac-container-wrap">{0}{1}</div>'
                 return tmpl.format(elem,res)
+            }
             // 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']);
                 if (grnameMatchIndex > -1) {
-                    return _gravatar(grprefix + autocompleteHighlightMatch(grname, query, grnameMatchIndex) + grsuffix,null,null,true);
+                    return autocompleteGravatar(grprefix + autocompleteHighlightMatch(grname, query, grnameMatchIndex) + grsuffix, null, null, true);
+                }
-                return _gravatar(grprefix + oResultData.grname + grsuffix, null, null, true);
+                return autocompleteGravatar(grprefix + oResultData.grname + grsuffix, null, null, true);
             // Users
             } else if (oResultData.nname != undefined) {
                 var fname = oResultData.fname || "";
                 var lname = oResultData.lname || "";
                 var nname = oResultData.nname;
@@ @@ -1253,13 +1253,13 @@ var _MembersAutoComplete = function (div @@
                 if (nnameMatchIndex > -1) {
                     displaynname = "(" + autocompleteHighlightMatch(nname, query, nnameMatchIndex) + ")";
                 } else {
                     displaynname = nname ? "(" + nname + ")" : "";
+                }
-                return _gravatar(displayfname + " " + displaylname + " " + displaynname, oResultData.gravatar_lnk, oResultData.gravatar_size);
+                return autocompleteGravatar(displayfname + " " + displaylname + " " + displaynname, oResultData.gravatar_lnk, oResultData.gravatar_size);
             } else {
                 return '';
+            }
         };
     membersAC.formatResult = custom_formatter;
     ownerAC.formatResult = custom_formatter;
@@ @@ -1326,23 +1326,12 @@ var MentionsAutoComplete = function (div @@
             var org_sQuery = sQuery;
             if(this.dataSource.mentionQuery != null){
                 sQuery = this.dataSource.mentionQuery;
+            }
             var query = sQuery.toLowerCase();
             var _gravatar = function(res, em, size, group){
                 var elem = '<img alt="gravatar" class="perm-gravatar-ac" style="width: {0}px; height: {0}px" src="{1}"/>'.format(size, em);
                 if (!em) {
                     elem = '<i class="icon-user perm-gravatar-ac" style="font-size: {0}px;"></i>'.format(size);
+                }
                 if (group !== undefined){
                     elem = '<i class="perm-gravatar-ac icon-users"></i>'
+                }
                 var tmpl = '<div class="ac-container-wrap">{0}{1}</div>'
                 return tmpl.format(elem,res)
+            }
             if (oResultData.nname != undefined) {
                 var fname = oResultData.fname || "";
                 var lname = oResultData.lname || "";
                 var nname = oResultData.nname;
                 // Guard against null value
@@ @@ -1366,13 +1355,13 @@ var MentionsAutoComplete = function (div @@
                 if (nnameMatchIndex > -1) {
                     displaynname = "(" + autocompleteHighlightMatch(nname, query, nnameMatchIndex) + ")";
                 } else {
                     displaynname = nname ? "(" + nname + ")" : "";
+                }
-                return _gravatar(displayfname + " " + displaylname + " " + displaynname, oResultData.gravatar_lnk, oResultData.gravatar_size);
+                return autocompleteGravatar(displayfname + " " + displaylname + " " + displaynname, oResultData.gravatar_lnk, oResultData.gravatar_size);
             } else {
                 return '';
+            }
         };
     if(ownerAC.itemSelectEvent){
@@ @@ -1517,23 +1506,12 @@ var PullRequestAutoComplete = function ( @@
             var org_sQuery = sQuery;
             if(this.dataSource.mentionQuery != null){
                 sQuery = this.dataSource.mentionQuery;
+            }
             var query = sQuery.toLowerCase();
             var _gravatar = function(res, em, size, group){
                 var elem = '<img alt="gravatar" class="perm-gravatar-ac" style="width: {0}px; height: {0}px" src="{1}"/>'.format(size, em);
                 if (!em) {
                     elem = '<i class="icon-user perm-gravatar-ac" style="font-size: {0}px;"></i>'.format(size);
+                }
                 if (group !== undefined){
                     elem = '<i class="perm-gravatar-ac icon-users"></i>'
+                }
                 var tmpl = '<div class="ac-container-wrap">{0}{1}</div>'
                 return tmpl.format(elem,res)
+            }
             if (oResultData.nname != undefined) {
                 var fname = oResultData.fname || "";
                 var lname = oResultData.lname || "";
                 var nname = oResultData.nname;
                 // Guard against null value
@@ @@ -1557,13 +1535,13 @@ var PullRequestAutoComplete = function ( @@
                 if (nnameMatchIndex > -1) {
                     displaynname = "(" + autocompleteHighlightMatch(nname, query, nnameMatchIndex) + ")";
                 } else {
                     displaynname = nname ? "(" + nname + ")" : "";
+                }
-                return _gravatar(displayfname + " " + displaylname + " " + displaynname, oResultData.gravatar_lnk, oResultData.gravatar_size);
+                return autocompleteGravatar(displayfname + " " + displaylname + " " + displaynname, oResultData.gravatar_lnk, oResultData.gravatar_size);
             } else {
                 return '';
+            }
         };
     //members cache to catch duplicates

0 comments (0 inline, 0 general)