Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
86cd1b1d
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,发现更多精彩内容 >>
提交
86cd1b1d
编写于
3月 23, 2012
作者:
J
José Valim
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #5518 from rafaelfranca/minor-refactor
Remove code duplication
上级
9a26c903
a26dcb62
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
11 addition
and
11 deletion
+11
-11
actionpack/lib/action_view/helpers/date_helper.rb
actionpack/lib/action_view/helpers/date_helper.rb
+11
-11
未找到文件。
actionpack/lib/action_view/helpers/date_helper.rb
浏览文件 @
86cd1b1d
...
...
@@ -626,7 +626,7 @@ def select_year(date, options = {}, html_options = {})
# <time datetime="2010-11-04" pubdate="pubdate">November 04, 2010</time>
#
# <%= time_tag Time.now do %>
# <span>Right now</span>
# <span>Right now</span>
# <% end %>
# # => <time datetime="2010-11-04T17:55:45+01:00"><span>Right now</span></time>
#
...
...
@@ -674,11 +674,7 @@ def select_datetime
@options
[
:discard_minute
]
||=
true
if
@options
[
:discard_hour
]
@options
[
:discard_second
]
||=
true
unless
@options
[
:include_seconds
]
&&
!
@options
[
:discard_minute
]
# If the day is hidden, the day should be set to the 1st so all month and year choices are valid. Otherwise,
# February 31st or February 29th, 2011 can be selected, which are invalid.
if
@datetime
&&
@options
[
:discard_day
]
@datetime
=
@datetime
.
change
(
:day
=>
1
)
end
set_day_if_discarded
if
@options
[
:tag
]
&&
@options
[
:ignore_date
]
select_time
...
...
@@ -701,11 +697,7 @@ def select_date
@options
[
:discard_month
]
||=
true
unless
order
.
include?
(
:month
)
@options
[
:discard_day
]
||=
true
if
@options
[
:discard_month
]
||
!
order
.
include?
(
:day
)
# If the day is hidden, the day should be set to the 1st so all month and year choices are valid. Otherwise,
# February 31st or February 29th, 2011 can be selected, which are invalid.
if
@datetime
&&
@options
[
:discard_day
]
@datetime
=
@datetime
.
change
(
:day
=>
1
)
end
set_day_if_discarded
[
:day
,
:month
,
:year
].
each
{
|
o
|
order
.
unshift
(
o
)
unless
order
.
include?
(
o
)
}
...
...
@@ -807,6 +799,14 @@ def select_year
end
end
# If the day is hidden, the day should be set to the 1st so all month and year choices are
# valid. Otherwise, February 31st or February 29th, 2011 can be selected, which are invalid.
def
set_day_if_discarded
if
@datetime
&&
@options
[
:discard_day
]
@datetime
=
@datetime
.
change
(
:day
=>
1
)
end
end
# Returns translated month names, but also ensures that a custom month
# name array has a leading nil element.
def
month_names
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录