github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

forgot to merge that file

Browse Source
This commit is contained in:
Didier Lafforgue 2012-04-26 12:47:56 +02:00
parent e5cb5d1f9a
commit bf480a6df5
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/locomotive/haml.rb
View File

@ -1,18 +1,10 @@
require 'haml/helpers/action_view_mods' require 'haml/helpers/action_view_mods'
<<<<<<< HEAD
# Only preserve whitespace in the tag's content: https://github.com/nex3/haml/pull/503
module ActionView
module Helpers #:nodoc:
module TagHelper
=======
module ActionView module ActionView
module Helpers module Helpers
module TagHelper module TagHelper
# Only preserve whitespace in the tag's content: https://github.com/nex3/haml/pull/503 # Only preserve whitespace in the tag's content: https://github.com/nex3/haml/pull/503
>>>>>>> master
def content_tag_with_haml_and_preserve(name, content_or_options_with_block = nil, *args, &block) def content_tag_with_haml_and_preserve(name, content_or_options_with_block = nil, *args, &block)
return content_tag_without_haml(name, content_or_options_with_block, *args, &block) unless is_haml? return content_tag_without_haml(name, content_or_options_with_block, *args, &block) unless is_haml?
@ -25,15 +17,6 @@ module ActionView
content_tag_without_haml(name, content_or_options_with_block, *args, &block) content_tag_without_haml(name, content_or_options_with_block, *args, &block)
end end
else else
<<<<<<< HEAD
if preserve && content_or_options_with_block
content_or_options_with_block = Haml::Helpers.preserve(content_or_options_with_block)
end
content = content_tag_without_haml(name, content_or_options_with_block, *args, &block)
end
end
=======
if name == 'textarea' if name == 'textarea'
tab_down(haml_buffer.tabulation) tab_down(haml_buffer.tabulation)
elsif preserve && content_or_options_with_block elsif preserve && content_or_options_with_block
@ -45,7 +28,6 @@ module ActionView
alias_method :content_tag_without_haml_and_preserve, :content_tag alias_method :content_tag_without_haml_and_preserve, :content_tag
alias_method :content_tag, :content_tag_with_haml_and_preserve alias_method :content_tag, :content_tag_with_haml_and_preserve
>>>>>>> master
alias_method :content_tag_with_haml, :content_tag_with_haml_and_preserve alias_method :content_tag_with_haml, :content_tag_with_haml_and_preserve
end end
end end