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

refactor option_text_and_value and option_value_selected? methods

Browse source
This commit is contained in:
Vasiliy Ermolovich 2012-02-21 20:32:20 +03:00
parent 9dd64f2e0c
commit 50cf5f761d
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
actionpack/lib/action_view/helpers/form_options_helper.rb
View file

@ -660,11 +660,8 @@ module ActionView
def option_text_and_value(option)
# Options are [text, value] pairs or strings used for both.
case
when Array === option
option = option.reject { |e| Hash === e }
[option.first, option.last]
when !option.is_a?(String) && option.respond_to?(:first) && option.respond_to?(:last)
if !option.is_a?(String) && option.respond_to?(:first) && option.respond_to?(:last)
option = option.reject { |e| Hash === e } if Array === option
[option.first, option.last]
else
[option, option]
@ -672,11 +669,7 @@ module ActionView
end
def option_value_selected?(value, selected)
if selected.respond_to?(:include?) && !selected.is_a?(String)
selected.include? value
else
value == selected
end
Array(selected).include? value
end
def extract_selected_and_disabled(selected)