Changeset - 990ec5ed4ee5
Parent rev.
Child rev.
[Not reviewed]
default
0 3 0
Thomas De Schampheleire - 11 years ago 2015-01-29 21:48:54
thomas.de_schampheleire@alcatel-lucent.com
comment handling: extend next/previous links to global comments (issue #91)

Until now, only inline comments were linked to each other with next/previous
links.

This commit extends this mechanism to global comments, such that the last
inline comment has a next link to the first global comment, which has a next
link to the next global comment (and the other way around for previous
links).

In order to work well, instead of hiding inline comments that have been
moved, they actually have to be deleted.
3 files changed with 10 insertions and 2 deletions:
kallithea/public/js/base.js
8
kallithea/templates/changeset/changeset.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
 
@@ -773,112 +773,120 @@ var _placeAddButton = function($line_tr)
 
};
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
 * Places the inline comment into the changeset block in proper line position

			




	
	
	
		
 
 */

			




	
	
	
		
 
var _placeInline = function(target_id, lineno, html){

			




	
	
	
		
 
    var $td = $("#{0}_{1}".format(target_id, lineno));

			




	
	
	
		
 
    if (!$td.length){

			




	
	
	
		
 
        return false;

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    // check if there are comments already !

			




	
	
	
		
 
    var $line_tr = $td.parent(); // the tr

			




	
	
	
		
 
    var $after_tr = $line_tr;

			




	
	
	
		
 
    while ($after_tr.next().hasClass('inline-comments')){

			




	
	
	
		
 
        $after_tr = $after_tr.next();

			




	
	
	
		
 
    }

			




	
	
	
		
 
    // put in the comment at the bottom

			




	
	
	
		
 
    var $tr = _table_tr('inline-comments', html)

			




	
	
	
		
 
    $tr.find('div.comment').addClass('inline-comment');

			




	
	
	
		
 
    $after_tr.after($tr);

			




	
	
	
		
 

			




	
	
	
		
 
    // scan nodes, and attach add button to last one

			




	
	
	
		
 
    _placeAddButton($line_tr);

			




	
	
	
		
 
    return true;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
 * make a single inline comment and place it inside

			




	
	
	
		
 
 */

			




	
	
	
		
 
var _renderInlineComment = function(json_data){

			




	
	
	
		
 
    var html =  json_data['rendered_text'];

			




	
	
	
		
 
    var lineno = json_data['line_no'];

			




	
	
	
		
 
    var target_id = json_data['target_id'];

			




	
	
	
		
 
    return _placeInline(target_id, lineno, html);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
 * Iterates over all the inlines, and places them inside proper blocks of data

			




	
	
	
		
 
 */

			




	
	
	
		
 
var renderInlineComments = function(file_comments){

			




	
	
	
		
 
    for (var f in file_comments){

			




	
	
	
		
 
        // holding all comments for a FILE

			




	
	
	
		
 
        var box = file_comments[f];

			




	
	
	
		
 

			




	
	
	
		
 
        var target_id = $(box).attr('target_id');

			




	
	
	
		
 
        // actual comments with line numbers

			




	
	
	
		
 
        var comments = box.children;

			




	
	
	
		
 
        var obsolete_comments = [];

			




	
	
	
		
 
        for(var i=0; i<comments.length; i++){

			




	
	
	
		
 
            var data = {

			




	
	
	
		
 
                'rendered_text': comments[i].outerHTML,

			




	
	
	
		
 
                'line_no': $(comments[i]).attr('line'),

			




	
	
	
		
 
                'target_id': target_id

			




	
	
	
		
 
            }

			




	
	
	
		
 
            if (_renderInlineComment(data)) {

			




	
	
	
		
 
                obsolete_comments.push(comments[i]);

			




	
	
	
		
 
                $(comments[i]).hide();

			




	
	
	
		
 
            }else{

			




	
	
	
		
 
                var txt = document.createTextNode(

			




	
	
	
		
 
                        "Comment to " + YUD.getAttribute(comments[i].parentNode,'path') +

			




	
	
	
		
 
                        " line " + data.line_no +

			




	
	
	
		
 
                        " which is outside the diff context:");

			




	
	
	
		
 
                comments[i].insertBefore(txt, comments[i].firstChild);

			




	
	
	
		
 
            }

			




	
	
	
		
 
        }

			




	
	
	
		
 
        // now remove all the obsolete comments that have been copied to their

			




	
	
	
		
 
        // respective locations.

			




	
	
	
		
 
        for (var i=0; i < obsolete_comments.length; i++) {

			




	
	
	
		
 
            obsolete_comments[i].parentNode.removeChild(obsolete_comments[i]);

			




	
	
	
		
 
        }

			




	
	
	
		
 

			




	
	
	
		
 
        $(box).show();

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
 * Double link comments

			




	
	
	
		
 
 */

			




	
	
	
		
 
var linkInlineComments = function(firstlinks, comments){

			




	
	
	
		
 
    var $comments = $(comments);

			




	
	
	
		
 
    if ($comments.length > 0) {

			




	
	
	
		
 
        $(firstlinks).html('<a href="#{0}">First comment</a>'.format($comments.attr('id')));

			




	
	
	
		
 
    }

			




	
	
	
		
 
    if ($comments.length <= 1) {

			




	
	
	
		
 
        return;

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    $comments.each(function(i, e){

			




	
	
	
		
 
            var prev = '';

			




	
	
	
		
 
            if (i > 0){

			




	
	
	
		
 
                var prev_anchor = YUD.getAttribute(comments.item(i-1),'id');

			




	
	
	
		
 
                prev = '<a href="#{0}">Previous comment</a>'.format(prev_anchor);

			




	
	
	
		
 
            }

			




	
	
	
		
 
            var next = '';

			




	
	
	
		
 
            if (i+1 < comments.length){

			




	
	
	
		
 
                var next_anchor = YUD.getAttribute(comments.item(i+1),'id');

			




	
	
	
		
 
                next = '<a href="#{0}">Next comment</a>'.format(next_anchor);

			




	
	
	
		
 
            }

			




	
	
	
		
 
            var $div = $(('<div class="prev-next-comment">'+

			




	
	
	
		
 
                          '<div class="prev-comment">{0}</div>'+

			




	
	
	
		
 
                          '<div class="next-comment">{1}</div>').format(prev, next));

			




	
	
	
		
 
            $div.prependTo(this);

			




	
	
	
		
 
        });

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/* activate files.html stuff */

			




	
	
	
		
 
var fileBrowserListeners = function(current_url, node_list_url, url_base){

			




	
	
	
		
 
    var current_url_branch = "?branch=__BRANCH__";

			




	
	
	
		
 

			




	
	
	
		
 
    $('#stay_at_branch').on('click',function(e){

			




	
	
	
		
 
        if(e.currentTarget.checked){

			




	
	
	
		
 
            var uri = current_url_branch;

			




	
	
	
		
 
            uri = uri.replace('__BRANCH__',e.currentTarget.value);

			




	
	
	
		
 
            window.location = uri;

			




	
	
	
		
 
        }

			




	
	
	
		
 
        else{

			




	
	
	
		
 
            window.location = current_url;

			




	
	
	
		
 
        }

			




	
	
	
		
 
    })

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/changeset.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -163,97 +163,97 @@ ${self.repo_context_bar('changelog', c.c

			




	
	
	
		
 
    ## diff block

			




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

			




	
	
	
		
 
    ${diff_block.diff_block_js()}

			




	
	
	
		
 
    ${diff_block.diff_block(c.changes[c.changeset.raw_id])}

			




	
	
	
		
 

			




	
	
	
		
 
    % 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

			




	
	
	
		
 

			




	
	
	
		
 
    ## 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('changeset_comment', repo_name=c.repo_name, revision=c.changeset.raw_id),

			




	
	
	
		
 
                       h.changeset_status(c.db_repo, c.changeset.raw_id))}

			




	
	
	
		
 

			




	
	
	
		
 
    ## FORM FOR MAKING JS ACTION AS CHANGESET COMMENTS

			




	
	
	
		
 
    <script type="text/javascript">

			




	
	
	
		
 
      $(document).ready(function(){

			




	
	
	
		
 
          $('.show-inline-comments').change(function(e){

			




	
	
	
		
 
              var target = e.currentTarget;

			




	
	
	
		
 
              if(target == null){

			




	
	
	
		
 
                  target = this;

			




	
	
	
		
 
              }

			




	
	
	
		
 
              var boxid = $(target).attr('id_for');

			




	
	
	
		
 
              if(target.checked){

			




	
	
	
		
 
                  $('#{0} .inline-comments'.format(boxid)).show();

			




	
	
	
		
 
                  $('#{0} .inline-comments-button'.format(boxid)).show();

			




	
	
	
		
 
              }else{

			




	
	
	
		
 
                  $('#{0} .inline-comments'.format(boxid)).hide();

			




	
	
	
		
 
                  $('#{0} .inline-comments-button'.format(boxid)).hide();

			




	
	
	
		
 
              }

			




	
	
	
		
 
          });

			




	
	
	
		
 
          $('.add-bubble').click(function(e){

			




	
	
	
		
 
              var tr = e.currentTarget;

			




	
	
	
		
 
              if(tr == null){

			




	
	
	
		
 
                  tr = this;

			




	
	
	
		
 
              }

			




	
	
	
		
 
              injectInlineForm(tr.parentNode.parentNode);

			




	
	
	
		
 
          });

			




	
	
	
		
 

			




	
	
	
		
 
          // inject comments into they proper positions

			




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

			




	
	
	
		
 
          renderInlineComments(file_comments);

			




	
	
	
		
 

			




	
	
	
		
 
          linkInlineComments(document.getElementsByClassName('firstlink'), document.getElementsByClassName("inline-comment"));

			




	
	
	
		
 
          linkInlineComments(document.getElementsByClassName('firstlink'), document.getElementsByClassName("comment"));

			




	
	
	
		
 

			




	
	
	
		
 
          pyroutes.register('changeset_home',

			




	
	
	
		
 
                            "${h.url('changeset_home', repo_name='%(repo_name)s', revision='%(revision)s')}",

			




	
	
	
		
 
                            ['repo_name', 'revision']);

			




	
	
	
		
 

			




	
	
	
		
 
          //next links

			




	
	
	
		
 
          $('#child_link').on('click', function(e){

			




	
	
	
		
 
              //fetch via ajax what is going to be the next link, if we have

			




	
	
	
		
 
              //>1 links show them to user to choose

			




	
	
	
		
 
              if(!$('#child_link').hasClass('disabled')){

			




	
	
	
		
 
                  $.ajax({

			




	
	
	
		
 
                    url: '${h.url('changeset_children',repo_name=c.repo_name, revision=c.changeset.raw_id)}',

			




	
	
	
		
 
                    success: function(data) {

			




	
	
	
		
 
                      if(data.results.length === 0){

			




	
	
	
		
 
                          $('#child_link').addClass('disabled');

			




	
	
	
		
 
                          $('#child_link').html('${_('no revisions')}');

			




	
	
	
		
 
                      }

			




	
	
	
		
 
                      if(data.results.length === 1){

			




	
	
	
		
 
                          var commit = data.results[0];

			




	
	
	
		
 
                          window.location = pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}','revision': commit.raw_id});

			




	
	
	
		
 
                      }

			




	
	
	
		
 
                      else if(data.results.length === 2){

			




	
	
	
		
 
                          $('#child_link').addClass('disabled');

			




	
	
	
		
 
                          $('#child_link').addClass('double');

			




	
	
	
		
 
                          var _html = '';

			




	
	
	
		
 
                          _html +='<a title="__title__" href="__url__">__rev__</a> <i style="color:#036185" class="icon-right-open"></i>'

			




	
	
	
		
 
                                  .replace('__rev__','r{0}:{1}'.format(data.results[0].revision, data.results[0].raw_id.substr(0,6)))

			




	
	
	
		
 
                                  .replace('__title__', data.results[0].message)

			




	
	
	
		
 
                                  .replace('__url__', pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}','revision': data.results[0].raw_id}));

			




	
	
	
		
 
                          _html +='<br/>'

			




	
	
	
		
 
                          _html +='<a title="__title__" href="__url__">__rev__</a> <i style="color:#036185" class="icon-right-open"></i>'

			




	
	
	
		
 
                                  .replace('__rev__','r{0}:{1}'.format(data.results[1].revision, data.results[1].raw_id.substr(0,6)))

			




	
	
	
		
 
                                  .replace('__title__', data.results[1].message)

			




	
	
	
		
 
                                  .replace('__url__', pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}','revision': data.results[1].raw_id}));

			




	
	
	
		
 
                          $('#child_link').html(_html);

			




	
	
	
		
 
                      }

			




	
	
	
		
 
                    }

			




	
	
	
		
 
                  });

			




	
	
	
		
 
              e.preventDefault();

			




	
	
	
		
 
              }

			




	
	
	
		
 
          })

			




	
	
	
		
 

			




	
	
	
		
 
          //prev links

			




	
	
	
		
 
          $('#parent_link').on('click', function(e){

			




	
	
	
		
 
              //fetch via ajax what is going to be the next link, if we have

			




	
	
	
		
 
              //>1 links show them to user to choose

			




	
	
	
		
 
              if(!$('#parent_link').hasClass('disabled')){

			




	
	
	
		
 
                  $.ajax({

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -316,74 +316,74 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
    AJAX_COMMENT_URL = "${url('pullrequest_comment',repo_name=c.repo_name,pull_request_id=c.pull_request.pull_request_id)}";

			




	
	
	
		
 
    AJAX_COMMENT_DELETE_URL = "${url('pullrequest_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}";

			




	
	
	
		
 

			




	
	
	
		
 
    pyroutes.register('pullrequest_comment', "${url('pullrequest_comment',repo_name='%(repo_name)s',pull_request_id='%(pull_request_id)s')}", ['repo_name', 'pull_request_id']);

			




	
	
	
		
 
    pyroutes.register('pullrequest_comment_delete', "${url('pullrequest_comment_delete',repo_name='%(repo_name)s',comment_id='%(comment_id)s')}", ['repo_name', 'comment_id']);

			




	
	
	
		
 

			




	
	
	
		
 
    </script>

			




	
	
	
		
 

			




	
	
	
		
 
    ## diff block

			




	
	
	
		
 
    <%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

			




	
	
	
		
 

			




	
	
	
		
 

			




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

			




	
	
	
		
 

			




	
	
	
		
 
          $('.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(document.getElementsByClassName('firstlink'), document.getElementsByClassName("inline-comment"));

			




	
	
	
		
 
          linkInlineComments(document.getElementsByClassName('firstlink'), document.getElementsByClassName("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();

			




	
	
	
		
 
              $('.pr-not-edit').show();

			




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

			




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

			




	
	
	
		
 
              $('#review_members').html($org_review_members);

			




	
	
	
		
 
          });

			




	
	
	
		
 

			




	
	
	
		
 
          // hack: re-navigate to target after JS is done ... if a target is set and setting href thus won't reload

			




	
	
	
		
 
          if (window.location.hash != "") {

			




	
	
	
		
 
              window.location.href = window.location.href;

			




	
	
	
		
 
          }

			




	
	
	
		
 
      });

			




	
	
	
		
 
    </script>

			




	
	
	
		
 

			




	
	
	
		
 
</div>

			




	
	
	
		
 

			




	
	
	
		
 
</%def>

			




        

    



    


    



    



      

      





    
    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.