-
-
Notifications
You must be signed in to change notification settings - Fork 571
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
11 changed files
with
235 additions
and
66 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 3.1.4 | ||
| 3.1.5.beta.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| # Rails 3.2.3's form helpers add a newline after opening textareas, which can | ||
| # cause problems with newlines being considered content rather than markup. | ||
| # These changes fix the issue by making the helpers emit "<haml:newline/>" | ||
| # rather than the leading newline. The tag is then replaced by a newline after | ||
| # rendering. | ||
| # | ||
| # This should be considered nothing more than an emergency hotfix to ensure | ||
| # compatibility with the latest version of Rails, made at a moment when the Haml | ||
| # project is transitioning to a new maintainer. | ||
|
|
||
| module AbstractController | ||
| module Rendering | ||
| def render_to_body_with_haml(options = {}) | ||
| if rendered = render_to_body_without_haml(options) | ||
| rendered.gsub('<haml:newline/>', "\n").html_safe | ||
| end | ||
| end | ||
| alias_method_chain :render_to_body, :haml | ||
| end | ||
| end | ||
|
|
||
| module ActionView | ||
|
|
||
| class Renderer | ||
| def render_template_with_haml(context, options) | ||
| if rendered = render_template_without_haml(context, options) | ||
| rendered.gsub('<haml:newline/>', "\n").html_safe | ||
| end | ||
| end | ||
| alias_method_chain :render_template, :haml | ||
| end | ||
|
|
||
| module Helpers | ||
| module TagHelper | ||
| private | ||
|
|
||
| def content_tag_string_with_haml(name, content, options, escape = true) | ||
| if name.to_sym == :textarea | ||
| tag_options = tag_options(options, escape) if options | ||
| content = ERB::Util.h(content) if escape | ||
| "<#{name}#{tag_options}><haml:newline/>#{content}</#{name}>".html_safe | ||
| else | ||
| content_tag_string_without_haml(name, content, options, escape) | ||
| end | ||
| end | ||
| alias_method_chain :content_tag_string, :haml | ||
| end | ||
| end | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1 @@ | ||
| --- | ||
| BUNDLE_DISABLE_SHARED_GEMS: "1" | ||
| --- {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| source :rubygems | ||
|
|
||
| gem 'json' | ||
| gem 'ruby_parser' | ||
| gem 'hpricot' | ||
| gem 'erubis' | ||
| gem 'sass' | ||
| gem 'rails', '>= 3.2.0', '< 3.3.0' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| GEM | ||
| remote: http://rubygems.org/ | ||
| specs: | ||
| actionmailer (3.2.3) | ||
| actionpack (= 3.2.3) | ||
| mail (~> 2.4.4) | ||
| actionpack (3.2.3) | ||
| activemodel (= 3.2.3) | ||
| activesupport (= 3.2.3) | ||
| builder (~> 3.0.0) | ||
| erubis (~> 2.7.0) | ||
| journey (~> 1.0.1) | ||
| rack (~> 1.4.0) | ||
| rack-cache (~> 1.2) | ||
| rack-test (~> 0.6.1) | ||
| sprockets (~> 2.1.2) | ||
| activemodel (3.2.3) | ||
| activesupport (= 3.2.3) | ||
| builder (~> 3.0.0) | ||
| activerecord (3.2.3) | ||
| activemodel (= 3.2.3) | ||
| activesupport (= 3.2.3) | ||
| arel (~> 3.0.2) | ||
| tzinfo (~> 0.3.29) | ||
| activeresource (3.2.3) | ||
| activemodel (= 3.2.3) | ||
| activesupport (= 3.2.3) | ||
| activesupport (3.2.3) | ||
| i18n (~> 0.6) | ||
| multi_json (~> 1.0) | ||
| arel (3.0.2) | ||
| builder (3.0.0) | ||
| erubis (2.7.0) | ||
| hike (1.2.1) | ||
| hpricot (0.8.6) | ||
| i18n (0.6.0) | ||
| journey (1.0.3) | ||
| json (1.6.6) | ||
| mail (2.4.4) | ||
| i18n (>= 0.4.0) | ||
| mime-types (~> 1.16) | ||
| treetop (~> 1.4.8) | ||
| mime-types (1.18) | ||
| multi_json (1.2.0) | ||
| polyglot (0.3.3) | ||
| rack (1.4.1) | ||
| rack-cache (1.2) | ||
| rack (>= 0.4) | ||
| rack-ssl (1.3.2) | ||
| rack | ||
| rack-test (0.6.1) | ||
| rack (>= 1.0) | ||
| rails (3.2.3) | ||
| actionmailer (= 3.2.3) | ||
| actionpack (= 3.2.3) | ||
| activerecord (= 3.2.3) | ||
| activeresource (= 3.2.3) | ||
| activesupport (= 3.2.3) | ||
| bundler (~> 1.0) | ||
| railties (= 3.2.3) | ||
| railties (3.2.3) | ||
| actionpack (= 3.2.3) | ||
| activesupport (= 3.2.3) | ||
| rack-ssl (~> 1.3.2) | ||
| rake (>= 0.8.7) | ||
| rdoc (~> 3.4) | ||
| thor (~> 0.14.6) | ||
| rake (0.9.2.2) | ||
| rdoc (3.12) | ||
| json (~> 1.4) | ||
| ruby_parser (2.3.1) | ||
| sexp_processor (~> 3.0) | ||
| sass (3.1.15) | ||
| sexp_processor (3.1.0) | ||
| sprockets (2.1.2) | ||
| hike (~> 1.2) | ||
| rack (~> 1.0) | ||
| tilt (~> 1.1, != 1.3.0) | ||
| thor (0.14.6) | ||
| tilt (1.3.3) | ||
| treetop (1.4.10) | ||
| polyglot | ||
| polyglot (>= 0.3.1) | ||
| tzinfo (0.3.33) | ||
|
|
||
| PLATFORMS | ||
| ruby | ||
|
|
||
| DEPENDENCIES | ||
| erubis | ||
| hpricot | ||
| json | ||
| rails (>= 3.2.0, < 3.3.0) | ||
| ruby_parser | ||
| sass |
Oops, something went wrong.