diff options
author | Vijay Dev <vijaydev.cse@gmail.com> | 2011-07-19 12:18:23 +0530 |
---|---|---|
committer | Vijay Dev <vijaydev.cse@gmail.com> | 2011-07-19 12:18:23 +0530 |
commit | db655ec7a6219d7337e46a6121421b4782d3ea28 (patch) | |
tree | c220cd01761fa28f45cacfab7cb271cb3bd5294d /railties | |
parent | 3e6052a430912b096056ae3d9a685b04767a4d19 (diff) | |
download | rails-db655ec7a6219d7337e46a6121421b4782d3ea28.tar.gz rails-db655ec7a6219d7337e46a6121421b4782d3ea28.tar.bz2 rails-db655ec7a6219d7337e46a6121421b4782d3ea28.zip |
Revert "notextile tag has been placed with ascii quotes"
This reverts commit 3e6052a430912b096056ae3d9a685b04767a4d19.
Reason: Code changes are not allowed in docrails (even if they are related to guides generation)
Diffstat (limited to 'railties')
-rw-r--r-- | railties/guides/rails_guides/generator.rb | 5 | ||||
-rw-r--r-- | railties/guides/rails_guides/textile_extensions.rb | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/railties/guides/rails_guides/generator.rb b/railties/guides/rails_guides/generator.rb index 2219fcea66..14d671c8f3 100644 --- a/railties/guides/rails_guides/generator.rb +++ b/railties/guides/rails_guides/generator.rb @@ -227,13 +227,13 @@ module RailsGuides end code_blocks.push(<<HTML) -<notextile> +<notextile> <div class="code_container"> <pre class="brush: #{brush}; gutter: false; toolbar: false"> #{ERB::Util.h($2).strip} </pre> </div> -</notextile> +</notextile> HTML "\ndirty_workaround_for_notextile_#{code_blocks.size - 1}\n" end @@ -280,4 +280,3 @@ HTML end end end - diff --git a/railties/guides/rails_guides/textile_extensions.rb b/railties/guides/rails_guides/textile_extensions.rb index dd51e0d66b..352c5e91dd 100644 --- a/railties/guides/rails_guides/textile_extensions.rb +++ b/railties/guides/rails_guides/textile_extensions.rb @@ -25,7 +25,7 @@ module RailsGuides def plusplus(body) body.gsub!(/\+(.*?)\+/) do |m| - "<notextile><tt>#{$1}</tt></notextile>" + "<notextile><tt>#{$1}</tt></notextile>" end # The real plus sign @@ -36,9 +36,8 @@ module RailsGuides 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 - %{<notextile><div class="code_container"><code class="#{css_class}">#{es}</code></div></notextile>} + %{<notextile><div class="code_container"><code class="#{css_class}">#{es}</code></div></notextile>} end end end end - |