Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-02-14 02:20:23 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-02-14 02:20:23 +0400
commitae416a76ff235ad5be5aeb41e8f5d207a9c0d95b (patch)
treebc84f815594a3c1a9f695c0c17122c48f8c21aef /app/views/commits
parent6473977a2f50f2154452c8a213dfc287f033edd4 (diff)
per line comments improved. replaced from dbclick to link
Diffstat (limited to 'app/views/commits')
-rw-r--r--app/views/commits/_text_file.html.haml28
-rw-r--r--app/views/commits/show.html.haml5
2 files changed, 18 insertions, 15 deletions
diff --git a/app/views/commits/_text_file.html.haml b/app/views/commits/_text_file.html.haml
index 609a454a1c6..3058ee1d9bf 100644
--- a/app/views/commits/_text_file.html.haml
+++ b/app/views/commits/_text_file.html.haml
@@ -1,17 +1,19 @@
%table
- each_diff_line(diff.diff.lines.to_a, index) do |line, type, line_code, line_new, line_old|
%tr.line_holder
- - if type == "match"
- %td.old_line= "..."
- %td.new_line= "..."
- %td.line_content.matched= line
- - else
- %td.old_line= link_to raw(type == "new" ? "&nbsp;" : line_old), "##{line_code}", :id => line_code
- %td.new_line= link_to raw(type == "old" ? "&nbsp;" : line_new) , "##{line_code}", :id => line_code
- %td.line_content{:class => "noteable_line #{type} #{line_code}", "line_code" => line_code}= raw "#{line} &nbsp;"
+ - if type == "match"
+ %td.old_line= "..."
+ %td.new_line= "..."
+ %td.line_content.matched= line
+ - else
+ %td.old_line
+ = link_to raw(type == "new" ? "&nbsp;" : line_old), "##{line_code}", :id => line_code
+ = link_to "", "#", :class => "line_note_link", "line_code" => line_code, :title => "Add note for this line"
+ %td.new_line= link_to raw(type == "old" ? "&nbsp;" : line_new) , "##{line_code}", :id => line_code
+ %td.line_content{:class => "noteable_line #{type} #{line_code}", "line_code" => line_code}= raw "#{line} &nbsp;"
- - comments = @line_notes.select { |n| n.line_code == line_code }.sort_by(&:created_at).reverse
- - unless comments.empty?
- - comments.each do |note|
- = render "notes/per_line_show", :note => note
- - @line_notes.reject!{ |n| n == note }
+ - comments = @line_notes.select { |n| n.line_code == line_code }.sort_by(&:created_at).reverse
+ - unless comments.empty?
+ - comments.each do |note|
+ = render "notes/per_line_show", :note => note
+ - @line_notes.reject!{ |n| n == note }
diff --git a/app/views/commits/show.html.haml b/app/views/commits/show.html.haml
index 26e89515b29..78a225c30e5 100644
--- a/app/views/commits/show.html.haml
+++ b/app/views/commits/show.html.haml
@@ -22,10 +22,11 @@
:javascript
$(document).ready(function(){
- $(".noteable_line").live("dblclick", function(e) {
+ $(".line_note_link").live("click", function(e) {
var form = $(".per_line_form");
- $(this).parent().after(form);
+ $(this).parent().parent().after(form);
form.find("#note_line_code").val($(this).attr("line_code"));
form.show();
+ return false;
});
});