Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
0f89689b
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,发现更多精彩内容 >>
提交
0f89689b
编写于
6月 16, 2013
作者:
R
Rafael Mendonça França
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #10964 from nashby/collection-html-options
collection tags accept html attributes as the last element of collection
上级
76462a85
782cee53
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
23 addition
and
1 deletion
+23
-1
actionpack/CHANGELOG.md
actionpack/CHANGELOG.md
+5
-0
actionpack/lib/action_view/helpers/tags/collection_helpers.rb
...onpack/lib/action_view/helpers/tags/collection_helpers.rb
+2
-1
actionpack/test/template/form_collections_helper_test.rb
actionpack/test/template/form_collections_helper_test.rb
+16
-0
未找到文件。
actionpack/CHANGELOG.md
浏览文件 @
0f89689b
*
Element of the
`collection_check_boxes`
and
`collection_radio_buttons`
can
optionally contain html attributes as the last element of the array.
*Vasiliy Ermolovich*
*
Update the HTML
`BOOLEAN_ATTRIBUTES`
in
`ActionView::Helpers::TagHelper`
to conform to the latest HTML 5.1 spec. Add attributes
`allowfullscreen`
,
`default`
,
`inert`
,
`sortable`
,
`truespeed`
,
`typemustmatch`
. Fix attribute
...
...
actionpack/lib/action_view/helpers/tags/collection_helpers.rb
浏览文件 @
0f89689b
...
...
@@ -73,8 +73,9 @@ def render_collection #:nodoc:
value
=
value_for_collection
(
item
,
@value_method
)
text
=
value_for_collection
(
item
,
@text_method
)
default_html_options
=
default_html_options_for_collection
(
item
,
value
)
additional_html_options
=
option_html_attributes
(
item
)
yield
item
,
value
,
text
,
default_html_options
yield
item
,
value
,
text
,
default_html_options
.
merge
(
additional_html_options
)
end
.
join
.
html_safe
end
end
...
...
actionpack/test/template/form_collections_helper_test.rb
浏览文件 @
0f89689b
...
...
@@ -76,6 +76,14 @@ def with_collection_check_boxes(*args, &block)
assert_select
'input[type=radio][value=false].special-radio#user_active_false'
end
test
'collection radio accepts html options as the last element of array'
do
collection
=
[[
1
,
true
,
{
class:
'foo'
}],
[
0
,
false
,
{
class:
'bar'
}]]
with_collection_radio_buttons
:user
,
:active
,
collection
,
:second
,
:first
assert_select
'input[type=radio][value=true].foo#user_active_true'
assert_select
'input[type=radio][value=false].bar#user_active_false'
end
test
'collection radio does not wrap input inside the label'
do
with_collection_radio_buttons
:user
,
:active
,
[
true
,
false
],
:to_s
,
:to_s
...
...
@@ -192,6 +200,14 @@ def with_collection_check_boxes(*args, &block)
assert_select
'label[for=user_name_199]'
,
'$1.99'
end
test
'collection check boxes accepts html options as the last element of array'
do
collection
=
[[
1
,
'Category 1'
,
{
class:
'foo'
}],
[
2
,
'Category 2'
,
{
class:
'bar'
}]]
with_collection_check_boxes
:user
,
:active
,
collection
,
:first
,
:second
assert_select
'input[type=checkbox][value=1].foo'
assert_select
'input[type=checkbox][value=2].bar'
end
test
'collection check boxes accepts selected values as :checked option'
do
collection
=
(
1
..
3
).
map
{
|
i
|
[
i
,
"Category
#{
i
}
"
]
}
with_collection_check_boxes
:user
,
:category_ids
,
collection
,
:first
,
:last
,
:checked
=>
[
1
,
3
]
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录