remove trailing white-spaces from lib/redmine/helpers/diff.rb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6470 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
aa35ef4be8
commit
af20566bf4
@ -5,12 +5,12 @@
|
|||||||
# modify it under the terms of the GNU General Public License
|
# modify it under the terms of the GNU General Public License
|
||||||
# as published by the Free Software Foundation; either version 2
|
# as published by the Free Software Foundation; either version 2
|
||||||
# of the License, or (at your option) any later version.
|
# of the License, or (at your option) any later version.
|
||||||
#
|
#
|
||||||
# This program is distributed in the hope that it will be useful,
|
# This program is distributed in the hope that it will be useful,
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
@ -22,15 +22,15 @@ module Redmine
|
|||||||
include ActionView::Helpers::TagHelper
|
include ActionView::Helpers::TagHelper
|
||||||
include ActionView::Helpers::TextHelper
|
include ActionView::Helpers::TextHelper
|
||||||
attr_reader :diff, :words
|
attr_reader :diff, :words
|
||||||
|
|
||||||
def initialize(content_to, content_from)
|
def initialize(content_to, content_from)
|
||||||
@words = content_to.to_s.split(/(\s+)/)
|
@words = content_to.to_s.split(/(\s+)/)
|
||||||
@words = @words.select {|word| word != ' '}
|
@words = @words.select {|word| word != ' '}
|
||||||
words_from = content_from.to_s.split(/(\s+)/)
|
words_from = content_from.to_s.split(/(\s+)/)
|
||||||
words_from = words_from.select {|word| word != ' '}
|
words_from = words_from.select {|word| word != ' '}
|
||||||
@diff = words_from.diff @words
|
@diff = words_from.diff @words
|
||||||
end
|
end
|
||||||
|
|
||||||
def to_html
|
def to_html
|
||||||
words = self.words.collect{|word| h(word)}
|
words = self.words.collect{|word| h(word)}
|
||||||
words_add = 0
|
words_add = 0
|
||||||
@ -41,7 +41,7 @@ module Redmine
|
|||||||
add_at = nil
|
add_at = nil
|
||||||
add_to = nil
|
add_to = nil
|
||||||
del_at = nil
|
del_at = nil
|
||||||
deleted = ""
|
deleted = ""
|
||||||
diff.each do |change|
|
diff.each do |change|
|
||||||
pos = change[1]
|
pos = change[1]
|
||||||
if change[0] == "+"
|
if change[0] == "+"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user