Fixed HTML5 errors
This commit is contained in:
parent
8c7c4a575c
commit
67b13e02fa
@ -1100,7 +1100,7 @@ module ApplicationHelper
|
|||||||
|
|
||||||
def textfield(name, value, options = {})
|
def textfield(name, value, options = {})
|
||||||
html = ''
|
html = ''
|
||||||
id = name.to_s.gsub('[', '_').gsub(']', '')
|
id = unique_id(name)
|
||||||
description_id = nil
|
description_id = nil
|
||||||
|
|
||||||
if options[:heading].present?
|
if options[:heading].present?
|
||||||
@ -1149,7 +1149,13 @@ module ApplicationHelper
|
|||||||
|
|
||||||
case options[:type]
|
case options[:type]
|
||||||
when :select
|
when :select
|
||||||
html += select_tag(name, options_for_select(options[:options], value), input_options)
|
option_list = options_for_select(options[:options], value)
|
||||||
|
|
||||||
|
# make sure that we have an empty option if the select is required
|
||||||
|
if options[:required] && options[:options].first.present? && options[:options].first.last.present?
|
||||||
|
option_list = ('<option value="" disabled></option>' + option_list).html_safe
|
||||||
|
end
|
||||||
|
html += select_tag(name, option_list, input_options)
|
||||||
else
|
else
|
||||||
html += send("#{(options[:type] || :text).to_s}_field_tag", name, value, input_options)
|
html += send("#{(options[:type] || :text).to_s}_field_tag", name, value, input_options)
|
||||||
end
|
end
|
||||||
@ -1273,7 +1279,7 @@ module ApplicationHelper
|
|||||||
options[:big] ? 'big' : nil
|
options[:big] ? 'big' : nil
|
||||||
].compact).html_safe,
|
].compact).html_safe,
|
||||||
aria: {
|
aria: {
|
||||||
labeledby: label_id,
|
labelledby: label_id,
|
||||||
describedby: description_id
|
describedby: description_id
|
||||||
},
|
},
|
||||||
class: [
|
class: [
|
||||||
|
Loading…
x
Reference in New Issue
Block a user