gitlab-org--gitlab-foss/app/views/projects/diffs/_parallel_view.html.haml

/ Side-by-side diff view

.text-file{ data: diff_view_data }
  %table.diff-wrap-lines.code.code-commit.js-syntax-highlight
    - diff_file.parallel_diff_lines.each do |line|
      - left = line[:left]
      - right = line[:right]
      - discussions_left, discussions_right = parallel_diff_discussions(left, right, diff_file)
      %tr.line_holder.parallel
        - if left
          - case left.type
          - when 'match'
            = diff_match_line left.old_pos, nil, text: left.text, view: :parallel
          - when 'old-nonewline', 'new-nonewline'
            %td.old_line.diff-line-num
            %td.line_content.match.left-side= left.text
          - else
            - left_line_code = diff_file.line_code(left)
            - left_position = diff_file.position(left)
            %td.old_line.diff-line-num.js-avatar-container{ class: left.type, data: { linenumber: left.old_pos } }
              = add_diff_note_button(left_line_code, left_position, 'old')
              %a{ href: "##{left_line_code}", data: { linenumber: left.old_pos } }
            %td.line_content.parallel.left-side{ id: left_line_code, class: left.type }= diff_line_content(left.rich_text)
        - else
          %td.old_line.diff-line-num.empty-cell
          %td.line_content.parallel.left-side

        - if right
          - case right.type
          - when 'match'
            = diff_match_line nil, right.new_pos, text: left.text, view: :parallel
          - when 'old-nonewline', 'new-nonewline'
            %td.new_line.diff-line-num
            %td.line_content.match.right-side= right.text
          - else
            - right_line_code = diff_file.line_code(right)
            - right_position = diff_file.position(right)
            %td.new_line.diff-line-num.js-avatar-container{ class: right.type, data: { linenumber: right.new_pos } }
              = add_diff_note_button(right_line_code, right_position, 'new')
              %a{ href: "##{right_line_code}", data: { linenumber: right.new_pos } }
            %td.line_content.parallel.right-side{ id: right_line_code, class: right.type }= diff_line_content(right.rich_text)
        - else
          %td.old_line.diff-line-num.empty-cell
          %td.line_content.parallel.right-side

      - if discussions_left || discussions_right
        = render "discussions/parallel_diff_discussion", discussions_left: discussions_left, discussions_right: discussions_right
    - if !diff_file.new_file? && !diff_file.deleted_file? && diff_file.diff_lines.any?
      - last_line = diff_file.diff_lines.last
      - if last_line.new_pos < total_lines
        %tr.line_holder.parallel
          = diff_match_line last_line.old_pos, last_line.new_pos, bottom: true, view: :parallel
Conventional naming for diff modes. 2013-11-27 03:00:14 -05:00			`/ Side-by-side diff view`
Render add-diff-note button with server. This commit moves the rendering of the button back to the server, and shows/hides it using opacity rather than display. It also removes the transform applied to the button on hover (scale). Previously, both of these factors automatically triggered a reflow, which creates a performance bottleneck on pages with larger DOM size. MR: !12103 2017-06-12 14:43:21 -04:00
Add .code to all tables holding diffs We need this to be able to distinguish between Markdown tables and diff tables. 2019-03-23 09:22:16 -04:00			`.text-file{ data: diff_view_data }`
Format vue files with prettier Add changelog file 2019-06-06 11:51:04 -04:00			`%table.diff-wrap-lines.code.code-commit.js-syntax-highlight`
Move parallel diff logic to separate class 2016-01-20 08:51:56 -05:00			`- diff_file.parallel_diff_lines.each do \|line\|`
Refactor parallel_diff generation a bit. 2016-01-14 08:52:08 -05:00			`- left = line[:left]`
			`- right = line[:right]`
Link to outdated diff in older MR version from outdated diff discussion 2017-03-31 19:39:14 -04:00			`- discussions_left, discussions_right = parallel_diff_discussions(left, right, diff_file)`
Moving up common html data attributes 2016-07-01 01:09:56 -04:00			`%tr.line_holder.parallel`
Add Discussion model to represent MR/diff discussion 2016-07-20 18:18:18 -04:00			`- if left`
prevent nonewline type diff lines from containing unfolding link 2017-01-18 17:40:34 -05:00			`- case left.type`
			`- when 'match'`
Add unfold links for Side-by-Side view 2016-07-21 14:44:12 -04:00			`= diff_match_line left.old_pos, nil, text: left.text, view: :parallel`
take nonewline context into account in diff parser 2017-03-13 16:09:43 -04:00			`- when 'old-nonewline', 'new-nonewline'`
prevent nonewline type diff lines from containing unfolding link 2017-01-18 17:40:34 -05:00			`%td.old_line.diff-line-num`
Only copy old/new code when selecting left/right side of parallel diff 2017-09-28 10:55:25 -04:00			`%td.line_content.match.left-side= left.text`
Add Discussion model to represent MR/diff discussion 2016-07-20 18:18:18 -04:00			`- else`
			`- left_line_code = diff_file.line_code(left)`
			`- left_position = diff_file.position(left)`
Only copy old/new code when selecting left/right side of parallel diff 2017-09-28 10:55:25 -04:00			`%td.old_line.diff-line-num.js-avatar-container{ class: left.type, data: { linenumber: left.old_pos } }`
Render add-diff-note button with server. This commit moves the rendering of the button back to the server, and shows/hides it using opacity rather than display. It also removes the transform applied to the button on hover (scale). Previously, both of these factors automatically triggered a reflow, which creates a performance bottleneck on pages with larger DOM size. MR: !12103 2017-06-12 14:43:21 -04:00			`= add_diff_note_button(left_line_code, left_position, 'old')`
Prevent copying of line numbers in parallel diff view 2017-01-22 19:07:41 -05:00			`%a{ href: "##{left_line_code}", data: { linenumber: left.old_pos } }`
Remove now-unnecessary noteable_line class 2019-03-23 09:34:08 -04:00			`%td.line_content.parallel.left-side{ id: left_line_code, class: left.type }= diff_line_content(left.rich_text)`
Refactor parallel_diff generation a bit. 2016-01-14 08:52:08 -05:00			`- else`
Add Discussion model to represent MR/diff discussion 2016-07-20 18:18:18 -04:00			`%td.old_line.diff-line-num.empty-cell`
Only copy old/new code when selecting left/right side of parallel diff 2017-09-28 10:55:25 -04:00			`%td.line_content.parallel.left-side`
Add comments on the side-by-side diff. 2014-09-12 12:43:44 -04:00
Add Discussion model to represent MR/diff discussion 2016-07-20 18:18:18 -04:00			`- if right`
prevent nonewline type diff lines from containing unfolding link 2017-01-18 17:40:34 -05:00			`- case right.type`
			`- when 'match'`
Add unfold links for Side-by-Side view 2016-07-21 14:44:12 -04:00			`= diff_match_line nil, right.new_pos, text: left.text, view: :parallel`
take nonewline context into account in diff parser 2017-03-13 16:09:43 -04:00			`- when 'old-nonewline', 'new-nonewline'`
prevent nonewline type diff lines from containing unfolding link 2017-01-18 17:40:34 -05:00			`%td.new_line.diff-line-num`
Only copy old/new code when selecting left/right side of parallel diff 2017-09-28 10:55:25 -04:00			`%td.line_content.match.right-side= right.text`
Add comments on the side-by-side diff. 2014-09-12 12:43:44 -04:00			`- else`
Add Discussion model to represent MR/diff discussion 2016-07-20 18:18:18 -04:00			`- right_line_code = diff_file.line_code(right)`
			`- right_position = diff_file.position(right)`
Only copy old/new code when selecting left/right side of parallel diff 2017-09-28 10:55:25 -04:00			`%td.new_line.diff-line-num.js-avatar-container{ class: right.type, data: { linenumber: right.new_pos } }`
Render add-diff-note button with server. This commit moves the rendering of the button back to the server, and shows/hides it using opacity rather than display. It also removes the transform applied to the button on hover (scale). Previously, both of these factors automatically triggered a reflow, which creates a performance bottleneck on pages with larger DOM size. MR: !12103 2017-06-12 14:43:21 -04:00			`= add_diff_note_button(right_line_code, right_position, 'new')`
Prevent copying of line numbers in parallel diff view 2017-01-22 19:07:41 -05:00			`%a{ href: "##{right_line_code}", data: { linenumber: right.new_pos } }`
Remove now-unnecessary noteable_line class 2019-03-23 09:34:08 -04:00			`%td.line_content.parallel.right-side{ id: right_line_code, class: right.type }= diff_line_content(right.rich_text)`
Add Discussion model to represent MR/diff discussion 2016-07-20 18:18:18 -04:00			`- else`
			`%td.old_line.diff-line-num.empty-cell`
Only copy old/new code when selecting left/right side of parallel diff 2017-09-28 10:55:25 -04:00			`%td.line_content.parallel.right-side`
Add comments on the side-by-side diff. 2014-09-12 12:43:44 -04:00
Correctly display multiple separate discussions on the same diff line 2017-03-30 22:34:14 -04:00			`- if discussions_left \|\| discussions_right`
			`= render "discussions/parallel_diff_discussion", discussions_left: discussions_left, discussions_right: discussions_right`
Add question mark to Gitlab::Diff::File predicate methods 2017-05-15 13:10:29 -04:00			`- if !diff_file.new_file? && !diff_file.deleted_file? && diff_file.diff_lines.any?`
ensure linenumber data attribute is correct for the last line in a diff chunk 2017-01-18 16:03:12 -05:00			`- last_line = diff_file.diff_lines.last`
only show diff unfolding link if there are more lines to show 2017-01-24 18:53:25 -05:00			`- if last_line.new_pos < total_lines`
			`%tr.line_holder.parallel`
			`= diff_match_line last_line.old_pos, last_line.new_pos, bottom: true, view: :parallel`