jro_apps/redmine Commit - r4464:af7006dff6f8

Fixed: partial toc when text contains pre tags (#7172)....

Jean-Philippe Lang -

r4464:af7006dff6f8

parent child

Context file:

r4464:af7006dff6f8

Collapse all files

app/helpers/application_helper.rb +20 -8

                  only_path = options.delete(:only_path) == false ? false : true
                  text = Redmine::WikiFormatting.to_html(Setting.text_formatting, text, :object => obj, :attribute => attr) { |macro, args| exec_macro(macro, obj, args) }
-                 parse_non_pre_blocks(text) do |text|
+                 @parsed_headings = []
+                 text = parse_non_pre_blocks(text) do |text|
                    [:parse_inline_attachments, :parse_wiki_links, :parse_redmine_links, :parse_headings].each do |method_name|
                      send method_name, text, project, obj, attr, only_path, options
                    end
                  end
+                 if @parsed_headings.any?
+                   replace_toc(text, @parsed_headings)
+                 end
+                 text
                end
                def parse_non_pre_blocks(text)
                  end
                end
-               TOC_RE = /<p>\{\{([<>]?)toc\}\}<\/p>/i unless const_defined?(:TOC_RE)
                HEADING_RE = /<h(1|2|3|4)( [^>]+)?>(.+?)<\/h(1|2|3|4)>/i unless const_defined?(:HEADING_RE)
                # Headings and TOC
-               # Adds ids and links to headings and renders the TOC if needed unless options[:headings] is set to false
+               # Adds ids and links to headings unless options[:headings] is set to false
                def parse_headings(text, project, obj, attr, only_path, options)
-                 headings = []
+                 return if options[:headings] == false
                  text.gsub!(HEADING_RE) do
                    level, attrs, content = $1.to_i, $2, $3
                    item = strip_tags(content).strip
                    anchor = item.gsub(%r{[^\w\s\-]}, '').gsub(%r{\s+(\-+\s*)?}, '-')
-                   headings << [level, anchor, item]
+                   @parsed_headings << [level, anchor, item]
                    "<h#{level} #{attrs} id=\"#{anchor}\">#{content}<a href=\"##{anchor}\" class=\"wiki-anchor\">&para;</a></h#{level}>"
-                 end unless options[:headings] == false
+                 end
+               end
+               TOC_RE = /<p>\{\{([<>]?)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?
                      ''

test/unit/helpers/application_helper_test.rb +6 -2

              h2. Subtitle with [[Wiki|another Wiki]] link
              h2. Subtitle with %{color:red}red text%
+             <pre>
+             some code
+             </pre>
              h3. Subtitle with *some* _modifiers_
              h1. Another title
                             '</ul>'
                  @project = Project.find(1)
-                 assert textilizable(raw).gsub("\n", "").include?(expected)
+                 assert textilizable(raw).gsub("\n", "").include?(expected), textilizable(raw)
                end
                def test_table_of_content_should_contain_included_page_headings

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