##// END OF EJS Templates
jro_apps » redmine
RSS
Safer assertion....
Safer assertion. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4598 e93f8b46-1217-0410-a6f0-8f06a7374b81
Jean-Philippe Lang - - Load All Authors

File last commit:

r3471:ad487bf7cc4b
r4478:92d34234b01f
Show More
_diff.rhtml
67 lines | 2.4 KiB | text/html+ruby | RhtmlLexer
/ app / views / common / _diff.rhtml
History | Source | Raw |Copy content |Copy permalink
Jean-Philippe Lang
Adds a setting to limit the number of diff lines that should be displayed (default to 1500)....
 r2110 <% diff = Redmine::UnifiedDiff.new(diff, :type => diff_type, :max_lines => Setting.diff_max_lines_displayed.to_i) -%>
<% diff.each do |table_file| -%>
Jean-Philippe Lang
Move diff viewer to a partial....
 r1501 <div class="autoscroll">
<% if diff_type == 'sbs' -%>
Jean-Philippe Lang
Replace the hardcoded "CodeRay" css class name for highlighted elements....
 r3471 <table class="filecontent">
Jean-Philippe Lang
Move diff viewer to a partial....
 r1501 <thead>
<tr><th colspan="4" class="filename"><%= table_file.file_name %></th></tr>
</thead>
<tbody>
<% prev_line_left, prev_line_right = nil, nil -%>
<% table_file.keys.sort.each do |key| -%>
<% if prev_line_left && prev_line_right && (table_file[key].nb_line_left != prev_line_left+1) && (table_file[key].nb_line_right != prev_line_right+1) -%>
Jean-Philippe Lang
Slight changes to diff view and style....
 r1509 <tr class="spacing">
<th class="line-num">...</th><td></td><th class="line-num">...</th><td></td>
Jean-Philippe Lang
Move diff viewer to a partial....
 r1501 <% end -%>
<tr>
<th class="line-num"><%= table_file[key].nb_line_left %></th>
<td class="line-code <%= table_file[key].type_diff_left %>">
<pre><%=to_utf8 table_file[key].line_left %></pre>
</td>
<th class="line-num"><%= table_file[key].nb_line_right %></th>
<td class="line-code <%= table_file[key].type_diff_right %>">
<pre><%=to_utf8 table_file[key].line_right %></pre>
</td>
</tr>
<% prev_line_left, prev_line_right = table_file[key].nb_line_left.to_i, table_file[key].nb_line_right.to_i -%>
<% end -%>
</tbody>
</table>
<% else -%>
Jean-Philippe Lang
Replace the hardcoded "CodeRay" css class name for highlighted elements....
 r3471 <table class="filecontent syntaxhl">
Jean-Philippe Lang
Move diff viewer to a partial....
 r1501 <thead>
<tr><th colspan="3" class="filename"><%= table_file.file_name %></th></tr>
</thead>
<tbody>
<% prev_line_left, prev_line_right = nil, nil -%>
<% table_file.keys.sort.each do |key, line| %>
<% if prev_line_left && prev_line_right && (table_file[key].nb_line_left != prev_line_left+1) && (table_file[key].nb_line_right != prev_line_right+1) -%>
Jean-Philippe Lang
Slight changes to diff view and style....
 r1509 <tr class="spacing">
<th class="line-num">...</th><th class="line-num">...</th><td></td>
</tr>
Jean-Philippe Lang
Move diff viewer to a partial....
 r1501 <% end -%>
<tr>
<th class="line-num"><%= table_file[key].nb_line_left %></th>
<th class="line-num"><%= table_file[key].nb_line_right %></th>
<% if table_file[key].line_left.empty? -%>
<td class="line-code <%= table_file[key].type_diff_right %>">
<pre><%=to_utf8 table_file[key].line_right %></pre>
</td>
<% else -%>
<td class="line-code <%= table_file[key].type_diff_left %>">
<pre><%=to_utf8 table_file[key].line_left %></pre>
</td>
<% end -%>
</tr>
<% prev_line_left = table_file[key].nb_line_left.to_i if table_file[key].nb_line_left.to_i > 0 -%>
<% prev_line_right = table_file[key].nb_line_right.to_i if table_file[key].nb_line_right.to_i > 0 -%>
<% end -%>
</tbody>
</table>
<% end -%>
</div>
<% end -%>
Jean-Philippe Lang
Adds a setting to limit the number of diff lines that should be displayed (default to 1500)....
 r2110
<%= l(:text_diff_truncated) if diff.truncated? %>