kallithea Changeset - 7db8e58cee2f

Changeset - 7db8e58cee2f

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Jan Heylen - 10 years ago 2015-11-29 16:43:42
heyleke@gmail.com

diffs: introduce 'show inline comments' control for pull-requests too

Make diff_block_simple control inline comments like diff_block does.

.show-inline-comments handling is moved to the generic diff handling js.

I am not sure this is useful when the whole diff is sent to the client side
anyway ... but for now, let's be consistent.

2 files changed with 18 insertions and 13 deletions:

kallithea/templates/changeset/changeset.html

kallithea/templates/changeset/diff_block.html

0 comments (0 inline, 0 general)

kallithea/templates/changeset/changeset.html

➞

Show inline comments

@@ @@ -200,37 +200,24 @@ ${self.repo_context_bar('changelog', c.c @@
     ${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();
               }else{
                   $('#{0} .inline-comments'.format(boxid)).hide();
+              }
           });
           $('.code-difftable').on('click', '.add-bubble', function(e){
               show_comment_form($(this));
           });
           move_comments($(".comments .comments-list-chunk"));
           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){

kallithea/templates/changeset/diff_block.html

➞

Show inline comments

@@ @@ -108,24 +108,30 @@ @@
                       <a class="spantag" href="${h.url('files_home', repo_name=cs_repo_name, f_path=filename, revision=cs_rev)}">${h.short_ref(cs_ref_type, cs_ref_name)}</a>
                     %else:
                       ${op}???
                     %endif
                 </div>
                 <div class="diff-actions">
                   <a href="${h.url('files_diff_2way_home',repo_name=cs_repo_name,f_path=h.safe_unicode(filename),diff1=a_rev,diff2=cs_rev,diff='diff',fulldiff=1)}" class="tooltip" title="${_('Show full side-by-side diff for this file')}">
                       <i class="icon-docs"></i>
                   </a>
                   ${c.ignorews_url(request.GET, url_fid)}
                   ${c.context_url(request.GET, url_fid)}
                 </div>
                 <span style="float:right;margin-top:-3px">
                     <label>
                         ${_('Show inline comments')}
                         ${h.checkbox('',checked="checked",class_="show-inline-comments",id_for=url_fid)}
                     </label>
                 </span>
             </div>
         </div>
         <div class="code-body full_f_path" data-f_path="${h.safe_unicode(filename)}">
             ${diff|n}
             %if filename.rsplit('.')[-1] in ['png', 'gif', 'jpg', 'bmp']:
               <div class="btn btn-image-diff-show">Show images</div>
               %if op == 'M':
                 <div id="${id_fid}_image-diff" class="btn btn-image-diff-swap" style="display:none">Press to swap images</div>
               %endif
               <div style="font-size: 0">
                 %if op in 'DM':
                   <img id="${id_fid}_image-diff-img-a" class="img-diff img-diff-swapable" style="display:none"
@@ @@ -170,15 +176,27 @@ $(document).ready(function(){ @@
     $('.diff-collapse-button').click(function(e) {
         var $button = $(e.currentTarget);
         var $target = $('#' + $button.attr('target'));
         if($target.hasClass('hidden')){
             $target.removeClass('hidden');
             $button.html("&uarr; {0} &uarr;".format(_TM['Collapse Diff']));
+        }
         else if(!$target.hasClass('hidden')){
             $target.addClass('hidden');
             $button.html("&darr; {0} &darr;".format(_TM['Expand Diff']));
+        }
     });
     $('.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();
         }else{
             $('#{0} .inline-comments'.format(boxid)).hide();
+        }
     });
 });
 </script>
 </%def>

0 comments (0 inline, 0 general)