summaryrefslogtreecommitdiffstats
path: root/app/helpers
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2011-02-27 12:35:31 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2011-02-27 12:35:31 +0000
commitd06f4d013d32465d63c33f436337064d88ccbf6c (patch)
treec0e1b645f98a9607ecb1d3667795a6c3d304d107 /app/helpers
parent2d115bbe707182293cd2dee6878fc0c696900736 (diff)
downloadredmine-d06f4d013d32465d63c33f436337064d88ccbf6c.tar.gz
redmine-d06f4d013d32465d63c33f436337064d88ccbf6c.zip
Extracts a diff helper from the WikiDiff class.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4952 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/wiki_helper.rb41
1 files changed, 2 insertions, 39 deletions
diff --git a/app/helpers/wiki_helper.rb b/app/helpers/wiki_helper.rb
index 19e252bcb..32225d83e 100644
--- a/app/helpers/wiki_helper.rb
+++ b/app/helpers/wiki_helper.rb
@@ -1,5 +1,5 @@
-# redMine - project management software
-# Copyright (C) 2006-2007 Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2011 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -29,41 +29,4 @@ module WikiHelper
end
s
end
-
- def html_diff(wdiff)
- words = wdiff.words.collect{|word| h(word)}
- words_add = 0
- words_del = 0
- dels = 0
- del_off = 0
- wdiff.diff.diffs.each do |diff|
- add_at = nil
- add_to = nil
- del_at = nil
- deleted = ""
- diff.each do |change|
- pos = change[1]
- if change[0] == "+"
- add_at = pos + dels unless add_at
- add_to = pos + dels
- words_add += 1
- else
- del_at = pos unless del_at
- deleted << ' ' + h(change[2])
- words_del += 1
- end
- end
- if add_at
- words[add_at] = '<span class="diff_in">' + words[add_at]
- words[add_to] = words[add_to] + '</span>'
- end
- if del_at
- words.insert del_at - del_off + dels + words_add, '<span class="diff_out">' + deleted + '</span>'
- dels += 1
- del_off += words_del
- words_del = 0
- end
- end
- simple_format_without_paragraph(words.join(' '))
- end
end