Permalink
Browse files

Revert "notextile tag has been placed with ascii quotes"

This reverts commit 3e6052a.

Reason: Code changes are not allowed in docrails (even if they are related to guides generation)
  • Loading branch information...
1 parent 28ff4e5 commit 7cf4fd93d89b52e449cf1a6a504a834a6f7af20e @vijaydev vijaydev committed with fxn Jul 19, 2011
Showing with 4 additions and 6 deletions.
  1. +2 −3 railties/guides/rails_guides/generator.rb
  2. +2 −3 railties/guides/rails_guides/textile_extensions.rb
@@ -227,13 +227,13 @@ def with_workaround_for_notextile(body)
end
code_blocks.push(<<HTML)
-&lt;notextile&gt;
+<notextile>
<div class="code_container">
<pre class="brush: #{brush}; gutter: false; toolbar: false">
#{ERB::Util.h($2).strip}
</pre>
</div>
-&lt;/notextile&gt;
+</notextile>
HTML
"\ndirty_workaround_for_notextile_#{code_blocks.size - 1}\n"
end
@@ -280,4 +280,3 @@ def check_fragment_identifiers(html, anchors)
end
end
end
-
@@ -25,7 +25,7 @@ def tip(body)
def plusplus(body)
body.gsub!(/\+(.*?)\+/) do |m|
- "&lt;notextile&gt;<tt>#{$1}</tt>&lt;/notextile&gt;"
+ "<notextile><tt>#{$1}</tt></notextile>"
end
# The real plus sign
@@ -36,9 +36,8 @@ def code(body)
body.gsub!(%r{<(yaml|shell|ruby|erb|html|sql|plain)>(.*?)</\1>}m) do |m|
es = ERB::Util.h($2)
css_class = $1.in?(['erb', 'shell']) ? 'html' : $1
- %{&lt;notextile&gt;<div class="code_container"><code class="#{css_class}">#{es}</code></div>&lt;/notextile&gt;}
+ %{<notextile><div class="code_container"><code class="#{css_class}">#{es}</code></div></notextile>}
end
end
end
end
-

0 comments on commit 7cf4fd9

Please sign in to comment.