changeset 5233:63be69bd33cf

autocomplete: factor out matchGroups function
author Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
date Thu, 25 Jun 2015 21:06:15 +0200
parents 0c82cb41d266
children bd769a3e49c6
files kallithea/public/js/base.js
diffstat 1 files changed, 23 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/public/js/base.js	Wed Jun 24 18:22:48 2015 +0200
+++ b/kallithea/public/js/base.js	Thu Jun 25 21:06:15 2015 +0200
@@ -1131,37 +1131,37 @@
     return matches;
 };
 
+// Custom search function for the DataSource of userGroups
+var autocompleteMatchGroups = function (sQuery, myGroups) {
+    // Case insensitive matching
+    var query = sQuery.toLowerCase();
+    var i = 0;
+    var l = myGroups.length;
+    var matches = [];
+
+    // Match against each name of each group
+    for (; i < l; i++) {
+        var matched_group = myGroups[i];
+        if (matched_group.grname.toLowerCase().indexOf(query) > -1) {
+            matches[matches.length] = matched_group;
+        }
+    }
+    return matches;
+};
 
 var _MembersAutoComplete = function (divid, cont, users_list, groups_list) {
-    var myGroups = groups_list;
 
     var matchUsers = function (sQuery) {
         return autocompleteMatchUsers(sQuery, users_list);
     }
-
-    // Define a custom search function for the DataSource of userGroups
     var matchGroups = function (sQuery) {
-            // Case insensitive matching
-            var query = sQuery.toLowerCase();
-            var i = 0;
-            var l = myGroups.length;
-            var matches = [];
-
-            // Match against each name of each contact
-            for (; i < l; i++) {
-                var matched_group = myGroups[i];
-                if (matched_group.grname.toLowerCase().indexOf(query) > -1) {
-                    matches[matches.length] = matched_group;
-                }
-            }
-            return matches;
-        };
-
+        return autocompleteMatchGroups(sQuery, groups_list);
+    }
     var matchAll = function (sQuery) {
-            var u = matchUsers(sQuery);
-            var g = matchGroups(sQuery);
-            return u.concat(g);
-        };
+        var u = matchUsers(sQuery);
+        var g = matchGroups(sQuery);
+        return u.concat(g);
+    };
 
     // DataScheme for members
     var memberDS = new YAHOO.util.FunctionDataSource(matchAll);