kallithea Changeset - 765fe407eda4

Changeset - 765fe407eda4

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Mads Kiilerich - 11 years ago 2015-05-17 21:54:55
madski@unity3d.com

comments: refactor the DOM handling for previous/next comment links

Make it more clear which div the links are put into and set the whole content
of that div instead of appending. This prepares for repeatedly re-linking the
comments when new comments or comment forms are inserted in the text.

3 files changed with 6 insertions and 6 deletions:

kallithea/public/css/style.css

kallithea/public/js/base.js

kallithea/templates/changeset/changeset_file_comment.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -5044,38 +5044,38 @@ div.comment:target>.comment-wrapp { @@
 .btn-image-diff-swap {
     margin: 5px;
+}
 .img-diff {
     max-width: 45%;
     height: auto;
     margin: 5px;
     /* http://lea.verou.me/demos/css3-patterns.html */
     background-image:
         linear-gradient(45deg, #888 25%, transparent 25%, transparent),
         linear-gradient(-45deg, #888 25%, transparent 25%, transparent),
         linear-gradient(45deg, transparent 75%, #888 75%),
         linear-gradient(-45deg, transparent 75%, #888 75%);
     background-size: 10px 10px;
     background-color: #999;
+}
 .img-preview {
     max-width: 100%;
     height: auto;
     margin: 5px;
+}
 div.prev-next-comment div.prev-comment,
 div.prev-next-comment div.next-comment {
 div.comment-prev-next-links div.prev-comment,
 div.comment-prev-next-links div.next-comment {
     display: inline-block;
     min-width: 150px;
     margin: 3px 6px;
+}
 #help_kb {
     display: none;
+}
 .icon-only-links i {
     color: white;
+}

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -845,52 +845,51 @@ var renderInlineComments = function(file @@
+}
 /**
  * Double link comments
  */
 var linkInlineComments = function($firstlinks, $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 = $($comments.get(i-1)).attr('id');
                 prev = '<a href="#{0}">Previous comment</a>'.format(prev_anchor);
+            }
             var next = '';
             if (i+1 < $comments.length){
                 var next_anchor = $($comments.get(i+1)).attr('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);
             $(this).find('.comment-prev-next-links').html(
                 '<div class="prev-comment">{0}</div>'.format(prev) +
                 '<div class="next-comment">{0}</div>'.format(next));
         });
+}
 /* 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;
+        }
     })
     var $node_filter = $('#node_filter');
     var filterTimeout = null;
     var nodes = null;
     var initFilter = function(){

kallithea/templates/changeset/changeset_file_comment.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 ## usage:
 ## <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
 ## ${comment.comment_block(co)}
 ##
 <%def name="comment_block(co)">
   <div class="comment" id="comment-${co.comment_id}" line="${co.line_no}">
     <div class="comment-prev-next-links"></div>
     <div class="comment-wrapp">
       <div class="meta">
           <div style="float:left">
                ${h.gravatar(co.author.email, size=20)}
           </div>
           <div class="user">
               ${co.author.username_and_name}
           </div>
           <span>
               ${h.age(co.modified_at)}
               %if co.pull_request:
                 ${_('on pull request')}
                 <a href="${co.pull_request.url()}">"${co.pull_request.title or _("No title")}"</a>
               %else:
                 ${_('on this changeset')}
               %endif
               <a class="permalink" href="${co.url()}">&para;</a>
           </span>
           %if h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or co.author.user_id == c.authuser.user_id:
             <div onClick="confirm('${_("Delete comment?")}') && deleteComment(${co.comment_id})" class="buttons delete-comment btn btn-mini">${_('Delete')}</div>
           %endif
       </div>

0 comments (0 inline, 0 general)