kallithea Changeset - e81498114bc8

Changeset - e81498114bc8

Parent rev.

Child rev.

[Not reviewed]

stable

0 2 0

Mads Kiilerich - 10 years ago 2015-09-14 23:06:00
madski@unity3d.com

comments: fix comment add button - it is only the button that should be clickable, not the containing div

2 files changed with 5 insertions and 5 deletions:

kallithea/public/css/style.css

kallithea/public/js/base.js

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -4288,49 +4288,49 @@ form.comment-inline-form { @@
 .comment-inline-form .comment-button {
     padding-top: 5px;
+}
 /** comment inline **/
 .inline-comments {
     padding: 0 20px;
+}
 .inline-comments div.rst-block {
     clear: both;
     overflow: hidden;
     margin: 0;
     padding: 0 20px 0px;
+}
 .inline-comments .comment .comment-wrapp {
     max-width: 978px;
     border: 1px solid #ddd;
     border-radius: 4px;
     margin: 3px 3px 5px 5px;
     background-color: #FAFAFA;
+}
-.inline-comments .add-comment {
+.inline-comments .add-button-row {
     padding: 2px 4px 8px 5px;
+}
 .inline-comments .comment .meta {
     background: #f8f8f8;
     padding: 4px;
     border-bottom: 1px solid #ddd;
     min-height: 20px;
     overflow: auto;
+}
 .inline-comments .comment .meta img {
     vertical-align: middle;
+}
 .inline-comments .comment .meta .user {
     font-weight: bold;
     float: left;
     padding: 3px;
+}
 .inline-comments .comment .meta .date {
     float: left;
     padding: 3px;

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -634,69 +634,69 @@ 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');
     var parts = line_td_id.split('_');
     var line_no = parts[parts.length-1];
     comment_div_state($comment_div, f_path, line_no, true);
+}
 // 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) {
     var $forms = $comment_div.children('.comment-inline-form');
-    var $buttons = $comment_div.children('.add-comment');
+    var $buttonrow = $comment_div.children('.add-button-row');
     var $comments = $comment_div.children('.comment');
     if (show_form) {
         if (!$forms.length) {
             _comment_div_append_form($comment_div, f_path, line_no);
+        }
     } else {
         $forms.remove();
+    }
-    $buttons.remove();
+    $buttonrow.remove();
     if ($comments.length && !show_form) {
         _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) {
     var addlabel = TRANSLATION_MAP['Add Another Comment'];
-    var $add = $('<div class="add-comment"><span class="btn btn-mini">{0}</span></div>'.format(addlabel));
+    var $add = $('<div class="add-button-row"><span class="btn btn-mini add-button">{0}</span></div>'.format(addlabel));
     $comment_div.append($add);
     $add.click(function(e) {
+    $add.children('.add-button').click(function(e) {
         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').html().format(f_path, line_no))
         .addClass('comment-inline-form');
     $comment_div.append($form_div);
     var $form = $comment_div.find("form");
     $form.submit(function(e) {
         e.preventDefault();
         var text = $('#text_'+line_no).val();
         if (!text){
             return;
+        }
         $form.find('.submitting-overlay').show();
         var success = function(json_data) {
             $comment_div.append(json_data['rendered_text']);
             comment_div_state($comment_div, f_path, line_no, false);

0 comments (0 inline, 0 general)