From ac4b4701c0dc94375956f320545bff2ebe0ba832 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 10 Apr 2005 15:11:15 +0000 Subject: Fixed that radio buttons shouldn't have a default size attribute #1074 [hendrik@mans.de] Added ActionView::Helpers::InstanceTag::DEFAULT_RADIO_OPTIONS that contains a hash of default options for radio buttons #1074 [hendrik@mans.de] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1127 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_view/helpers/form_helper.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'actionpack/lib') diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb index 7333f4036d..007437b7ad 100644 --- a/actionpack/lib/action_view/helpers/form_helper.rb +++ b/actionpack/lib/action_view/helpers/form_helper.rb @@ -145,6 +145,7 @@ module ActionView attr_reader :method_name, :object_name DEFAULT_FIELD_OPTIONS = { "size" => 30 }.freeze unless const_defined?(:DEFAULT_FIELD_OPTIONS) + DEFAULT_RADIO_OPTIONS = { }.freeze unless const_defined?(:DEFAULT_RADIO_OPTIONS) DEFAULT_TEXT_AREA_OPTIONS = { "wrap" => "virtual", "cols" => 40, "rows" => 20 }.freeze unless const_defined?(:DEFAULT_TEXT_AREA_OPTIONS) DEFAULT_DATE_OPTIONS = { :discard_type => true }.freeze unless const_defined?(:DEFAULT_DATE_OPTIONS) @@ -158,10 +159,10 @@ module ActionView def to_input_field_tag(field_type, options = {}) options = options.stringify_keys + options["size"] ||= options["maxlength"] || DEFAULT_FIELD_OPTIONS["size"] + options = DEFAULT_FIELD_OPTIONS.merge(options) if field_type == "hidden" options.delete("size") - else - options["size"] ||= options["maxlength"] || DEFAULT_FIELD_OPTIONS["size"] end options["type"] = field_type options["value"] ||= value_before_type_cast unless field_type == "file" @@ -170,7 +171,7 @@ module ActionView end def to_radio_button_tag(tag_value, options = {}) - options = DEFAULT_FIELD_OPTIONS.merge(options.stringify_keys) + options = DEFAULT_RADIO_OPTIONS.merge(options.stringify_keys) options["type"] = "radio" options["value"] = tag_value options["checked"] = "checked" if value == tag_value -- cgit v1.2.3