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

@@ @@ -728,13 +728,13 @@ var injectInlineForm = function(tr){ @@
     })
     setTimeout(function(){
         // callbacks
         tooltip_activate();
         MentionsAutoComplete('text_'+lineno, 'mentions_container_'+lineno,
-                             _USERS_AC_DATA, _GROUPS_AC_DATA);
                              _USERS_AC_DATA);
         $('#text_'+lineno).focus();
     },10)
 };
 var deleteComment = function(comment_id){
     var url = AJAX_COMMENT_DELETE_URL.replace('__COMMENT_ID__',comment_id);
@@ @@ -1286,15 +1286,14 @@ var _MembersAutoComplete = function (div @@
         ownerDS: ownerDS,
         membersAC: membersAC,
         ownerAC: ownerAC
     };
+}
-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) {
             var org_sQuery = sQuery;
             if(this.mentionQuery == null){
                 return []
@@ @@ -1315,17 +1314,12 @@ var MentionsAutoComplete = function (div @@
                     matches[matches.length] = contact;
+                }
+            }
             return matches
         };
     //match all
     var matchAll = function (sQuery) {
             return matchUsers(sQuery);
         };
     // DataScheme for owner
     var ownerDS = new YAHOO.util.FunctionDataSource(matchUsers);
     ownerDS.responseSchema = {
         fields: ["id", "fname", "lname", "nname", "gravatar_lnk", "gravatar_size"]
     };
@@ @@ -1512,16 +1506,15 @@ var removeReviewMember = function(review @@
     var $li = $('#reviewer_{0}'.format(reviewer_id));
     $li.find('div div').css("text-decoration", "line-through");
     $li.find('input').attr('name', 'review_members_removed');
     $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) {
             // Case insensitive matching
             var query = sQuery.toLowerCase();
             var i = 0;
@@ @@ -1537,35 +1530,12 @@ var PullRequestAutoComplete = function ( @@
                     matches[matches.length] = contact;
+                }
+            }
             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);
     ownerDS.responseSchema = {
         fields: ["id", "fname", "lname", "nname", "gravatar_lnk", "gravatar_size"]
     };

kallithea/templates/pullrequests/pullrequest.html

➞

Show inline comments

@@ @@ -127,13 +127,13 @@ ${self.repo_context_bar('showpullrequest @@
 </div>
 <script type="text/javascript" src="${h.url('/js/graph.js', ver=c.kallithea_version)}"></script>
 <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']);
   var pendingajax = undefined;
   var otherrepoChanged = function(){
       var $other_ref = $('#other_ref');

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -366,13 +366,13 @@ ${self.repo_context_bar('showpullrequest @@
                               pull_request_id=c.pull_request.pull_request_id),
                        c.current_voting_result,
                        is_pr=True, change_status=c.allowed_to_change_status)}
     <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;
               injectInlineForm(tr.parentNode.parentNode);
           });

0 comments (0 inline, 0 general)