mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #18166 from merongivian/search_field_refactor
Remove block from super
This commit is contained in:
commit
21289bed3b
2 changed files with 12 additions and 10 deletions
|
@ -3,18 +3,21 @@ module ActionView
|
|||
module Tags # :nodoc:
|
||||
class SearchField < TextField # :nodoc:
|
||||
def render
|
||||
super do |options|
|
||||
if options["autosave"]
|
||||
if options["autosave"] == true
|
||||
options["autosave"] = request.host.split(".").reverse.join(".")
|
||||
end
|
||||
options["results"] ||= 10
|
||||
end
|
||||
options = @options.stringify_keys
|
||||
|
||||
if options["onsearch"]
|
||||
options["incremental"] = true unless options.has_key?("incremental")
|
||||
if options["autosave"]
|
||||
if options["autosave"] == true
|
||||
options["autosave"] = request.host.split(".").reverse.join(".")
|
||||
end
|
||||
options["results"] ||= 10
|
||||
end
|
||||
|
||||
if options["onsearch"]
|
||||
options["incremental"] = true unless options.has_key?("incremental")
|
||||
end
|
||||
|
||||
@options = options
|
||||
super
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -11,7 +11,6 @@ module ActionView
|
|||
options["size"] = options["maxlength"] unless options.key?("size")
|
||||
options["type"] ||= field_type
|
||||
options["value"] = options.fetch("value") { value_before_type_cast(object) } unless field_type == "file"
|
||||
yield options if block_given?
|
||||
add_default_name_and_id(options)
|
||||
tag("input", options)
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue