36 lines
2 KiB
Text
36 lines
2 KiB
Text
/ Side-by-side diff view
|
|
%div.text-file.diff-wrap-lines.code.file-content.js-syntax-highlight{ data: diff_view_data }
|
|
%table
|
|
- diff_file.parallel_diff_lines.each do |line|
|
|
- left = line[:left]
|
|
- right = line[:right]
|
|
%tr.line_holder.parallel
|
|
- if left[:type] == 'match'
|
|
= render "projects/diffs/match_line_parallel", { line: left[:text] }
|
|
- elsif left[:type] == 'nonewline'
|
|
%td.old_line.diff-line-num.empty-cell
|
|
%td.line_content.parallel.match= left[:text]
|
|
%td.new_line.diff-line-num.empty-cell
|
|
%td.line_content.parallel.match= left[:text]
|
|
- else
|
|
%td.old_line.diff-line-num{id: left[:line_code], class: [left[:type], ('empty-cell' unless left[:number])], data: { linenumber: left[:number] }}
|
|
%a{href: "##{left[:line_code]}" }= raw(left[:number])
|
|
%td.line_content.parallel.noteable_line{class: [left[:type], ('empty-cell' if left[:text].empty?)], data: diff_view_line_data(left[:line_code], left[:position], 'old')}= diff_line_content(left[:text])
|
|
|
|
- if right[:type] == 'new'
|
|
- new_line_type = 'new'
|
|
- new_line_code = right[:line_code]
|
|
- new_position = right[:position]
|
|
- else
|
|
- new_line_type = nil
|
|
- new_line_code = left[:line_code]
|
|
- new_position = left[:position]
|
|
|
|
%td.new_line.diff-line-num{id: new_line_code, class: [new_line_type, ('empty-cell' unless right[:number])], data: { linenumber: right[:number] }}
|
|
%a{href: "##{new_line_code}" }= raw(right[:number])
|
|
%td.line_content.parallel.noteable_line{class: [new_line_type, ('empty-cell' if right[:text].empty?)], data: diff_view_line_data(new_line_code, new_position, 'new')}= diff_line_content(right[:text])
|
|
|
|
- unless @diff_notes_disabled
|
|
- notes_left, notes_right = organize_comments(left, right)
|
|
- if notes_left.present? || notes_right.present?
|
|
= render "projects/notes/diff_notes_with_reply_parallel", notes_left: notes_left, notes_right: notes_right
|