##// END OF EJS Templates
jro_apps » redmine
RSS
Fixes wiki diff rendering....
Jean-Philippe Lang -
r4833:ca807c8d9284
parent child
Show More
Side by Side Unified
Context file:
r4833:ca807c8d9284 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,17 +1,17
1 1 <div class="contextual">
2 2 <%= link_to(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
3 3 </div>
4 4
5 5 <h2><%= @page.pretty_title %></h2>
6 6
7 7 <p>
8 8 <%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %>
9 9 <em>(<%= @diff.content_from.author ? @diff.content_from.author.name : "anonyme" %>, <%= format_time(@diff.content_from.updated_on) %>)</em>
10 10 &#8594;
11 11 <%= l(:label_version) %> <%= link_to @diff.content_to.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_to.version %>/<%= @page.content.version %>
12 12 <em>(<%= @diff.content_to.author ? @diff.content_to.author.name : "anonyme" %>, <%= format_time(@diff.content_to.updated_on) %>)</em>
13 13 </p>
14 14
15 15 <div class="text-diff">
16 <%= @diff.to_html %>
16 <%= simple_format_without_paragraph @diff.to_html %>
17 17 </div>
Show file before | Show file after | Hide comments
@@ -1,72 +1,72
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2011 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 module Redmine
19 19 module Helpers
20 20 class Diff
21 21 include ERB::Util
22 22 include ActionView::Helpers::TagHelper
23 23 include ActionView::Helpers::TextHelper
24 24 attr_reader :diff, :words
25 25
26 26 def initialize(content_to, content_from)
27 27 @words = content_to.to_s.split(/(\s+)/)
28 28 @words = @words.select {|word| word != ' '}
29 29 words_from = content_from.to_s.split(/(\s+)/)
30 30 words_from = words_from.select {|word| word != ' '}
31 31 @diff = words_from.diff @words
32 32 end
33 33
34 34 def to_html
35 35 words = self.words.collect{|word| h(word)}
36 36 words_add = 0
37 37 words_del = 0
38 38 dels = 0
39 39 del_off = 0
40 40 diff.diffs.each do |diff|
41 41 add_at = nil
42 42 add_to = nil
43 43 del_at = nil
44 44 deleted = ""
45 45 diff.each do |change|
46 46 pos = change[1]
47 47 if change[0] == "+"
48 48 add_at = pos + dels unless add_at
49 49 add_to = pos + dels
50 50 words_add += 1
51 51 else
52 52 del_at = pos unless del_at
53 53 deleted << ' ' + h(change[2])
54 54 words_del += 1
55 55 end
56 56 end
57 57 if add_at
58 58 words[add_at] = '<span class="diff_in">' + words[add_at]
59 59 words[add_to] = words[add_to] + '</span>'
60 60 end
61 61 if del_at
62 62 words.insert del_at - del_off + dels + words_add, '<span class="diff_out">' + deleted + '</span>'
63 63 dels += 1
64 64 del_off += words_del
65 65 words_del = 0
66 66 end
67 67 end
68 simple_format(words.join(' '))
68 words.join(' ')
69 69 end
70 70 end
71 71 end
72 72 end
General Comments 0
You need to be logged in to leave comments. Login now