kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

DRY this baby up

Browse source
This commit is contained in:
Aditya Sanghi 2011-04-29 10:21:16 +05:30
parent 610e4d9f24
commit 8bce6e761d
1 changed files with 4 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
actionpack/lib/action_view/helpers/date_helper.rb
View file

@ -716,10 +716,8 @@ module ActionView
def select_hour def select_hour
if @options[:use_hidden] || @options[:discard_hour] if @options[:use_hidden] || @options[:discard_hour]
build_hidden(:hour, hour) build_hidden(:hour, hour)
elsif @options[:ampm]
build_select(:hour, build_ampm_options(hour, :end => 23))
else else
build_options_and_select(:hour, hour, :end => 23) build_options_and_select(:hour, hour, :end => 23, :ampm => @options[:ampm])
end end
end end
@ -828,24 +826,6 @@ module ActionView
build_select(type, build_options(selected, options)) build_select(type, build_options(selected, options))
end end
def build_ampm_options(selected, options = {})
start = options.delete(:start) || 0
stop = options.delete(:end) || 23
step = options.delete(:step) || 1
options.reverse_merge!({:leading_zeros => true})
leading_zeros = options.delete(:leading_zeros)
select_options = []
start.step(stop, step) do |i|
text = AMPM_TRANSLATION[i]
value = leading_zeros ? sprintf("%02d", i) : i
tag_options = { :value => value }
tag_options[:selected] = "selected" if selected == i
select_options << content_tag(:option, text, tag_options)
end
(select_options.join("\n") + "\n").html_safe
end
# Build select option html from date value and options # Build select option html from date value and options
# build_options(15, :start => 1, :end => 31) # build_options(15, :start => 1, :end => 31)
# => "<option value="1">1</option> # => "<option value="1">1</option>
@ -855,7 +835,7 @@ module ActionView
start = options.delete(:start) || 0 start = options.delete(:start) || 0
stop = options.delete(:end) || 59 stop = options.delete(:end) || 59
step = options.delete(:step) || 1 step = options.delete(:step) || 1
options.reverse_merge!({:leading_zeros => true}) options.reverse_merge!({:leading_zeros => true, :ampm => false})
leading_zeros = options.delete(:leading_zeros) leading_zeros = options.delete(:leading_zeros)
select_options = [] select_options = []
@ -863,7 +843,8 @@ module ActionView
value = leading_zeros ? sprintf("%02d", i) : i value = leading_zeros ? sprintf("%02d", i) : i
tag_options = { :value => value } tag_options = { :value => value }
tag_options[:selected] = "selected" if selected == i tag_options[:selected] = "selected" if selected == i
select_options << content_tag(:option, value, tag_options) text = options[:ampm] ? AMPM_TRANSLATION[i] : value
select_options << content_tag(:option, text, tag_options)
end end
(select_options.join("\n") + "\n").html_safe (select_options.join("\n") + "\n").html_safe
end end