jro_apps/redmine Commit - r2719:dcba9f18e6f3

Allow line breaks in wiki table cells (#2346)....

Jean-Philippe Lang -

r2719:dcba9f18e6f3

parent child

Context file:

r2719:dcba9f18e6f3

Collapse all files

lib/redcloth3.rb +7 -2

                 end
                 LINK_RE = /
+                        (
                         ([\s\[{(]|[#{PUNCT}])?     # $pre
                         "                          # start
                         (#{C})                     # $atts
                         )
                         (\/)?                      # $slash
                         ([^\w\=\/;\(\)]*?)         # $post
+                        )
                         (?=<|\s|$)
                     /x
             #"
                 def inline_textile_link( text )
                     text.gsub!( LINK_RE ) do |m|
-                        pre,atts,text,title,url,proto,slash,post = $~[1..8]
+                      all,pre,atts,text,title,url,proto,slash,post = $~[1..9]
+                      if text.include?('<br />')
+                        all
+                      else
                         url, url_title = check_refs( url )
                         title ||= url_title
                         external = (url =~ /^https?:\/\//) ? ' class="external"' : ''
                         "#{ pre }<a#{ atts }#{ external }>#{ text }</a>#{ post }"
+                      end
                     end
                 end

lib/redmine/wiki_formatting/textile/formatter.rb +1 -1

                     # Patch for RedCloth.  Fixed in RedCloth r128 but _why hasn't released it yet.
                     # <a href="http://code.whytheluckystiff.net/redcloth/changeset/128">http://code.whytheluckystiff.net/redcloth/changeset/128</a>
                     def hard_break( text )
-                      text.gsub!( /(.)\n(?!\n|\Z|>| *(>? *[#*=]+(\s|$)|[{|]))/, "\\1<br />\n" ) if hard_breaks
+                      text.gsub!( /(.)\n(?!\n|\Z|>| *([#*=]+(\s|$)|[{|]))/, "\\1<br />" ) if hard_breaks
                     end
                     # Patch to add code highlighting support to RedCloth

test/unit/helpers/application_helper_test.rb +40 -1

@@ -109,7 +109,7 class ApplicationHelperTest < HelperTestCase
109	'"link (Link title with "double-quotes")":http://foo.bar' => '<a href="http://foo.bar" title="Link title with "double-quotes"" class="external">link</a>',	109	'"link (Link title with "double-quotes")":http://foo.bar' => '<a href="http://foo.bar" title="Link title with "double-quotes"" class="external">link</a>',
110	"This is not a \"Link\":\n\nAnother paragraph" => "This is not a \"Link\":</p>\n\n\n\t<p>Another paragraph",	110	"This is not a \"Link\":\n\nAnother paragraph" => "This is not a \"Link\":</p>\n\n\n\t<p>Another paragraph",
111	# no multiline link text	111	# no multiline link text
112	"This is a double quote \"on the first line\nand another on a second line\":test" => "This is a double quote \"on the first line<br />\nand another on a second line\":test",	112	"This is a double quote \"on the first line\nand another on a second line\":test" => "This is a double quote \"on the first line<br />and another on a second line\":test",
113	# mailto link	113	# mailto link
114	"\"system administrator\":mailto:sysadmin@example.com?subject=redmine%20permissions" => "<a href=\"mailto:sysadmin@example.com?subject=redmine%20permissions\">system administrator</a>",	114	"\"system administrator\":mailto:sysadmin@example.com?subject=redmine%20permissions" => "<a href=\"mailto:sysadmin@example.com?subject=redmine%20permissions\">system administrator</a>",
115	# two exclamation marks	115	# two exclamation marks
@@ -396,6 +396,45 EXPECTED
396	assert_equal expected.gsub(%r{\s+}, ''), textilizable(raw).gsub(%r{\s+}, '')	396	assert_equal expected.gsub(%r{\s+}, ''), textilizable(raw).gsub(%r{\s+}, '')
397	end	397	end
398		398
		399	def test_table_with_line_breaks
		400	raw = <<-RAW
		401	This is a table with line breaks:
		402
		403	\|cell11
		404	continued\|cell12\|\|
		405	\|-cell21-\|\|cell23
		406	cell23 line2
		407	cell23 line3\|
		408	\|cell31\|cell32
		409	cell32 line2\|cell33\|
		410
		411	RAW
		412
		413	expected = <<-EXPECTED
		414	<p>This is a table with line breaks:</p>
		415
		416	<table>
		417	<tr>
		418	<td>cell11<br />continued</td>
		419	<td>cell12</td>
		420	<td></td>
		421	</tr>
		422	<tr>
		423	<td><del>cell21</del></td>
		424	<td></td>
		425	<td>cell23<br/>cell23 line2<br/>cell23 <strong>line3</strong></td>
		426	</tr>
		427	<tr>
		428	<td>cell31</td>
		429	<td>cell32<br/>cell32 line2</td>
		430	<td>cell33</td>
		431	</tr>
		432	</table>
		433	EXPECTED
		434
		435	assert_equal expected.gsub(%r{\s+}, ''), textilizable(raw).gsub(%r{\s+}, '')
		436	end
		437
399	def test_default_formatter	438	def test_default_formatter
400	Setting.text_formatting = 'unknown'	439	Setting.text_formatting = 'unknown'
401	text = 'a link: http://www.example.net/'	440	text = 'a link: http://www.example.net/'

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages