kallithea Changeset - 96ed562709f9

Changeset - 96ed562709f9

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Thomas De Schampheleire - 10 years ago 2015-06-24 21:32:26
thomas.de.schampheleire@gmail.com

autocomplete: remove dead code

The three blocks of autocomplete code are clearly copy/pasted from one
another, with dead code remaining due to group-autocomplete not being
relevant for some cases.

3 files changed with 6 insertions and 36 deletions:

kallithea/public/js/base.js

kallithea/templates/pullrequests/pullrequest.html

kallithea/templates/pullrequests/pullrequest_show.html

0 comments (0 inline, 0 general)

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -731,7 +731,7 @@ var injectInlineForm = function(tr){ @@
         // callbacks
         tooltip_activate();
         MentionsAutoComplete('text_'+lineno, 'mentions_container_'+lineno,
-                             _USERS_AC_DATA, _GROUPS_AC_DATA);
                              _USERS_AC_DATA);
         $('#text_'+lineno).focus();
     },10)
 };
@@ @@ -1289,9 +1289,8 @@ var _MembersAutoComplete = function (div @@
     };
+}
-var MentionsAutoComplete = function (divid, cont, users_list, groups_list) {
 var MentionsAutoComplete = function (divid, cont, users_list) {
     var myUsers = users_list;
     var myGroups = groups_list;
     // Define a custom search function for the DataSource of users
     var matchUsers = function (sQuery) {
@@ @@ -1318,11 +1317,6 @@ var MentionsAutoComplete = function (div @@
             return matches
         };
     //match all
     var matchAll = function (sQuery) {
             return matchUsers(sQuery);
         };
     // DataScheme for owner
     var ownerDS = new YAHOO.util.FunctionDataSource(matchUsers);
@@ @@ -1515,10 +1509,9 @@ var removeReviewMember = function(review @@
     $li.find('.reviewer_member_remove').replaceWith('&nbsp;(remove not saved)');
+}
 /* activate auto completion of users and groups ... but only used for users as PR reviewers */
 var PullRequestAutoComplete = function (divid, cont, users_list, groups_list) {
 /* activate auto completion of users as PR reviewers */
 var PullRequestAutoComplete = function (divid, cont, users_list) {
     var myUsers = users_list;
     var myGroups = groups_list;
     // Define a custom search function for the DataSource of users
     var matchUsers = function (sQuery) {
@@ @@ -1540,29 +1533,6 @@ var PullRequestAutoComplete = function ( @@
             return matches;
         };
     // 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++) {
                 matched_group = myGroups[i];
                 if (matched_group.grname.toLowerCase().indexOf(query) > -1) {
                     matches[matches.length] = matched_group;
+                }
+            }
             return matches;
         };
     //match all
     var matchAll = function (sQuery) {
             return matchUsers(sQuery);
         };
     // DataScheme for owner
     var ownerDS = new YAHOO.util.FunctionDataSource(matchUsers);

kallithea/templates/pullrequests/pullrequest.html

➞

Show inline comments

@@ @@ -130,7 +130,7 @@ ${self.repo_context_bar('showpullrequest @@
 <script type="text/javascript">
   var _USERS_AC_DATA = ${c.users_array|n};
   var _GROUPS_AC_DATA = ${c.user_groups_array|n};
-  PullRequestAutoComplete('user', 'reviewers_container', _USERS_AC_DATA, _GROUPS_AC_DATA);
   PullRequestAutoComplete('user', 'reviewers_container', _USERS_AC_DATA);
   pyroutes.register('pullrequest_repo_info', "${url('pullrequest_repo_info',repo_name='%(repo_name)s')}", ['repo_name']);

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -369,7 +369,7 @@ ${self.repo_context_bar('showpullrequest @@
     <script type="text/javascript">
       $(document).ready(function(){
-          PullRequestAutoComplete('user', 'reviewers_container', _USERS_AC_DATA, _GROUPS_AC_DATA);
           PullRequestAutoComplete('user', 'reviewers_container', _USERS_AC_DATA);
           $('.add-bubble').click(function(e){
               var tr = e.currentTarget;

0 comments (0 inline, 0 general)