Commit 2edd42ca authored by Phil Hughes's avatar Phil Hughes

Check was in wrong part, the avatar container class should always be added on...

Check was in wrong part, the avatar container class should always be added on lines in the changes tab
parent 789bae24
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
- line_code = diff_file.line_code(line) - line_code = diff_file.line_code(line)
- if discussions && !line.meta? - if discussions && !line.meta?
- discussion = discussions[line_code] - discussion = discussions[line_code]
- show_discussion_avatars = discussion && discussion.resolvable? && !plain
%tr.line_holder{ class: type, id: (line_code unless plain) } %tr.line_holder{ class: type, id: (line_code unless plain) }
- case type - case type
- when 'match' - when 'match'
...@@ -15,13 +14,13 @@ ...@@ -15,13 +14,13 @@
%td.new_line.diff-line-num %td.new_line.diff-line-num
%td.line_content.match= line.text %td.line_content.match= line.text
- else - else
%td.old_line.diff-line-num{ class: [type, ("js-avatar-container" if show_discussion_avatars)], data: { linenumber: line.old_pos } } %td.old_line.diff-line-num{ class: [type, ("js-avatar-container" if !plain)], data: { linenumber: line.old_pos } }
- link_text = type == "new" ? " " : line.old_pos - link_text = type == "new" ? " " : line.old_pos
- if plain - if plain
= link_text = link_text
- else - else
%a{ href: "##{line_code}", data: { linenumber: link_text } } %a{ href: "##{line_code}", data: { linenumber: link_text } }
- if show_discussion_avatars - if discussion && discussion.resolvable? && !plain
%diff-note-avatars{ "discussion-id" => discussion.id } %diff-note-avatars{ "discussion-id" => discussion.id }
%td.new_line.diff-line-num{ class: type, data: { linenumber: line.new_pos } } %td.new_line.diff-line-num{ class: type, data: { linenumber: line.new_pos } }
- link_text = type == "old" ? " " : line.new_pos - link_text = type == "old" ? " " : line.new_pos
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment