diff options
| author | Xavier Noria <fxn@hashref.com> | 2017-07-02 13:50:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-02 13:50:25 -0700 |
| commit | 92c29d82eb2f323bb1338a039229a66057a7d137 (patch) | |
| tree | 050eea5a719faa416b64b804617f8755b6500e09 /actionview/lib/action_view/helpers/date_helper.rb | |
| parent | f851e1f705f26d8f92f0fc1b265b20bc389d23cb (diff) | |
| parent | f443460670576cd82a806a851b7124479e8325c9 (diff) | |
| download | rails-92c29d82eb2f323bb1338a039229a66057a7d137.tar.gz rails-92c29d82eb2f323bb1338a039229a66057a7d137.tar.bz2 rails-92c29d82eb2f323bb1338a039229a66057a7d137.zip | |
Merge branch 'master' into require_relative_2017
Diffstat (limited to 'actionview/lib/action_view/helpers/date_helper.rb')
| -rw-r--r-- | actionview/lib/action_view/helpers/date_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionview/lib/action_view/helpers/date_helper.rb b/actionview/lib/action_view/helpers/date_helper.rb index 80ca3f076c..3fbed44f7e 100644 --- a/actionview/lib/action_view/helpers/date_helper.rb +++ b/actionview/lib/action_view/helpers/date_helper.rb @@ -1007,7 +1007,7 @@ module ActionView select_options[:disabled] = "disabled" if @options[:disabled] select_options[:class] = css_class_attribute(type, select_options[:class], @options[:with_css_classes]) if @options[:with_css_classes] - select_html = "\n" + select_html = "\n".dup select_html << content_tag("option".freeze, "", value: "") + "\n" if @options[:include_blank] select_html << prompt_option_tag(type, @options[:prompt]) + "\n" if @options[:prompt] select_html << select_options_as_html @@ -1089,7 +1089,7 @@ module ActionView # Given an ordering of datetime components, create the selection HTML # and join them with their appropriate separators. def build_selects_from_types(order) - select = "" + select = "".dup first_visible = order.find { |type| !@options[:"discard_#{type}"] } order.reverse_each do |type| separator = separator(type) unless type == first_visible # don't add before first visible field |