Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
9a020bd8
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9a020bd8
编写于
7月 24, 2012
作者:
L
Lucas Mazza
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Replace the flush parameter with a Hash.
上级
66b859bd
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
13 addition
and
13 deletion
+13
-13
actionpack/lib/action_view/helpers/capture_helper.rb
actionpack/lib/action_view/helpers/capture_helper.rb
+4
-4
actionpack/test/template/capture_helper_test.rb
actionpack/test/template/capture_helper_test.rb
+9
-9
未找到文件。
actionpack/lib/action_view/helpers/capture_helper.rb
浏览文件 @
9a020bd8
...
@@ -134,7 +134,7 @@ def capture(*args)
...
@@ -134,7 +134,7 @@ def capture(*args)
#
#
# <%# Add some other content, or use a different template: %>
# <%# Add some other content, or use a different template: %>
#
#
# <% content_for :navigation, true do %>
# <% content_for :navigation,
flush:
true do %>
# <li><%= link_to 'Login', :action => 'login' %></li>
# <li><%= link_to 'Login', :action => 'login' %></li>
# <% end %>
# <% end %>
#
#
...
@@ -148,14 +148,14 @@ def capture(*args)
...
@@ -148,14 +148,14 @@ def capture(*args)
#
#
# WARNING: content_for is ignored in caches. So you shouldn't use it
# WARNING: content_for is ignored in caches. So you shouldn't use it
# for elements that will be fragment cached.
# for elements that will be fragment cached.
def
content_for
(
name
,
content
=
nil
,
flush
=
false
,
&
block
)
def
content_for
(
name
,
content
=
nil
,
options
=
{}
,
&
block
)
if
content
||
block_given?
if
content
||
block_given?
if
block_given?
if
block_given?
flush
=
content
if
content
options
=
content
if
content
content
=
capture
(
&
block
)
content
=
capture
(
&
block
)
end
end
if
content
if
content
flush
?
@view_flow
.
set
(
name
,
content
)
:
@view_flow
.
append
(
name
,
content
)
options
[
:flush
]
?
@view_flow
.
set
(
name
,
content
)
:
@view_flow
.
append
(
name
,
content
)
end
end
nil
nil
else
else
...
...
actionpack/test/template/capture_helper_test.rb
浏览文件 @
9a020bd8
...
@@ -56,7 +56,7 @@ def test_content_for_with_multiple_calls
...
@@ -56,7 +56,7 @@ def test_content_for_with_multiple_calls
def
test_content_for_with_multiple_calls_and_flush
def
test_content_for_with_multiple_calls_and_flush
assert
!
content_for?
(
:title
)
assert
!
content_for?
(
:title
)
content_for
:title
,
'foo'
content_for
:title
,
'foo'
content_for
:title
,
'bar'
,
true
content_for
:title
,
'bar'
,
flush:
true
assert_equal
'bar'
,
content_for
(
:title
)
assert_equal
'bar'
,
content_for
(
:title
)
end
end
...
@@ -75,7 +75,7 @@ def test_content_for_with_block_and_multiple_calls_with_flush
...
@@ -75,7 +75,7 @@ def test_content_for_with_block_and_multiple_calls_with_flush
content_for
:title
do
content_for
:title
do
'foo'
'foo'
end
end
content_for
:title
,
true
do
content_for
:title
,
flush:
true
do
'bar'
'bar'
end
end
assert_equal
'bar'
,
content_for
(
:title
)
assert_equal
'bar'
,
content_for
(
:title
)
...
@@ -86,7 +86,7 @@ def test_content_for_with_block_and_multiple_calls_with_flush_nil_content
...
@@ -86,7 +86,7 @@ def test_content_for_with_block_and_multiple_calls_with_flush_nil_content
content_for
:title
do
content_for
:title
do
'foo'
'foo'
end
end
content_for
:title
,
nil
,
true
do
content_for
:title
,
nil
,
flush:
true
do
'bar'
'bar'
end
end
assert_equal
'bar'
,
content_for
(
:title
)
assert_equal
'bar'
,
content_for
(
:title
)
...
@@ -97,7 +97,7 @@ def test_content_for_with_block_and_multiple_calls_without_flush
...
@@ -97,7 +97,7 @@ def test_content_for_with_block_and_multiple_calls_without_flush
content_for
:title
do
content_for
:title
do
'foo'
'foo'
end
end
content_for
:title
,
false
do
content_for
:title
,
f
lush:
f
alse
do
'bar'
'bar'
end
end
assert_equal
'foobar'
,
content_for
(
:title
)
assert_equal
'foobar'
,
content_for
(
:title
)
...
@@ -117,11 +117,11 @@ def test_content_for_with_whitespace_block
...
@@ -117,11 +117,11 @@ def test_content_for_with_whitespace_block
def
test_content_for_with_whitespace_block_and_flush
def
test_content_for_with_whitespace_block_and_flush
assert
!
content_for?
(
:title
)
assert
!
content_for?
(
:title
)
content_for
:title
,
'foo'
content_for
:title
,
'foo'
content_for
:title
,
true
do
content_for
:title
,
flush:
true
do
output_buffer
<<
"
\n
"
output_buffer
<<
"
\n
"
nil
nil
end
end
content_for
:title
,
'bar'
,
true
content_for
:title
,
'bar'
,
flush:
true
assert_equal
'bar'
,
content_for
(
:title
)
assert_equal
'bar'
,
content_for
(
:title
)
end
end
...
@@ -131,9 +131,9 @@ def test_content_for_returns_nil_when_writing
...
@@ -131,9 +131,9 @@ def test_content_for_returns_nil_when_writing
assert_equal
nil
,
content_for
(
:title
)
{
output_buffer
<<
'bar'
;
nil
}
assert_equal
nil
,
content_for
(
:title
)
{
output_buffer
<<
'bar'
;
nil
}
assert_equal
nil
,
content_for
(
:title
)
{
output_buffer
<<
"
\n
"
;
nil
}
assert_equal
nil
,
content_for
(
:title
)
{
output_buffer
<<
"
\n
"
;
nil
}
assert_equal
'foobar'
,
content_for
(
:title
)
assert_equal
'foobar'
,
content_for
(
:title
)
assert_equal
nil
,
content_for
(
:title
,
'foo'
,
true
)
assert_equal
nil
,
content_for
(
:title
,
'foo'
,
flush:
true
)
assert_equal
nil
,
content_for
(
:title
,
true
)
{
output_buffer
<<
'bar'
;
nil
}
assert_equal
nil
,
content_for
(
:title
,
flush:
true
)
{
output_buffer
<<
'bar'
;
nil
}
assert_equal
nil
,
content_for
(
:title
,
true
)
{
output_buffer
<<
"
\n
"
;
nil
}
assert_equal
nil
,
content_for
(
:title
,
flush:
true
)
{
output_buffer
<<
"
\n
"
;
nil
}
assert_equal
'bar'
,
content_for
(
:title
)
assert_equal
'bar'
,
content_for
(
:title
)
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录