Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
667d0bdd
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,发现更多精彩内容 >>
提交
667d0bdd
编写于
5月 12, 2012
作者:
J
José Valim
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #6142 from spartan-developer/master
refactored extracting :size => 'XxY' into an extract_size! method
上级
4ae6bab6
95960767
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
10 addition
and
12 deletion
+10
-12
actionpack/lib/action_view/helpers/asset_tag_helper.rb
actionpack/lib/action_view/helpers/asset_tag_helper.rb
+2
-6
actionpack/lib/action_view/helpers/form_tag_helper.rb
actionpack/lib/action_view/helpers/form_tag_helper.rb
+1
-3
actionpack/lib/action_view/helpers/tag_helper.rb
actionpack/lib/action_view/helpers/tag_helper.rb
+6
-0
actionpack/lib/action_view/helpers/tags/text_area.rb
actionpack/lib/action_view/helpers/tags/text_area.rb
+1
-3
未找到文件。
actionpack/lib/action_view/helpers/asset_tag_helper.rb
浏览文件 @
667d0bdd
...
...
@@ -393,9 +393,7 @@ def image_tag(source, options={})
options
[
:alt
]
=
options
.
fetch
(
:alt
){
image_alt
(
src
)
}
end
if
size
=
options
.
delete
(
:size
)
options
[
:width
],
options
[
:height
]
=
size
.
split
(
"x"
)
if
size
=~
%r{^
\d
+x
\d
+$}
end
extract_size!
(
options
,
:width
,
:height
)
if
mouseover
=
options
.
delete
(
:mouseover
)
options
[
:onmouseover
]
=
"this.src='
#{
path_to_image
(
mouseover
)
}
'"
...
...
@@ -448,9 +446,7 @@ def video_tag(*sources)
multiple_sources_tag
(
'video'
,
sources
)
do
|
options
|
options
[
:poster
]
=
path_to_image
(
options
[
:poster
])
if
options
[
:poster
]
if
size
=
options
.
delete
(
:size
)
options
[
:width
],
options
[
:height
]
=
size
.
split
(
"x"
)
if
size
=~
%r{^
\d
+x
\d
+$}
end
extract_size!
(
options
,
:width
,
:height
)
end
end
...
...
actionpack/lib/action_view/helpers/form_tag_helper.rb
浏览文件 @
667d0bdd
...
...
@@ -317,9 +317,7 @@ def password_field_tag(name = "password", value = nil, options = {})
def
text_area_tag
(
name
,
content
=
nil
,
options
=
{})
options
=
options
.
stringify_keys
if
size
=
options
.
delete
(
"size"
)
options
[
"cols"
],
options
[
"rows"
]
=
size
.
split
(
"x"
)
if
size
.
respond_to?
(
:split
)
end
extract_size!
(
options
,
'cols'
,
'rows'
)
escape
=
options
.
delete
(
"escape"
)
{
true
}
content
=
ERB
::
Util
.
html_escape
(
content
)
if
escape
...
...
actionpack/lib/action_view/helpers/tag_helper.rb
浏览文件 @
667d0bdd
...
...
@@ -137,6 +137,12 @@ def content_tag_string(name, content, options, escape = true)
"<
#{
name
}#{
tag_options
}
>
#{
PRE_CONTENT_STRINGS
[
name
.
to_sym
]
}#{
content
}
</
#{
name
}
>"
.
html_safe
end
def
extract_size!
(
options
,
x_attribute
,
y_attribute
)
if
size
=
options
.
delete
(
:size
)
options
[
x_attribute
],
options
[
y_attribute
]
=
size
.
split
(
"x"
)
if
size
=~
%r{^
\d
+x
\d
+$}
end
end
def
tag_options
(
options
,
escape
=
true
)
return
if
options
.
blank?
attrs
=
[]
...
...
actionpack/lib/action_view/helpers/tags/text_area.rb
浏览文件 @
667d0bdd
...
...
@@ -6,9 +6,7 @@ def render
options
=
@options
.
stringify_keys
add_default_name_and_id
(
options
)
if
size
=
options
.
delete
(
"size"
)
options
[
"cols"
],
options
[
"rows"
]
=
size
.
split
(
"x"
)
if
size
.
respond_to?
(
:split
)
end
extract_size!
(
options
,
'cols'
,
'rows'
)
content_tag
(
"textarea"
,
options
.
delete
(
'value'
)
||
value_before_type_cast
(
object
),
options
)
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录