\{\{([<>]?)toc\}\}<\/p>/i unless const_defined?(:TOC_RE)
-
- # Renders the TOC with given headings
- def replace_toc(text, headings)
- text.gsub!(TOC_RE) do
- if headings.empty?
- ''
- else
- div_class = 'toc'
- div_class << ' right' if $1 == '>'
- div_class << ' left' if $1 == '<'
- out = "
'
- end
- end
- end
-
- #
- # displays the current url plus an optional anchor
- #
- def full_url(anchor_name = '')
- return "##{anchor_name}" if current_request.nil?
- url_for pagination_params_whitelist.merge(anchor: anchor_name, only_path: true)
- rescue ActionController::UrlGenerationError
- # In a context outside params, we don't know what the relative anchor url is
- "##{anchor_name}"
- end
-
- def current_request
- request rescue nil
+ pipeline.to_html(text)
end
end
end
diff --git a/lib/open_project/text_formatting/filters/markdown_filter.rb b/lib/open_project/text_formatting/filters/markdown_filter.rb
new file mode 100644
index 00000000000..e90082deedd
--- /dev/null
+++ b/lib/open_project/text_formatting/filters/markdown_filter.rb
@@ -0,0 +1,48 @@
+#-- encoding: UTF-8
+
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2017 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2017 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# 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.
+#
+# See doc/COPYRIGHT.rdoc for more details.
+#++
+
+module OpenProject::TextFormatting
+ module Filters
+ class MarkdownFilter < HTML::Pipeline::MarkdownFilter
+
+ # Convert Markdown to HTML using CommonMarker
+ def call
+ options = [:GITHUB_PRE_LANG]
+ options << :HARDBREAKS if context[:gfm] != false
+ extensions = context.fetch :commonmarker_extensions,
+ %i[table strikethrough tagfilter autolink]
+
+ html = CommonMarker.render_html(text, options, extensions)
+ html.rstrip!
+ html
+ end
+ end
+ end
+end
diff --git a/lib/open_project/text_formatting/filters/plain_filter.rb b/lib/open_project/text_formatting/filters/plain_filter.rb
new file mode 100644
index 00000000000..ce074f0191d
--- /dev/null
+++ b/lib/open_project/text_formatting/filters/plain_filter.rb
@@ -0,0 +1,44 @@
+#-- encoding: UTF-8
+
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2017 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2017 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# 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.
+#
+# See doc/COPYRIGHT.rdoc for more details.
+#++
+
+module OpenProject::TextFormatting
+ module Filters
+ class PlainFilter < HTML::Pipeline::TextFilter
+ include ERB::Util
+ include ActionView::Helpers::TagHelper
+ include ActionView::Helpers::TextHelper
+ include ActionView::Helpers::UrlHelper
+
+ def call
+ simple_format(auto_link(CGI::escapeHTML(text)))
+ end
+ end
+ end
+end
diff --git a/lib/open_project/text_formatting/filters/sanitization_filter.rb b/lib/open_project/text_formatting/filters/sanitization_filter.rb
new file mode 100644
index 00000000000..6d5a511bb6e
--- /dev/null
+++ b/lib/open_project/text_formatting/filters/sanitization_filter.rb
@@ -0,0 +1,40 @@
+#-- encoding: UTF-8
+
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2017 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2017 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# 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.
+#
+# See doc/COPYRIGHT.rdoc for more details.
+#++
+
+module OpenProject::TextFormatting
+ module Filters
+ class SanitizationFilter < HTML::Pipeline::SanitizationFilter
+ def call
+ binding.pry
+ super
+ end
+ end
+ end
+end
diff --git a/lib/redmine/wiki_formatting.rb b/lib/open_project/text_formatting/formatters.rb
similarity index 62%
rename from lib/redmine/wiki_formatting.rb
rename to lib/open_project/text_formatting/formatters.rb
index 2454c6a572a..84113d87e88 100644
--- a/lib/redmine/wiki_formatting.rb
+++ b/lib/open_project/text_formatting/formatters.rb
@@ -1,4 +1,5 @@
#-- encoding: UTF-8
+
#-- copyright
# OpenProject is a project management system.
# Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
@@ -27,8 +28,8 @@
# See docs/COPYRIGHT.rdoc for more details.
#++
-module Redmine
- module WikiFormatting
+module OpenProject::TextFormatting
+ module Formatters
class << self
def registered
@@ -51,8 +52,8 @@ module Redmine
raise ArgumentError, "format name '#{name}' is already taken" if registered?(key)
begin
- formatter = "Redmine::WikiFormatting::#{modulename}::Formatter".constantize
- helper = "Redmine::WikiFormatting::#{modulename}::Helper".constantize
+ formatter = "OpenProject::TextFormatting::Formatters::#{modulename}::Formatter".constantize
+ helper = "OpenProject::TextFormatting::Formatters::#{modulename}::Helper".constantize
registered[key] = { formatter: formatter, helper: helper }
rescue NameError => e
Rails.logger.error "Failed to register wiki formatting #{namespace}: #{e}"
@@ -74,32 +75,6 @@ module Redmine
registered.keys.map
end
- def to_html(format, text, options = {}, &block)
- edit = !!options[:edit]
- text = if Setting.cache_formatted_text? && text.size > 2.kilobyte && cache_store && cache_key = cache_key_for(format, options[:object], options[:attribute], edit)
- # Text retrieved from the cache store may be frozen
- # We need to dup it so we can do in-place substitutions with gsub!
- cache_store.fetch cache_key do
- formatter_for(format).new(text).to_html edit ? :edit : nil
- end.dup
- else
- formatter_for(format).new(text).to_html edit ? :edit : nil
- end
- text
- end
-
- # Returns a cache key for the given text +format+, +object+ and +attribute+ or nil if no caching should be done
- def cache_key_for(format, object, attribute, edit)
- if object && attribute && edit && !object.new_record? && object.respond_to?(:updated_on) && !format.blank?
- "formatted_text/#{format}/#{object.class.model_name.cache_key}/#{object.id}-#{attribute}-#{edit}-#{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
-
private
def register_default!
diff --git a/lib/open_project/text_formatting/formatters/markdown/formatter.rb b/lib/open_project/text_formatting/formatters/markdown/formatter.rb
new file mode 100644
index 00000000000..f276abb35b6
--- /dev/null
+++ b/lib/open_project/text_formatting/formatters/markdown/formatter.rb
@@ -0,0 +1,143 @@
+#-- encoding: UTF-8
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2017 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2017 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# 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.
+#
+# See doc/COPYRIGHT.rdoc for more details.
+#++
+
+require 'redcloth3'
+
+module OpenProject::TextFormatting::Formatters
+ module Markdown
+ class Formatter < RedCloth3
+ include ERB::Util
+ include ActionView::Helpers::TagHelper
+
+ # auto_link rule after textile rules so that it doesn't break !image_url! tags
+ RULES = [:textile, :block_markdown_rule, :inline_auto_link, :inline_auto_mailto]
+
+ def initialize(*args)
+ super
+
+ self.hard_breaks = true
+ self.no_span_caps = true
+ self.filter_styles = true
+ end
+
+ def to_html(*_rules)
+ @toc = []
+ super(*RULES).to_s
+ end
+
+ private
+
+ # Patch for RedCloth. Fixed in RedCloth r128 but _why hasn't released it yet.
+ # http://code.whytheluckystiff.net/redcloth/changeset/128
+ def hard_break(text)
+ text.gsub!(/(.)\n(?!\n|\Z| *([#*=]+(\s|$)|[{|]))/, '\\1 ') if hard_breaks
+ end
+
+ # Patch to add code highlighting support to RedCloth
+ def smooth_offtags(text)
+ unless @pre_list.empty?
+ ## replace
content
+ text.gsub!(//) do
+ content = @pre_list[$1.to_i]
+ if content.match(/\s?(.+)/m)
+ content = "" +
+ Redmine::SyntaxHighlighting.highlight_by_language($2, $1)
+ end
+ content
+ end
+ end
+ end
+
+
+ def auto_link_regexp
+ @auto_link_regexp ||= begin
+ %r{
+ ( # leading text
+ <\w+.*?>| # leading HTML tag, or
+ [^=<>!:'"/]| # leading punctuation, or
+ \{\{\w+\(| # inside a macro?
+ ^ # beginning of line
+ )
+ (
+ (?:https?://)| # protocol spec, or
+ (?:s?ftps?://)|
+ (?:www\.) # www.*
+ )
+ (
+ (\S+?) # url
+ (\/)? # slash
+ )
+ ((?:>)?|[^\w\=\/;\(\)]*?) # post
+ (?=<|\s|$)
+ }x
+ end
+ end
+
+ # Turns all urls into clickable links (code from Rails).
+ def inline_auto_link(text)
+ text.gsub!(auto_link_regexp) do
+ all = $&
+ leading = $1
+ proto = $2
+ url = $3
+ post = $6
+ if url.nil? || leading =~ /=]?/ || leading =~ /\{\{\w+\(/
+ # don't replace URLs that are already linked
+ # and URLs prefixed with ! !> !< != (textile images)
+ all
+ else
+ # Idea below : an URL with unbalanced parethesis and
+ # ending by ')' is put into external parenthesis
+ if url[-1] == ?) and ((url.count('(') - url.count(')')) < 0)
+ url = url[0..-2] # discard closing parenth from url
+ post = ')' + post # add closing parenth to post
+ end
+ tag = content_tag('a',
+ proto + url,
+ href: "#{proto == 'www.' ? 'http://www.' : proto}#{url}",
+ class: 'external icon-context icon-copy')
+ %(#{leading}#{tag}#{post})
+ end
+ end
+ end
+
+ # Turns all email addresses into clickable links (code from Rails).
+ def inline_auto_mailto(text)
+ text.gsub!(/((?]*>(.*)(#{Regexp.escape(mail)})(.*)<\/a>/)
+ mail
+ else
+ content_tag('a', mail, href: "mailto:#{mail}", class: 'email')
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/lib/open_project/text_formatting/formatters/markdown/helper.rb b/lib/open_project/text_formatting/formatters/markdown/helper.rb
new file mode 100644
index 00000000000..dd27267fe04
--- /dev/null
+++ b/lib/open_project/text_formatting/formatters/markdown/helper.rb
@@ -0,0 +1,48 @@
+#-- encoding: UTF-8
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2017 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2017 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# 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.
+#
+# See doc/COPYRIGHT.rdoc for more details.
+#++
+
+module OpenProject::TextFormatting::Formatters
+ module Markdown
+ module Helper
+ def wikitoolbar_for(field_id)
+
+ javascript_tag(<<-EOF)
+ // Toolbar for markdown. Here be dragons
+ EOF
+ end
+
+ def initial_page_content(_page)
+ "h1. #{@page.title}"
+ end
+
+ def heads_for_wiki_formatter
+ end
+ end
+ end
+end
diff --git a/lib/redmine/wiki_formatting/null_formatter/formatter.rb b/lib/open_project/text_formatting/formatters/null_formatter/formatter.rb
similarity index 75%
rename from lib/redmine/wiki_formatting/null_formatter/formatter.rb
rename to lib/open_project/text_formatting/formatters/null_formatter/formatter.rb
index de348e92d7d..2600e5e87b0 100644
--- a/lib/redmine/wiki_formatting/null_formatter/formatter.rb
+++ b/lib/open_project/text_formatting/formatters/null_formatter/formatter.rb
@@ -27,22 +27,20 @@
# See docs/COPYRIGHT.rdoc for more details.
#++
-module Redmine
- module WikiFormatting
- module NullFormatter
- class Formatter
- include ERB::Util
- include ActionView::Helpers::TagHelper
- include ActionView::Helpers::TextHelper
- include ActionView::Helpers::UrlHelper
+module OpenProject::TextFormatting::Formatters
+ module NullFormatter
+ class Formatter
+ include ERB::Util
+ include ActionView::Helpers::TagHelper
+ include ActionView::Helpers::TextHelper
+ include ActionView::Helpers::UrlHelper
- def initialize(text)
- @text = text
- end
+ def initialize(text)
+ @text = text
+ end
- def to_html(*_args)
- simple_format(auto_link(CGI::escapeHTML(@text)))
- end
+ def to_html(*_args)
+ simple_format(auto_link(CGI::escapeHTML(@text)))
end
end
end
diff --git a/lib/redmine/wiki_formatting/null_formatter/helper.rb b/lib/open_project/text_formatting/formatters/null_formatter/helper.rb
similarity index 82%
rename from lib/redmine/wiki_formatting/null_formatter/helper.rb
rename to lib/open_project/text_formatting/formatters/null_formatter/helper.rb
index 253bcbd7e0b..9c7f16adc07 100644
--- a/lib/redmine/wiki_formatting/null_formatter/helper.rb
+++ b/lib/open_project/text_formatting/formatters/null_formatter/helper.rb
@@ -27,19 +27,17 @@
# See docs/COPYRIGHT.rdoc for more details.
#++
-module Redmine
- module WikiFormatting
- module NullFormatter
- module Helper
- def wikitoolbar_for(_field_id)
- end
+module OpenProject::TextFormatting::Formatters
+ module NullFormatter
+ module Helper
+ def wikitoolbar_for(_field_id)
+ end
- def heads_for_wiki_formatter
- end
+ def heads_for_wiki_formatter
+ end
- def initial_page_content(page)
- page.title.to_s
- end
+ def initial_page_content(page)
+ page.title.to_s
end
end
end
diff --git a/lib/open_project/text_formatting/formatters/textile/formatter.rb b/lib/open_project/text_formatting/formatters/textile/formatter.rb
new file mode 100644
index 00000000000..e90e6ed3e74
--- /dev/null
+++ b/lib/open_project/text_formatting/formatters/textile/formatter.rb
@@ -0,0 +1,143 @@
+#-- encoding: UTF-8
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2017 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2017 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# 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.
+#
+# See doc/COPYRIGHT.rdoc for more details.
+#++
+
+require 'redcloth3'
+
+module OpenProject::TextFormatting::Formatters
+ module Textile
+ class Formatter < RedCloth3
+ include ERB::Util
+ include ActionView::Helpers::TagHelper
+
+ # auto_link rule after textile rules so that it doesn't break !image_url! tags
+ RULES = [:textile, :block_markdown_rule, :inline_auto_link, :inline_auto_mailto]
+
+ def initialize(*args)
+ super
+
+ self.hard_breaks = true
+ self.no_span_caps = true
+ self.filter_styles = true
+ end
+
+ def to_html(*_rules)
+ @toc = []
+ super(*RULES).to_s
+ end
+
+ private
+
+ # Patch for RedCloth. Fixed in RedCloth r128 but _why hasn't released it yet.
+ # http://code.whytheluckystiff.net/redcloth/changeset/128
+ def hard_break(text)
+ text.gsub!(/(.)\n(?!\n|\Z| *([#*=]+(\s|$)|[{|]))/, '\\1 ') if hard_breaks
+ end
+
+ # Patch to add code highlighting support to RedCloth
+ def smooth_offtags(text)
+ unless @pre_list.empty?
+ ## replace
\{\{([<>]?)toc\}\}<\/p>/i unless const_defined?(:TOC_RE)
+
+ # Renders the TOC with given headings
+ def replace_toc(text, headings)
+ text.gsub!(TOC_RE) do
+ if headings.empty?
+ ''
+ else
+ div_class = 'toc'
+ div_class << ' right' if $1 == '>'
+ div_class << ' left' if $1 == '<'
+ out = "
'
+ end
+ end
+ end
+
+ #
+ # displays the current url plus an optional anchor
+ #
+ def full_url(anchor_name = '')
+ return "##{anchor_name}" if current_request.nil?
+ current = request.original_fullpath
+ return current if anchor_name.blank?
+ "#{current}##{anchor_name}"
+ end
+
+ def current_request
+ request rescue nil
+ end
+ end
+ end
+ end
+end
diff --git a/lib/open_project/text_formatting/pipeline.rb b/lib/open_project/text_formatting/pipeline.rb
new file mode 100644
index 00000000000..4e4695fff4d
--- /dev/null
+++ b/lib/open_project/text_formatting/pipeline.rb
@@ -0,0 +1,72 @@
+#-- encoding: UTF-8
+
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2017 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2017 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# 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.
+#
+# See doc/COPYRIGHT.rdoc for more details.
+#++
+
+module OpenProject::TextFormatting
+ class Pipeline
+ attr_reader :formatter,
+ :context,
+ :pipeline
+
+ def initialize(formatter, context:)
+ @formatter = formatter
+ @context = context
+
+ @pipeline = HTML::Pipeline.new(located_filters, context)
+ end
+
+ def to_html(text, call_context = {})
+ pipeline.to_html text, call_context
+ end
+
+ def to_document(text, call_context = {})
+ pipeline.to_document text, call_context
+ end
+
+ def filters
+ [
+ formatter,
+ :sanitization
+ ]
+ end
+
+ protected
+
+ def located_filters
+ filters.map do |f|
+ if [Symbol, String].include? f.class
+ OpenProject::TextFormatting::Filters.const_get("#{f}_filter".classify)
+ else
+ f
+ end
+ end
+ end
+ end
+end
+
diff --git a/lib/redmine/wiki_formatting/textile/formatter.rb b/lib/redmine/wiki_formatting/textile/formatter.rb
deleted file mode 100644
index 54cb0ea0b67..00000000000
--- a/lib/redmine/wiki_formatting/textile/formatter.rb
+++ /dev/null
@@ -1,145 +0,0 @@
-#-- encoding: UTF-8
-#-- copyright
-# OpenProject is a project management system.
-# Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2017 Jean-Philippe Lang
-# Copyright (C) 2010-2013 the ChiliProject Team
-#
-# 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.
-#
-# See docs/COPYRIGHT.rdoc for more details.
-#++
-
-require 'redcloth3'
-
-module Redmine
- module WikiFormatting
- module Textile
- class Formatter < RedCloth3
- include ERB::Util
- include ActionView::Helpers::TagHelper
-
- # auto_link rule after textile rules so that it doesn't break !image_url! tags
- RULES = [:textile, :block_markdown_rule, :inline_auto_link, :inline_auto_mailto]
-
- def initialize(*args)
- super
-
- self.hard_breaks = true
- self.no_span_caps = true
- self.filter_styles = true
- end
-
- def to_html(*_rules)
- @toc = []
- super(*RULES).to_s
- end
-
- private
-
- # Patch for RedCloth. Fixed in RedCloth r128 but _why hasn't released it yet.
- # http://code.whytheluckystiff.net/redcloth/changeset/128
- def hard_break(text)
- text.gsub!(/(.)\n(?!\n|\Z| *([#*=]+(\s|$)|[{|]))/, '\\1 ') if hard_breaks
- end
-
- # Patch to add code highlighting support to RedCloth
- def smooth_offtags(text)
- unless @pre_list.empty?
- ## replace
content
- text.gsub!(//) do
- content = @pre_list[$1.to_i]
- if content.match(/\s?(.+)/m)
- content = "" +
- Redmine::SyntaxHighlighting.highlight_by_language($2, $1)
- end
- content
- end
- end
- end
-
-
- def auto_link_regexp
- @auto_link_regexp ||= begin
- %r{
- ( # leading text
- <\w+.*?>| # leading HTML tag, or
- [^=<>!:'"/]| # leading punctuation, or
- \{\{\w+\(| # inside a macro?
- ^ # beginning of line
- )
- (
- (?:https?://)| # protocol spec, or
- (?:s?ftps?://)|
- (?:www\.) # www.*
- )
- (
- (\S+?) # url
- (\/)? # slash
- )
- ((?:>)?|[^\w\=\/;\(\)]*?) # post
- (?=<|\s|$)
- }x
- end
- end
-
- # Turns all urls into clickable links (code from Rails).
- def inline_auto_link(text)
- text.gsub!(auto_link_regexp) do
- all = $&
- leading = $1
- proto = $2
- url = $3
- post = $6
- if url.nil? || leading =~ /=]?/ || leading =~ /\{\{\w+\(/
- # don't replace URLs that are already linked
- # and URLs prefixed with ! !> !< != (textile images)
- all
- else
- # Idea below : an URL with unbalanced parethesis and
- # ending by ')' is put into external parenthesis
- if url[-1] == ?) and ((url.count('(') - url.count(')')) < 0)
- url = url[0..-2] # discard closing parenth from url
- post = ')' + post # add closing parenth to post
- end
- tag = content_tag('a',
- proto + url,
- href: "#{proto == 'www.' ? 'http://www.' : proto}#{url}",
- class: 'external icon-context icon-copy')
- %(#{leading}#{tag}#{post})
- end
- end
- end
-
- # Turns all email addresses into clickable links (code from Rails).
- def inline_auto_mailto(text)
- text.gsub!(/((?]*>(.*)(#{Regexp.escape(mail)})(.*)<\/a>/)
- mail
- else
- content_tag('a', mail, href: "mailto:#{mail}", class: 'email')
- end
- end
- end
- end
- end
- end
-end
diff --git a/lib/redmine/wiki_formatting/textile/helper.rb b/lib/redmine/wiki_formatting/textile/helper.rb
deleted file mode 100644
index 00c0f1cdb91..00000000000
--- a/lib/redmine/wiki_formatting/textile/helper.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-#-- encoding: UTF-8
-#-- copyright
-# OpenProject is a project management system.
-# Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2017 Jean-Philippe Lang
-# Copyright (C) 2010-2013 the ChiliProject Team
-#
-# 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.
-#
-# See docs/COPYRIGHT.rdoc for more details.
-#++
-
-module Redmine
- module WikiFormatting
- module Textile
- module Helper
- def wikitoolbar_for(field_id)
- heads_for_wiki_formatter
- url = url_for(controller: '/help', action: 'wiki_syntax')
- open_help = "window.open(\"#{ url }\", \"\", \"resizable=yes, location=no, width=600, " +
- "height=640, menubar=no, status=no, scrollbars=yes\"); return false;"
- help_button = content_tag :button,
- '',
- type: 'button',
- class: 'jstb_help',
- onclick: open_help,
- :'aria-label' => ::I18n.t('js.inplace.link_formatting_help'),
- title: ::I18n.t('js.inplace.link_formatting_help')
-
- javascript_tag(<<-EOF)
- // initialSetup the toolbar later, so that i18n-js has a chance to set the translations
- // for the wiki-buttons first.
- jQuery(document).ready(function(){
- var wikiToolbar = new jsToolBar(document.getElementById('#{field_id}'));
-
- wikiToolbar.setHelpLink(jQuery('#{escape_javascript help_button}')[0]);
- wikiToolbar.draw();
- });
- EOF
- end
-
- def initial_page_content(_page)
- "h1. #{@page.title}"
- end
-
- def heads_for_wiki_formatter
- end
- end
- end
- end
-end