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
4
34
kallithea/templates/pullrequests/pullrequest.html
1
1
kallithea/templates/pullrequests/pullrequest_show.html
1
1
0 comments (0 inline, 0 general)
kallithea/public/js/base.js
➞
Show inline comments
 
@@ -710,49 +710,49 @@ var injectInlineForm = function(tr){
 
        $('#preview-box_'+lineno).html(_TM['Loading ...']);
 
        $('#edit-container_'+lineno).hide();
 
        $('#edit-btn_'+lineno).show();
 
        $('#preview-container_'+lineno).show();
 
        $('#preview-btn_'+lineno).hide();
 

			




	
	
	
		
 
        var url = pyroutes.url('changeset_comment_preview', {'repo_name': REPO_NAME});

			




	
	
	
		
 
        var post_data = {'text': text};

			




	
	
	
		
 
        ajaxPOST(url, post_data, function(html){

			




	
	
	
		
 
            $('#preview-box_'+lineno).html(html);

			




	
	
	
		
 
            $('#preview-box_'+lineno).removeClass('unloaded');

			




	
	
	
		
 
        })

			




	
	
	
		
 
    })

			




	
	
	
		
 
    $('#edit-btn_'+lineno).click(function(e){

			




	
	
	
		
 
        $('#edit-container_'+lineno).show();

			




	
	
	
		
 
        $('#edit-btn_'+lineno).hide();

			




	
	
	
		
 
        $('#preview-container_'+lineno).hide();

			




	
	
	
		
 
        $('#preview-btn_'+lineno).show();

			




	
	
	
		
 
    })

			




	
	
	
		
 

			




	
	
	
		
 
    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);

			




	
	
	
		
 
    var postData = {'_method':'delete'};

			




	
	
	
		
 
    var success = function(o){

			




	
	
	
		
 
        var $deleted = $('#comment-tr-'+comment_id);

			




	
	
	
		
 
        var $prev = $deleted.prev('tr');

			




	
	
	
		
 
        while ($prev.hasClass('inline-comments')){

			




	
	
	
		
 
            $prev = $prev.prev('tr');

			




	
	
	
		
 
        }

			




	
	
	
		
 
        $deleted.remove();

			




	
	
	
		
 
        _placeAddButton($prev);

			




	
	
	
		
 
    }

			




	
	
	
		
 
    ajaxPOST(url,postData,success);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
var _getLineNo = function(tr) {

			




	
	
	
		
 
    var line;

			




	
	
	
		
 
    var o = $(tr).children()[0].id.split('_');

			




	
	
	
		
 
    var n = $(tr).children()[1].id.split('_');

			




	
	
	
		
 

			




	
	
		
 
@@ -1268,82 +1268,76 @@ var _MembersAutoComplete = function (div

			




	
	
	
		
 
            if (oData.nname != undefined) {

			




	
	
	
		
 
                //users

			




	
	
	
		
 
                myAC.getInputEl().value = oData.nname;

			




	
	
	
		
 
                $('#perm_new_member_type_'+nextId).val('user');

			




	
	
	
		
 
            } else {

			




	
	
	
		
 
                //groups

			




	
	
	
		
 
                myAC.getInputEl().value = oData.grname;

			




	
	
	
		
 
                $('#perm_new_member_type_'+nextId).val('users_group');

			




	
	
	
		
 
            }

			




	
	
	
		
 
        };

			




	
	
	
		
 

			




	
	
	
		
 
    membersAC.itemSelectEvent.subscribe(myHandler);

			




	
	
	
		
 
    if(ownerAC.itemSelectEvent){

			




	
	
	
		
 
        ownerAC.itemSelectEvent.subscribe(myHandler);

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    return {

			




	
	
	
		
 
        memberDS: memberDS,

			




	
	
	
		
 
        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 []

			




	
	
	
		
 
            }

			




	
	
	
		
 
            sQuery = this.mentionQuery;

			




	
	
	
		
 
            // Case insensitive matching

			




	
	
	
		
 
            var query = sQuery.toLowerCase();

			




	
	
	
		
 
            var i = 0;

			




	
	
	
		
 
            var l = myUsers.length;

			




	
	
	
		
 
            var matches = [];

			




	
	
	
		
 

			




	
	
	
		
 
            // Match against each name of each contact

			




	
	
	
		
 
            for (; i < l; i++) {

			




	
	
	
		
 
                var contact = myUsers[i];

			




	
	
	
		
 
                if (((contact.fname+"").toLowerCase().indexOf(query) > -1) ||

			




	
	
	
		
 
                     ((contact.lname+"").toLowerCase().indexOf(query) > -1) ||

			




	
	
	
		
 
                     ((contact.nname) && ((contact.nname).toLowerCase().indexOf(query) > -1))) {

			




	
	
	
		
 
                    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"]

			




	
	
	
		
 
    };

			




	
	
	
		
 

			




	
	
	
		
 
    // Instantiate AutoComplete for mentions

			




	
	
	
		
 
    var ownerAC = new YAHOO.widget.AutoComplete(divid, cont, ownerDS);

			




	
	
	
		
 
    ownerAC.useShadow = false;

			




	
	
	
		
 
    ownerAC.resultTypeList = false;

			




	
	
	
		
 
    ownerAC.suppressInputUpdate = true;

			




	
	
	
		
 
    ownerAC.animVert = false;

			




	
	
	
		
 
    ownerAC.animHoriz = false;

			




	
	
	
		
 
    ownerAC.animSpeed = 0.1;

			




	
	
	
		
 

			




	
	
	
		
 
    // Helper highlight function for the formatter

			




	
	
	
		
 
    var highlightMatch = function (full, snippet, matchindex) {

			




	
	
	
		
 
            return full.substring(0, matchindex)

			




	
	
	
		
 
                + "<span class='match'>"

			




	
	
	
		
 
                + full.substr(matchindex, snippet.length)

			




	
	
	
		
 
                + "</span>" + full.substring(matchindex + snippet.length);

			




	
	
	
		
 
        };

			




	
	
	
		
 

			




	
	
		
 
@@ -1494,96 +1488,72 @@ var addReviewMember = function(id,fname,

			




	
	
	
		
 
        '         <div class="reviewer_member_remove action_button" onclick="removeReviewMember({2})">\n'+

			




	
	
	
		
 
        '             <i class="icon-minus-circled"></i>\n'+

			




	
	
	
		
 
        '         </div> (add not saved)\n'+

			




	
	
	
		
 
        '       </div>\n'+

			




	
	
	
		
 
        '     </li>\n'

			




	
	
	
		
 
        ).format(gravatarelm, displayname, id);

			




	
	
	
		
 
    // check if we don't have this ID already in

			




	
	
	
		
 
    var ids = [];

			




	
	
	
		
 
    $('#review_members').find('li').each(function() {

			




	
	
	
		
 
            ids.push(this.id);

			




	
	
	
		
 
        });

			




	
	
	
		
 
    if(ids.indexOf('reviewer_'+id) == -1){

			




	
	
	
		
 
        //only add if it's not there

			




	
	
	
		
 
        $('#review_members').append(element);

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
var removeReviewMember = function(reviewer_id, repo_name, pull_request_id){

			




	
	
	
		
 
    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;

			




	
	
	
		
 
            var l = myUsers.length;

			




	
	
	
		
 
            var matches = [];

			




	
	
	
		
 

			




	
	
	
		
 
            // Match against each name of each contact

			




	
	
	
		
 
            for (; i < l; i++) {

			




	
	
	
		
 
                var contact = myUsers[i];

			




	
	
	
		
 
                if (((contact.fname+"").toLowerCase().indexOf(query) > -1) ||

			




	
	
	
		
 
                     ((contact.lname+"").toLowerCase().indexOf(query) > -1) ||

			




	
	
	
		
 
                     ((contact.nname) && ((contact.nname).toLowerCase().indexOf(query) > -1))) {

			




	
	
	
		
 
                    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"]

			




	
	
	
		
 
    };

			




	
	
	
		
 

			




	
	
	
		
 
    // Instantiate AutoComplete for mentions

			




	
	
	
		
 
    var reviewerAC = new YAHOO.widget.AutoComplete(divid, cont, ownerDS);

			




	
	
	
		
 
    reviewerAC.useShadow = false;

			




	
	
	
		
 
    reviewerAC.resultTypeList = false;

			




	
	
	
		
 
    reviewerAC.suppressInputUpdate = true;

			




	
	
	
		
 
    reviewerAC.animVert = false;

			




	
	
	
		
 
    reviewerAC.animHoriz = false;

			




	
	
	
		
 
    reviewerAC.animSpeed = 0.1;

			




	
	
	
		
 

			




	
	
	
		
 
    // Helper highlight function for the formatter

			




	
	
	
		
 
    var highlightMatch = function (full, snippet, matchindex) {

			




	
	
	
		
 
            return full.substring(0, matchindex)

			




	
	
	
		
 
                + "<span class='match'>"

			




	
	
	
		
 
                + full.substr(matchindex, snippet.length)

			




	
	
	
		
 
                + "</span>" + full.substring(matchindex + snippet.length);

			




	
	
	
		
 
        };

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -109,49 +109,49 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        <div style="clear:both;padding: 0 0 30px 0;"></div>

			




	
	
	
		
 

			




	
	
	
		
 
        <h4>${_('Changesets')}</h4>

			




	
	
	
		
 
        <div style="float:left;padding:0px 30px 30px 30px">

			




	
	
	
		
 
           ## overview pulled by ajax

			




	
	
	
		
 
           <div style="float:left" id="pull_request_overview"></div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div style="clear:both;"></div>

			




	
	
	
		
 

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    ${h.end_form()}

			




	
	
	
		
 

			




	
	
	
		
 
</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');

			




	
	
	
		
 
      $other_ref.prop('disabled', true);

			




	
	
	
		
 
      var repo_name = $('#other_repo').val();

			




	
	
	
		
 
      if (pendingajax) {

			




	
	
	
		
 
          pendingajax.abort();

			




	
	
	
		
 
          pendingajax = undefined;

			




	
	
	
		
 
      }

			




	
	
	
		
 
      pendingajax = ajaxGET(pyroutes.url('pullrequest_repo_info', {"repo_name": repo_name}),

			




	
	
	
		
 
          function(data){

			




	
	
	
		
 
              pendingajax = undefined;

			




	
	
	
		
 
              $('#other_repo_desc').html(data.description);

			




	
	
	
		
 

			




	
	
	
		
 
              // replace options of other_ref with the ones for the current other_repo

			




	
	
	
		
 
              $other_ref.empty();

			




	
	
	
		
 
              for(var i = 0; i < data.refs.length; i++)

			




	
	
	
		
 
              {

			




	
	
	
		
 
                var $optgroup = $('<optgroup/>').attr('label', data.refs[i][1]);

			




	
	
	
		
 
                var options = data.refs[i][0];

			




	
	
	
		
 
                var length = options.length;

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -348,49 +348,49 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
    <%namespace name="diff_block" file="/changeset/diff_block.html"/>

			




	
	
	
		
 
    ${diff_block.diff_block_js()}

			




	
	
	
		
 
    %for fid, change, f, stat in c.files:

			




	
	
	
		
 
      ${diff_block.diff_block_simple([c.changes[fid]])}

			




	
	
	
		
 
    %endfor

			




	
	
	
		
 
    % if c.limited_diff:

			




	
	
	
		
 
      <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h4>

			




	
	
	
		
 
    % endif

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    ## template for inline comment form

			




	
	
	
		
 
    ${comment.comment_inline_form()}

			




	
	
	
		
 

			




	
	
	
		
 
    ## render comments and inlines

			




	
	
	
		
 
    ${comment.generate_comments()}

			




	
	
	
		
 

			




	
	
	
		
 
    ## main comment form and it status

			




	
	
	
		
 
    ${comment.comments(h.url('pullrequest_comment', repo_name=c.repo_name,

			




	
	
	
		
 
                              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);

			




	
	
	
		
 
          });

			




	
	
	
		
 

			




	
	
	
		
 
          var avail_jsdata = ${c.avail_jsdata|n};

			




	
	
	
		
 
          var avail_r = new BranchRenderer('avail_graph_canvas', 'updaterevs-table', 'chg_available_');

			




	
	
	
		
 
          avail_r.render(avail_jsdata,40);

			




	
	
	
		
 

			




	
	
	
		
 
          // inject comments into they proper positions

			




	
	
	
		
 
          var file_comments = $('.inline-comment-placeholder').toArray();

			




	
	
	
		
 
          renderInlineComments(file_comments);

			




	
	
	
		
 

			




	
	
	
		
 
          linkInlineComments($('.firstlink'), $('.comment'));

			




	
	
	
		
 

			




	
	
	
		
 
          $('#updaterevs input').change(function(e){

			




	
	
	
		
 
              var update = !!e.target.value;

			




	
	
	
		
 
              $('#pr-form-save').prop('disabled',update);

			




	
	
	
		
 
              $('#pr-form-clone').prop('disabled',!update);

			




	
	
	
		
 
          });

			




	
	
	
		
 
          var $org_review_members = $('#review_members').clone();

			




	
	
	
		
 
          $('#pr-form-reset').click(function(e){

			




	
	
	
		
 
              $('#pr-edit-form').hide();

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.