Skip to content
Snippets Groups Projects
Commit c89d9e74 authored by Mike Greiling's avatar Mike Greiling
Browse files

only show diff unfolding link if there are more lines to show

parent d6fea1e8
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -25,6 +25,6 @@
= link_to raw(line_new), "##{line_new}"
= line_content
 
- if @form.unfold? && @form.bottom? && @form.to < @blob.loc
- if @form.unfold? && @form.bottom? && @form.to < @blob.lines.size
%tr.line_holder{ id: @form.to, class: line_class }
= diff_match_line @form.to - @form.offset, @form.to, text: @match_line, view: diff_view, bottom: true
Loading
Loading
@@ -15,10 +15,11 @@
%a.click-to-expand
Click to expand it.
- elsif diff_file.diff_lines.length > 0
- total_lines = blob.lines.last.chomp == '' ? blob.lines.size - 1 : blob.lines.size
- if diff_view == :parallel
= render "projects/diffs/parallel_view", diff_file: diff_file, project: project, blob: blob
= render "projects/diffs/parallel_view", diff_file: diff_file, total_lines: total_lines
- else
= render "projects/diffs/text_file", diff_file: diff_file
= render "projects/diffs/text_file", diff_file: diff_file, total_lines: total_lines
- else
- if diff_file.mode_changed?
.nothing-here-block File mode changed
Loading
Loading
Loading
Loading
@@ -45,5 +45,6 @@
= render "discussions/parallel_diff_discussion", discussion_left: discussion_left, discussion_right: discussion_right
- if !diff_file.new_file && diff_file.diff_lines.any?
- last_line = diff_file.diff_lines.last
%tr.line_holder.parallel
= diff_match_line last_line.old_pos, last_line.new_pos, bottom: true, view: :parallel
- 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
Loading
Loading
@@ -12,5 +12,6 @@
 
- if !diff_file.new_file && diff_file.highlighted_diff_lines.any?
- last_line = diff_file.highlighted_diff_lines.last
%tr.line_holder
= diff_match_line last_line.old_pos, last_line.new_pos, bottom: true
- if last_line.new_pos < total_lines
%tr.line_holder
= diff_match_line last_line.old_pos, last_line.new_pos, bottom: true
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment