summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-09-01 00:51:38 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-09-01 00:51:38 +0000
commita57feec16cc937f68116132115a78b96a0cec930 (patch)
treefae2dd5555f61b757191ccfc2c41c6e77deef05c
parent11fdb710d533381facb2657461d380023e9b73d7 (diff)
downloadredmine-a57feec16cc937f68116132115a78b96a0cec930.tar.gz
redmine-a57feec16cc937f68116132115a78b96a0cec930.zip
remove trailing white-spaces from lib/redmine/wiki_formatting.rb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6948 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--lib/redmine/wiki_formatting.rb34
1 files changed, 17 insertions, 17 deletions
diff --git a/lib/redmine/wiki_formatting.rb b/lib/redmine/wiki_formatting.rb
index dcce0fc44..0635aad8b 100644
--- a/lib/redmine/wiki_formatting.rb
+++ b/lib/redmine/wiki_formatting.rb
@@ -1,16 +1,16 @@
# Redmine - project management software
-# Copyright (C) 2006-2008 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.
@@ -23,26 +23,26 @@ module Redmine
def map
yield self
end
-
+
def register(name, formatter, helper)
raise ArgumentError, "format name '#{name}' is already taken" if @@formatters[name.to_s]
@@formatters[name.to_s] = {:formatter => formatter, :helper => helper}
end
-
+
def formatter_for(name)
entry = @@formatters[name.to_s]
(entry && entry[:formatter]) || Redmine::WikiFormatting::NullFormatter::Formatter
end
-
+
def helper_for(name)
entry = @@formatters[name.to_s]
(entry && entry[:helper]) || Redmine::WikiFormatting::NullFormatter::Helper
end
-
+
def format_names
@@formatters.keys.map
end
-
+
def to_html(format, text, options = {}, &block)
text = if Setting.cache_formatted_text? && text.size > 2.kilobyte && cache_store && cache_key = cache_key_for(format, options[:object], options[:attribute])
# Text retrieved from the cache store may be frozen
@@ -65,12 +65,12 @@ module Redmine
"formatted_text/#{format}/#{object.class.model_name.cache_key}/#{object.id}-#{attribute}-#{object.updated_on.to_s(:number)}"
end
end
-
+
# Returns the cache store used to cache HTML output
def cache_store
ActionController::Base.cache_store
end
-
+
MACROS_RE = /
(!)? # escaping
(
@@ -80,7 +80,7 @@ module Redmine
\}\} # closing tag
)
/x unless const_defined?(:MACROS_RE)
-
+
# Macros substitution
def execute_macros(text, macros_runner)
text.gsub!(MACROS_RE) do
@@ -98,30 +98,30 @@ module Redmine
end
end
end
-
+
# Default formatter module
module NullFormatter
class Formatter
include ActionView::Helpers::TagHelper
include ActionView::Helpers::TextHelper
include ActionView::Helpers::UrlHelper
-
+
def initialize(text)
@text = text
end
-
+
def to_html(*args)
simple_format(auto_link(CGI::escapeHTML(@text)))
end
end
-
+
module Helper
def wikitoolbar_for(field_id)
end
-
+
def heads_for_wiki_formatter
end
-
+
def initial_page_content(page)
page.pretty_title.to_s
end