diff options
| -rw-r--r-- | app/helpers/application_helper.rb | 10 | ||||
| -rw-r--r-- | lib/redmine/wiki_formatting.rb | 3 | ||||
| -rw-r--r-- | test/unit/helpers/application_helper_test.rb | 12 |
3 files changed, 16 insertions, 9 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 8deed9000..a3509b99a 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -165,16 +165,16 @@ module ApplicationHelper # when using an image link, try to use an attachment, if possible attachments = options[:attachments] if attachments - text = text.gsub(/!([<>=]*)(\S+\.(gif|jpg|jpeg|png))!/) do |m| - align = $1 - filename = $2 + text = text.gsub(/!((\<|\=|\>)?(\([^\)]+\))?(\[[^\]]+\])?(\{[^\}]+\})?)(\S+\.(gif|jpg|jpeg|png))!/) do |m| + style = $1 + filename = $6 rf = Regexp.new(filename, Regexp::IGNORECASE) # search for the picture in attachments if found = attachments.detect { |att| att.filename =~ rf } image_url = url_for :controller => 'attachments', :action => 'download', :id => found.id - "!#{align}#{image_url}!" + "!#{style}#{image_url}!" else - "!#{align}#{filename}!" + "!#{style}#{filename}!" end end end diff --git a/lib/redmine/wiki_formatting.rb b/lib/redmine/wiki_formatting.rb index 4aebe9a96..f7fa803a6 100644 --- a/lib/redmine/wiki_formatting.rb +++ b/lib/redmine/wiki_formatting.rb @@ -25,7 +25,8 @@ module Redmine class TextileFormatter < RedCloth - RULES = [:inline_auto_link, :inline_auto_mailto, :textile, :inline_toc, :inline_macros] + # auto_link rule after textile rules so that it doesn't break !image_url! tags + RULES = [:textile, :inline_auto_link, :inline_auto_mailto, :inline_toc, :inline_macros] def initialize(*args) super diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb index 06446d15e..2af6c5599 100644 --- a/test/unit/helpers/application_helper_test.rb +++ b/test/unit/helpers/application_helper_test.rb @@ -44,12 +44,18 @@ class ApplicationHelperTest < HelperTestCase textilizable('test@foo.bar') end - def test_textile_tags + def test_inline_images to_test = { - # inline images '!http://foo.bar/image.jpg!' => '<img src="http://foo.bar/image.jpg" alt="" />', 'floating !>http://foo.bar/image.jpg!' => 'floating <div style="float:right"><img src="http://foo.bar/image.jpg" alt="" /></div>', - # textile links + 'with class !(some-class)http://foo.bar/image.jpg!' => 'with class <img src="http://foo.bar/image.jpg" class="some-class" alt="" />', + 'with style !{width:100px;height100px}http://foo.bar/image.jpg!' => 'with style <img src="http://foo.bar/image.jpg" style="width:100px;height100px;" alt="" />', + } + to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) } + end + + def test_textile_external_links + to_test = { 'This is a "link":http://foo.bar' => 'This is a <a href="http://foo.bar" class="external">link</a>', 'This is an intern "link":/foo/bar' => 'This is an intern <a href="/foo/bar">link</a>', '"link (Link title)":http://foo.bar' => '<a href="http://foo.bar" title="Link title" class="external">link</a>' |