annotate lib/redmine/helpers/diff.rb @ 1524:82fac3dcf466 redmine-2.5-integration

Fix failure to interpret Javascript when autocompleting members for project
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Thu, 11 Sep 2014 10:24:38 +0100
parents e248c7af89ec
children
rev   line source
Chris@245 1 # Redmine - project management software
Chris@1494 2 # Copyright (C) 2006-2014 Jean-Philippe Lang
Chris@245 3 #
Chris@245 4 # This program is free software; you can redistribute it and/or
Chris@245 5 # modify it under the terms of the GNU General Public License
Chris@245 6 # as published by the Free Software Foundation; either version 2
Chris@245 7 # of the License, or (at your option) any later version.
Chris@909 8 #
Chris@245 9 # This program is distributed in the hope that it will be useful,
Chris@245 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
Chris@245 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
Chris@245 12 # GNU General Public License for more details.
Chris@909 13 #
Chris@245 14 # You should have received a copy of the GNU General Public License
Chris@245 15 # along with this program; if not, write to the Free Software
Chris@245 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Chris@245 17
Chris@1464 18 require 'diff'
Chris@1464 19
Chris@245 20 module Redmine
Chris@245 21 module Helpers
Chris@245 22 class Diff
Chris@245 23 include ERB::Util
Chris@245 24 include ActionView::Helpers::TagHelper
Chris@245 25 include ActionView::Helpers::TextHelper
Chris@245 26 attr_reader :diff, :words
Chris@909 27
Chris@245 28 def initialize(content_to, content_from)
Chris@245 29 @words = content_to.to_s.split(/(\s+)/)
Chris@245 30 @words = @words.select {|word| word != ' '}
Chris@245 31 words_from = content_from.to_s.split(/(\s+)/)
Chris@909 32 words_from = words_from.select {|word| word != ' '}
Chris@245 33 @diff = words_from.diff @words
Chris@245 34 end
Chris@909 35
Chris@245 36 def to_html
Chris@245 37 words = self.words.collect{|word| h(word)}
Chris@245 38 words_add = 0
Chris@245 39 words_del = 0
Chris@245 40 dels = 0
Chris@245 41 del_off = 0
Chris@245 42 diff.diffs.each do |diff|
Chris@245 43 add_at = nil
Chris@245 44 add_to = nil
Chris@245 45 del_at = nil
Chris@909 46 deleted = ""
Chris@245 47 diff.each do |change|
Chris@245 48 pos = change[1]
Chris@245 49 if change[0] == "+"
Chris@245 50 add_at = pos + dels unless add_at
Chris@245 51 add_to = pos + dels
Chris@245 52 words_add += 1
Chris@245 53 else
Chris@245 54 del_at = pos unless del_at
Chris@1115 55 deleted << ' ' unless deleted.empty?
Chris@1115 56 deleted << h(change[2])
Chris@245 57 words_del += 1
Chris@245 58 end
Chris@245 59 end
Chris@245 60 if add_at
Chris@1115 61 words[add_at] = '<span class="diff_in">'.html_safe + words[add_at]
Chris@1115 62 words[add_to] = words[add_to] + '</span>'.html_safe
Chris@245 63 end
Chris@245 64 if del_at
Chris@1115 65 words.insert del_at - del_off + dels + words_add, '<span class="diff_out">'.html_safe + deleted + '</span>'.html_safe
Chris@245 66 dels += 1
Chris@245 67 del_off += words_del
Chris@245 68 words_del = 0
Chris@245 69 end
Chris@245 70 end
Chris@909 71 words.join(' ').html_safe
Chris@245 72 end
Chris@245 73 end
Chris@245 74 end
Chris@245 75 end