Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
f99e62e2
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,发现更多精彩内容 >>
提交
f99e62e2
编写于
8月 22, 2014
作者:
A
Alex Robbin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
just use the placeholder tag value if it is passed as a String
上级
fea7fe1f
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
22 addition
and
5 deletion
+22
-5
actionview/lib/action_view/helpers/tags/placeholderable.rb
actionview/lib/action_view/helpers/tags/placeholderable.rb
+3
-1
actionview/test/template/form_helper_test.rb
actionview/test/template/form_helper_test.rb
+19
-4
未找到文件。
actionview/lib/action_view/helpers/tags/placeholderable.rb
浏览文件 @
f99e62e2
...
...
@@ -6,6 +6,8 @@ def initialize(*)
super
if
tag_value
=
@options
[
:placeholder
]
placeholder
=
tag_value
if
tag_value
.
is_a?
(
String
)
object_name
=
@object_name
.
gsub
(
/\[(.*)_attributes\]\[\d+\]/
,
'.\1'
)
method_and_value
=
tag_value
.
is_a?
(
TrueClass
)
?
@method_name
:
"
#{
@method_name
}
.
#{
tag_value
}
"
...
...
@@ -15,7 +17,7 @@ def initialize(*)
end
i18n_default
||=
""
placeholder
=
I18n
.
t
(
"
#{
object_name
}
.
#{
method_and_value
}
"
,
:default
=>
i18n_default
,
:scope
=>
"helpers.placeholder"
).
presence
placeholder
||
=
I18n
.
t
(
"
#{
object_name
}
.
#{
method_and_value
}
"
,
:default
=>
i18n_default
,
:scope
=>
"helpers.placeholder"
).
presence
placeholder
||=
if
object
&&
object
.
class
.
respond_to?
(
:human_attribute_name
)
object
.
class
.
human_attribute_name
(
method_and_value
)
...
...
actionview/test/template/form_helper_test.rb
浏览文件 @
f99e62e2
...
...
@@ -344,15 +344,21 @@ def test_text_field_placeholder_with_human_attribute_name
end
end
def
test_text_field_placeholder_with_string_value
with_locale
:placeholder
do
assert_dom_equal
(
'<input id="post_cost" name="post[cost]" placeholder="HOW MUCH?" type="text" />'
,
text_field
(
:post
,
:cost
,
placeholder:
"HOW MUCH?"
))
end
end
def
test_text_field_placeholder_with_human_attribute_name_and_value
with_locale
:placeholder
do
assert_dom_equal
(
'<input id="post_cost" name="post[cost]" placeholder="Pounds" type="text" />'
,
text_field
(
:post
,
:cost
,
placeholder:
"uk"
))
assert_dom_equal
(
'<input id="post_cost" name="post[cost]" placeholder="Pounds" type="text" />'
,
text_field
(
:post
,
:cost
,
placeholder:
:uk
))
end
end
def
test_text_field_placeholder_with_locales_and_value
with_locale
:placeholder
do
assert_dom_equal
(
'<input id="post_written_on" name="post[written_on]" placeholder="Escrito en" type="text" value="2004-06-15" />'
,
text_field
(
:post
,
:written_on
,
placeholder:
"spanish"
))
assert_dom_equal
(
'<input id="post_written_on" name="post[written_on]" placeholder="Escrito en" type="text" value="2004-06-15" />'
,
text_field
(
:post
,
:written_on
,
placeholder:
:spanish
))
end
end
...
...
@@ -783,11 +789,20 @@ def test_text_area_placeholder_with_human_attribute_name
end
end
def
test_text_area_placeholder_with_string_value
with_locale
:placeholder
do
assert_dom_equal
(
%{<textarea id="post_cost" name="post[cost]" placeholder="HOW MUCH?">\n</textarea>}
,
text_area
(
:post
,
:cost
,
placeholder:
"HOW MUCH?"
)
)
end
end
def
test_text_area_placeholder_with_human_attribute_name_and_value
with_locale
:placeholder
do
assert_dom_equal
(
%{<textarea id="post_cost" name="post[cost]" placeholder="Pounds">\n</textarea>}
,
text_area
(
:post
,
:cost
,
placeholder:
"uk"
)
text_area
(
:post
,
:cost
,
placeholder:
:uk
)
)
end
end
...
...
@@ -796,7 +811,7 @@ def test_text_area_placeholder_with_locales_and_value
with_locale
:placeholder
do
assert_dom_equal
(
%{<textarea id="post_written_on" name="post[written_on]" placeholder="Escrito en">\n2004-06-15</textarea>}
,
text_area
(
:post
,
:written_on
,
placeholder:
"spanish"
)
text_area
(
:post
,
:written_on
,
placeholder:
:spanish
)
)
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录