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

Whitespaces ✂️

Browse source
This commit is contained in:
Rafael Mendonça França 2012-01-05 17:59:25 -03:00
parent 1de3f63e15
commit 2e487bc658
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -134,7 +134,7 @@ module ActionView
# #
# ==== Gotcha # ==== Gotcha
# #
# The HTML specification says when +multiple+ parameter passed to select and all options got deselected # The HTML specification says when +multiple+ parameter passed to select and all options got deselected
# web browsers do not send any value to server. Unfortunately this introduces a gotcha: # web browsers do not send any value to server. Unfortunately this introduces a gotcha:
# if an +User+ model has many +roles+ and have +role_ids+ accessor, and in the form that edits roles of the user # if an +User+ model has many +roles+ and have +role_ids+ accessor, and in the form that edits roles of the user
# the user deselects all roles from +role_ids+ multiple select box, no +role_ids+ parameter is sent. So, # the user deselects all roles from +role_ids+ multiple select box, no +role_ids+ parameter is sent. So,
@ -333,7 +333,6 @@ module ActionView
disabled_attribute = ' disabled="disabled"' if disabled && option_value_selected?(value, disabled) disabled_attribute = ' disabled="disabled"' if disabled && option_value_selected?(value, disabled)
%(<option value="#{ERB::Util.html_escape(value)}"#{selected_attribute}#{disabled_attribute}#{html_attributes}>#{ERB::Util.html_escape(text)}</option>) %(<option value="#{ERB::Util.html_escape(value)}"#{selected_attribute}#{disabled_attribute}#{html_attributes}>#{ERB::Util.html_escape(text)}</option>)
end.join("\n").html_safe end.join("\n").html_safe
end end
# Returns a string of option tags that have been compiled by iterating over the +collection+ and assigning the # Returns a string of option tags that have been compiled by iterating over the +collection+ and assigning the
@ -508,9 +507,9 @@ module ActionView
convert_zones = lambda { |list| list.map { |z| [ z.to_s, z.name ] } } convert_zones = lambda { |list| list.map { |z| [ z.to_s, z.name ] } }
if priority_zones if priority_zones
if priority_zones.is_a?(Regexp) if priority_zones.is_a?(Regexp)
priority_zones = model.all.find_all {|z| z =~ priority_zones} priority_zones = model.all.find_all {|z| z =~ priority_zones}
end end
zone_options += options_for_select(convert_zones[priority_zones], selected) zone_options += options_for_select(convert_zones[priority_zones], selected)
zone_options += "<option value=\"\" disabled=\"disabled\">-------------</option>\n" zone_options += "<option value=\"\" disabled=\"disabled\">-------------</option>\n"
@ -630,7 +629,7 @@ module ActionView
add_default_name_and_id(html_options) add_default_name_and_id(html_options)
select = content_tag("select", add_options(option_tags, options, value(object)), html_options) select = content_tag("select", add_options(option_tags, options, value(object)), html_options)
if html_options["multiple"] if html_options["multiple"]
tag("input", :disabled => html_options["disabled"], :name => html_options["name"], :type => "hidden", :value => "") + select tag("input", :disabled => html_options["disabled"], :name => html_options["name"], :type => "hidden", :value => "") + select
else else
select select
end end

4
actionpack/lib/action_view/renderer/abstract_renderer.rb
View file

@ -12,7 +12,7 @@ module ActionView
end end
protected protected
def extract_details(options) def extract_details(options)
details = {} details = {}
@lookup_context.registered_details.each do |key| @lookup_context.registered_details.each do |key|
@ -21,7 +21,7 @@ module ActionView
end end
details details
end end
def instrument(name, options={}) def instrument(name, options={})
ActiveSupport::Notifications.instrument("render_#{name}.action_view", options){ yield } ActiveSupport::Notifications.instrument("render_#{name}.action_view", options){ yield }
end end