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:
parent
3d1d57d04c
commit
125ffb33d3
|
@ -1,27 +1,27 @@
|
|||
# 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
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# as published by the Free Software Foundation; either version 2
|
||||
# of the License, or (at your option) any later version.
|
||||
#
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
module Redmine
|
||||
module SyntaxHighlighting
|
||||
|
||||
|
||||
class << self
|
||||
attr_reader :highlighter
|
||||
delegate :highlight_by_filename, :highlight_by_language, :to => :highlighter
|
||||
|
||||
|
||||
def highlighter=(name)
|
||||
if name.is_a?(Module)
|
||||
@highlighter = name
|
||||
|
@ -30,11 +30,11 @@ module Redmine
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
module CodeRay
|
||||
require 'coderay'
|
||||
require 'coderay/helpers/file_type'
|
||||
|
||||
|
||||
class << self
|
||||
# Highlights +text+ as the content of +filename+
|
||||
# Should not return line numbers nor outer pre tag
|
||||
|
@ -42,7 +42,7 @@ module Redmine
|
|||
language = ::CodeRay::FileType[filename]
|
||||
language ? ::CodeRay.scan(text, language).html : ERB::Util.h(text)
|
||||
end
|
||||
|
||||
|
||||
# Highlights +text+ using +language+ syntax
|
||||
# Should not return outer pre tag
|
||||
def highlight_by_language(text, language)
|
||||
|
@ -51,6 +51,6 @@ module Redmine
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
SyntaxHighlighting.highlighter = 'CodeRay'
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue