kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove trailing white-spaces from lib/redmine/syntax_highlighting.rb 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7409 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-09-20 02:44:16 +00:00
parent 3d1d57d04c
commit 125ffb33d3
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/redmine/syntax_highlighting.rb
View File

@ -1,27 +1,27 @@
# Redmine - project management software # Redmine - project management software
# Copyright (C) 2006-2010 Jean-Philippe Lang # Copyright (C) 2006-2011 Jean-Philippe Lang
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# 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.
module Redmine module Redmine
module SyntaxHighlighting module SyntaxHighlighting
class << self class << self
attr_reader :highlighter attr_reader :highlighter
delegate :highlight_by_filename, :highlight_by_language, :to => :highlighter delegate :highlight_by_filename, :highlight_by_language, :to => :highlighter
def highlighter=(name) def highlighter=(name)
if name.is_a?(Module) if name.is_a?(Module)
@highlighter = name @highlighter = name
@ -30,11 +30,11 @@ module Redmine
end end
end end
end end
module CodeRay module CodeRay
require 'coderay' require 'coderay'
require 'coderay/helpers/file_type' require 'coderay/helpers/file_type'
class << self class << self
# Highlights +text+ as the content of +filename+ # Highlights +text+ as the content of +filename+
# Should not return line numbers nor outer pre tag # Should not return line numbers nor outer pre tag
@ -42,7 +42,7 @@ module Redmine
language = ::CodeRay::FileType[filename] language = ::CodeRay::FileType[filename]
language ? ::CodeRay.scan(text, language).html : ERB::Util.h(text) language ? ::CodeRay.scan(text, language).html : ERB::Util.h(text)
end end
# Highlights +text+ using +language+ syntax # Highlights +text+ using +language+ syntax
# Should not return outer pre tag # Should not return outer pre tag
def highlight_by_language(text, language) def highlight_by_language(text, language)
@ -51,6 +51,6 @@ module Redmine
end end
end end
end end
SyntaxHighlighting.highlighter = 'CodeRay' SyntaxHighlighting.highlighter = 'CodeRay'
end end