kallithea Changeset - 054c6d98454b

Changeset - 054c6d98454b

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 10 years ago 2016-01-20 01:47:11
madski@unity3d.com

comments: reload after some kinds of general comments - the ones that change the whole page state

1 file changed with 19 insertions and 15 deletions:

kallithea/public/js/base.js

0 comments (0 inline, 0 general)

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -613,26 +613,30 @@ var q_filter = (function() { @@
  */
 // move comments to their right location, inside new trs
 function move_comments($anchorcomments) {
     $anchorcomments.each(function(i, anchorcomment) {
         var $anchorcomment = $(anchorcomment);
         var target_id = $anchorcomment.data('target-id');
         var $comment_div = _get_add_comment_div(target_id);
         var f_path = $anchorcomment.data('f_path');
         var line_no = $anchorcomment.data('line_no');
         if ($comment_div[0]) {
             $comment_div.append($anchorcomment.children());
             if (f_path && line_no) {
             _comment_div_append_add($comment_div, f_path, line_no);
         } else {
                 _comment_div_append_form($comment_div, f_path, line_no);
+            }
         } else {
            $anchorcomment.before("Comment to {0} line {1} which is outside the diff context:".format(f_path || '?', line_no || '?'));
+        }
     });
     linkInlineComments($('.firstlink'), $('.comment:first-child'));
+}
 // comment bubble was clicked - insert new tr and show form
 function show_comment_form($bubble) {
     var children = $bubble.closest('tr.line').children('[id]');
     var line_td_id = children[children.length - 1].id;
     var $comment_div = _get_add_comment_div(line_td_id);
     var f_path = $bubble.closest('div.full_f_path').data('f_path');
@@ @@ -644,54 +648,49 @@ function show_comment_form($bubble) { @@
 // return comment div for target_id - add it if it doesn't exist yet
 function _get_add_comment_div(target_id) {
     var comments_box_id = 'comments-' + target_id;
     var $comments_box = $('#' + comments_box_id);
     if (!$comments_box.length) {
         var html = '<tr><td id="{0}" colspan="3" class="inline-comments"></td></tr>'.format(comments_box_id);
         $('#' + target_id).closest('tr').after(html);
         $comments_box = $('#' + comments_box_id);
+    }
     return $comments_box;
+}
 // set $comment_div state - showing or not showing form and Add button
 function comment_div_state($comment_div, f_path, line_no, show_form) {
 // Set $comment_div state - showing or not showing form and Add button.
 // An Add button is shown on non-empty forms when no form is shown.
 // The form is controlled by show_form - if undefined, form is only shown for general comments.
 function comment_div_state($comment_div, f_path, line_no, show_form_opt) {
     var show_form = show_form_opt !== undefined ? show_form_opt : !f_path && !line_no;
     var $forms = $comment_div.children('.comment-inline-form');
     var $buttonrow = $comment_div.children('.add-button-row');
     var $comments = $comment_div.children('.comment');
     $forms.remove();
     $buttonrow.remove();
     if (show_form) {
         if (!$forms.length) {
             _comment_div_append_form($comment_div, f_path, line_no);
+        }
     } else {
         $forms.remove();
+    }
     $buttonrow.remove();
     if ($comments.length && !show_form) {
     } else if ($comments.length) {
         _comment_div_append_add($comment_div, f_path, line_no);
+    }
+}
 // append an Add button to $comment_div and hook it up to show form
 function _comment_div_append_add($comment_div, f_path, line_no) {
     if (f_path && line_no) {
         var addlabel = TRANSLATION_MAP['Add Another Comment'];
         var $add = $('<div class="add-button-row"><span class="btn btn-mini add-button">{0}</span></div>'.format(addlabel));
         $comment_div.append($add);
         $add.children('.add-button').click(function(e) {
             comment_div_state($comment_div, f_path, line_no, true);
         });
     } else {
         comment_div_state($comment_div, f_path, line_no, true);
+    }
+}
 // append a comment form to $comment_div
 function _comment_div_append_form($comment_div, f_path, line_no) {
     var $form_div = $('#comment-inline-form-template').children()
         .clone()
         .addClass('comment-inline-form');
     $comment_div.append($form_div);
     var $form = $comment_div.find("form");
     var $textarea = $form.find('textarea');
     var $mentions_container = $form.find('div.mentions-container');
@@ @@ -709,33 +708,38 @@ function _comment_div_append_form($comme @@
         $form.find('.submitting-overlay').show();
         var postData = {
             'text': text,
             'f_path': f_path,
             'line': line_no,
             'changeset_status': review_status,
             'save_close': pr_close
         };
         var success = function(json_data) {
             $comment_div.append(json_data['rendered_text']);
             comment_div_state($comment_div, f_path, line_no);
             linkInlineComments($('.firstlink'), $('.comment:first-child'));
             if ((review_status || pr_close) && !f_path && !line_no) {
                 // Page changed a lot - reload it after closing the submitted form
             comment_div_state($comment_div, f_path, line_no, false);
             linkInlineComments($('.firstlink'), $('.comment:first-child'));
                 location.reload(true);
+            }
         };
         ajaxPOST(AJAX_COMMENT_URL, postData, success);
     });
     // create event for hide button
     $form.find('.hide-inline-form').click(function(e) {
-        comment_div_state($comment_div, f_path, line_no, false);
         comment_div_state($comment_div, f_path, line_no);
     });
     setTimeout(function() {
         // callbacks
         tooltip_activate();
         MentionsAutoComplete($textarea, $mentions_container, _USERS_AC_DATA);
         $textarea.focus();
     }, 10);
+}
 function deleteComment(comment_id) {

0 comments (0 inline, 0 general)