Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
fe9d2ad6
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,发现更多精彩内容 >>
提交
fe9d2ad6
编写于
6月 06, 2008
作者:
J
Jeremy Kemper
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove some internal dead code that supported content_for
上级
26ec1be2
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
6 addition
and
38 deletion
+6
-38
actionpack/lib/action_view/helpers/capture_helper.rb
actionpack/lib/action_view/helpers/capture_helper.rb
+5
-15
actionpack/test/controller/capture_test.rb
actionpack/test/controller/capture_test.rb
+1
-19
actionpack/test/fixtures/test/block_content_for.erb
actionpack/test/fixtures/test/block_content_for.erb
+0
-2
actionpack/test/fixtures/test/erb_content_for.erb
actionpack/test/fixtures/test/erb_content_for.erb
+0
-2
未找到文件。
actionpack/lib/action_view/helpers/capture_helper.rb
浏览文件 @
fe9d2ad6
...
@@ -32,7 +32,7 @@ module CaptureHelper
...
@@ -32,7 +32,7 @@ module CaptureHelper
#
#
def
capture
(
*
args
,
&
block
)
def
capture
(
*
args
,
&
block
)
if
@output_buffer
if
@output_buffer
with_
temporary_output_buffer
{
yield
*
args
}
with_
output_buffer
{
block
.
call
(
*
args
)
}
else
else
block
.
call
(
*
args
)
block
.
call
(
*
args
)
end
end
...
@@ -115,27 +115,17 @@ def capture(*args, &block)
...
@@ -115,27 +115,17 @@ def capture(*args, &block)
# <tt><%= yield :footer %></tt>.
# <tt><%= yield :footer %></tt>.
def
content_for
(
name
,
content
=
nil
,
&
block
)
def
content_for
(
name
,
content
=
nil
,
&
block
)
ivar
=
"@content_for_
#{
name
}
"
ivar
=
"@content_for_
#{
name
}
"
instance_variable_set
(
"@content_for_
#{
name
}
"
,
"
#{
instance_variable_get
(
ivar
)
}#{
block_given?
?
capture
(
&
block
)
:
content
}
"
)
content
=
capture
(
&
block
)
if
block_given?
instance_variable_set
(
ivar
,
"
#{
instance_variable_get
(
ivar
)
}#{
content
}
"
)
end
end
private
private
def
with_
temporary_output_buffer
def
with_
output_buffer
(
buf
=
''
)
@output_buffer
,
old_buffer
=
''
,
@output_buffer
@output_buffer
,
old_buffer
=
buf
,
@output_buffer
yield
yield
@output_buffer
ensure
ensure
@output_buffer
=
old_buffer
@output_buffer
=
old_buffer
end
end
def
erb_content_for
(
name
,
&
block
)
ivar
=
"@content_for_
#{
name
}
"
instance_variable_set
(
ivar
,
"
#{
instance_variable_get
(
ivar
)
}#{
capture
(
&
block
)
}
"
)
end
def
block_content_for
(
name
)
ivar
=
"@content_for_
#{
name
}
"
instance_variable_set
(
ivar
,
"
#{
instance_variable_get
(
ivar
)
}#{
yield
}
"
)
end
end
end
end
end
end
end
actionpack/test/controller/capture_test.rb
浏览文件 @
fe9d2ad6
...
@@ -11,16 +11,8 @@ def content_for
...
@@ -11,16 +11,8 @@ def content_for
def
content_for_with_parameter
def
content_for_with_parameter
render
:layout
=>
"talk_from_action"
render
:layout
=>
"talk_from_action"
end
end
def
content_for_concatenated
render
:layout
=>
"talk_from_action"
end
def
erb_content_for
def
content_for_concatenated
render
:layout
=>
"talk_from_action"
end
def
block_content_for
render
:layout
=>
"talk_from_action"
render
:layout
=>
"talk_from_action"
end
end
...
@@ -62,21 +54,11 @@ def test_should_concatentate_content_for
...
@@ -62,21 +54,11 @@ def test_should_concatentate_content_for
assert_equal
expected_content_for_output
,
@response
.
body
assert_equal
expected_content_for_output
,
@response
.
body
end
end
def
test_erb_content_for
get
:erb_content_for
assert_equal
expected_content_for_output
,
@response
.
body
end
def
test_should_set_content_for_with_parameter
def
test_should_set_content_for_with_parameter
get
:content_for_with_parameter
get
:content_for_with_parameter
assert_equal
expected_content_for_output
,
@response
.
body
assert_equal
expected_content_for_output
,
@response
.
body
end
end
def
test_block_content_for
get
:block_content_for
assert_equal
expected_content_for_output
,
@response
.
body
end
def
test_non_erb_block_content_for
def
test_non_erb_block_content_for
get
:non_erb_block_content_for
get
:non_erb_block_content_for
assert_equal
expected_content_for_output
,
@response
.
body
assert_equal
expected_content_for_output
,
@response
.
body
...
...
actionpack/test/fixtures/test/block_content_for.erb
已删除
100644 → 0
浏览文件 @
26ec1be2
<%
block_content_for
:title
do
'Putting stuff in the title!'
end
%>
Great stuff!
\ No newline at end of file
actionpack/test/fixtures/test/erb_content_for.erb
已删除
100644 → 0
浏览文件 @
26ec1be2
<%
erb_content_for
:title
do
%>
Putting stuff in the title!
<%
end
%>
Great stuff!
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录