提交 8d5b792e 编写于 作者: S Sebastian A. Espindola 提交者: José Valim

Fixed output_buffer encoding problem [#5179]

Signed-off-by: NSantiago Pastorino <santiago@wyeworks.com>
Signed-off-by: NJosé Valim <jose.valim@gmail.com>
上级 749948a2
......@@ -165,7 +165,7 @@ def content_for?(name)
def with_output_buffer(buf = nil) #:nodoc:
unless buf
buf = ActionView::OutputBuffer.new
buf.force_encoding(output_buffer.encoding) if output_buffer && buf.respond_to?(:force_encoding)
buf.force_encoding(output_buffer.encoding) if output_buffer.respond_to?(:encoding) && buf.respond_to?(:force_encoding)
end
self.output_buffer, old_buffer = buf, output_buffer
yield
......
......@@ -89,6 +89,15 @@ def test_link_to_function_with_href
link_to_function("Greeting", "alert('Hello world!')", :href => 'http://example.com/')
end
def test_link_to_function_with_inner_block
html = link_to_function("Greet me!") do |page|
content_tag :h1 do
'Hi'
end
end
end
def test_javascript_tag
self.output_buffer = 'foo'
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册