mirror of
https://github.com/haml/haml.git
synced 2022-11-09 12:33:31 -05:00
Remove alias_method_chain, and thus Rails 1.2 dependency, from trunk.
git-svn-id: svn://hamptoncatlin.com/haml/trunk@486 7063305b-7217-0410-af8c-cdc13e5119b9
This commit is contained in:
parent
16f2729279
commit
439b8c5634
2 changed files with 12 additions and 4 deletions
4
TODO
4
TODO
|
@ -1,3 +1,7 @@
|
|||
Bugs:
|
||||
Get rid of alias_method_chain dependency
|
||||
Move new is_haml? to stable
|
||||
|
||||
Testing:
|
||||
Test html2haml
|
||||
|
||||
|
|
|
@ -18,7 +18,8 @@ if action_view_included
|
|||
@haml_is_haml = was_haml
|
||||
res
|
||||
end
|
||||
alias_method_chain :render, :haml
|
||||
alias_method :render_without_haml, :render
|
||||
alias_method :render, :render_with_haml
|
||||
end
|
||||
|
||||
# This overrides various helpers in ActionView
|
||||
|
@ -33,7 +34,8 @@ if action_view_included
|
|||
concat_without_haml(string, binding)
|
||||
end
|
||||
end
|
||||
alias_method_chain :concat, :haml
|
||||
alias_method :concat_without_haml, :concat
|
||||
alias_method :concat, :concat_with_haml
|
||||
end
|
||||
|
||||
module FormTagHelper
|
||||
|
@ -55,7 +57,8 @@ if action_view_included
|
|||
form_tag_without_haml(url_for_options, options, *parameters_for_url, &proc)
|
||||
end
|
||||
end
|
||||
alias_method_chain :form_tag, :haml
|
||||
alias_method :form_tag_without_haml, :form_tag
|
||||
alias_method :form_tag, :form_tag_with_haml
|
||||
end
|
||||
|
||||
module FormHelper
|
||||
|
@ -71,7 +74,8 @@ if action_view_included
|
|||
form_for_without_haml(object_name, *args, &proc)
|
||||
concat "\n" if block_given? && is_haml?
|
||||
end
|
||||
alias_method_chain :form_for, :haml
|
||||
alias_method :form_for_without_haml, :form_for
|
||||
alias_method :form_for, :form_for_with_haml
|
||||
end
|
||||
# :startdoc:
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue