diff options
Diffstat (limited to 'actionpack/lib/action_view/helpers')
-rwxr-xr-x | actionpack/lib/action_view/helpers/date_helper.rb | 22 | ||||
-rw-r--r-- | actionpack/lib/action_view/helpers/form_options_helper.rb | 8 |
2 files changed, 15 insertions, 15 deletions
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb index 6f9545983c..9b9fcae5aa 100755 --- a/actionpack/lib/action_view/helpers/date_helper.rb +++ b/actionpack/lib/action_view/helpers/date_helper.rb @@ -105,8 +105,8 @@ module ActionView 0.upto(59) do |second| second_options << ((datetime && (datetime.kind_of?(Fixnum) ? datetime : datetime.sec) == second) ? - "<option selected=\"selected\">#{leading_zero_on_single_digits(second)}</option>\n" : - "<option>#{leading_zero_on_single_digits(second)}</option>\n" + "<option value=\"#{leading_zero_on_single_digits(second)}\" selected=\"selected\">#{leading_zero_on_single_digits(second)}</option>\n" : + "<option value=\"#{leading_zero_on_single_digits(second)}\">#{leading_zero_on_single_digits(second)}</option>\n" ) end @@ -121,8 +121,8 @@ module ActionView 0.step(59, options[:minute_step] || 1) do |minute| minute_options << ((datetime && (datetime.kind_of?(Fixnum) ? datetime : datetime.min) == minute) ? - "<option selected=\"selected\">#{leading_zero_on_single_digits(minute)}</option>\n" : - "<option>#{leading_zero_on_single_digits(minute)}</option>\n" + "<option value=\"#{leading_zero_on_single_digits(minute)}\" selected=\"selected\">#{leading_zero_on_single_digits(minute)}</option>\n" : + "<option value=\"#{leading_zero_on_single_digits(minute)}\">#{leading_zero_on_single_digits(minute)}</option>\n" ) end @@ -136,8 +136,8 @@ module ActionView 0.upto(23) do |hour| hour_options << ((datetime && (datetime.kind_of?(Fixnum) ? datetime : datetime.hour) == hour) ? - "<option selected=\"selected\">#{leading_zero_on_single_digits(hour)}</option>\n" : - "<option>#{leading_zero_on_single_digits(hour)}</option>\n" + "<option value=\"#{leading_zero_on_single_digits(hour)}\" selected=\"selected\">#{leading_zero_on_single_digits(hour)}</option>\n" : + "<option value=\"#{leading_zero_on_single_digits(hour)}\">#{leading_zero_on_single_digits(hour)}</option>\n" ) end @@ -151,8 +151,8 @@ module ActionView 1.upto(31) do |day| day_options << ((date && (date.kind_of?(Fixnum) ? date : date.day) == day) ? - "<option selected=\"selected\">#{day}</option>\n" : - "<option>#{day}</option>\n" + "<option value=\"#{day}\" selected=\"selected\">#{day}</option>\n" : + "<option value=\"#{day}\">#{day}</option>\n" ) end @@ -201,8 +201,8 @@ module ActionView (options[:start_year] || default_start_year).upto(options[:end_year] || default_end_year) do |year| year_options << ((date && (date.kind_of?(Fixnum) ? date : date.year) == year) ? - "<option selected=\"selected\">#{year}</option>\n" : - "<option>#{year}</option>\n" + "<option value=\"#{year}\" selected=\"selected\">#{year}</option>\n" : + "<option value=\"#{year}\">#{year}</option>\n" ) end @@ -214,7 +214,7 @@ module ActionView select_html = %(<select name="#{prefix || DEFAULT_PREFIX}) select_html << "[#{type}]" unless discard_type select_html << %(">\n) - select_html << "<option></option>\n" if include_blank + select_html << "<option value=\"\"></option>\n" if include_blank select_html << options.to_s select_html << "</select>\n" diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb index fd8a347cb0..fe86accf25 100644 --- a/actionpack/lib/action_view/helpers/form_options_helper.rb +++ b/actionpack/lib/action_view/helpers/form_options_helper.rb @@ -92,7 +92,7 @@ module ActionView else is_selected = ( (selected.respond_to?(:include?) ? selected.include?(element) : element == selected) ) is_selected = ( (selected.respond_to?(:include?) && !selected.is_a?(String) ? selected.include?(element) : element == selected) ) - options << ((is_selected) ? "<option selected=\"selected\">#{html_escape(element.to_s)}</option>" : "<option>#{html_escape(element.to_s)}</option>") + options << ((is_selected) ? "<option value=\"#{html_escape(element.to_s)}\" selected=\"selected\">#{html_escape(element.to_s)}</option>" : "<option value=\"#{html_escape(element.to_s)}\">#{html_escape(element.to_s)}</option>") end end @@ -168,7 +168,7 @@ module ActionView if priority_countries country_options += options_for_select(priority_countries, selected) - country_options += "<option>-------------</option>\n" + country_options += "<option value=\"\">-------------</option>\n" end if priority_countries && priority_countries.include?(selected) @@ -205,7 +205,7 @@ module ActionView if priority_zones zone_options += options_for_select(convert_zones[priority_zones], selected) - zone_options += "<option>-------------</option>\n" + zone_options += "<option value=\"\">-------------</option>\n" zones = zones.reject { |z| priority_zones.include?( z ) } end @@ -298,7 +298,7 @@ module ActionView private def add_blank_option(option_tags, add_blank) - add_blank ? "<option></option>\n" + option_tags : option_tags + add_blank ? "<option value=\"\"></option>\n" + option_tags : option_tags end end end |