fix simple_form deprecations

This commit is contained in:
wvengen 2014-12-10 22:03:17 +01:00
parent 7ac3f54709
commit 12bf2198e5
4 changed files with 19 additions and 16 deletions

View file

@ -1,5 +1,6 @@
class DatePickerInput < SimpleForm::Inputs::StringInput
def input
@builder.text_field(attribute_name, input_html_options.merge({class: 'datepicker'}))
def input(wrapper_options)
options = merge_wrapper_options(input_html_options, wrapper_options)
@builder.text_field attribute_name, options.merge(class: 'datepicker')
end
end

View file

@ -5,7 +5,8 @@
# @see http://stackoverflow.com/a/20317763/2866660
# @see https://github.com/einzige/date_time_attribute
class DatePickerTimeInput < SimpleForm::Inputs::StringInput
def input
def input(wrapper_options)
options = merge_wrapper_options(input_html_options, wrapper_options)
# Date format must match datepicker's, see app/assets/application.js .
# And for html5 inputs, match RFC3339, see http://dev.w3.org/html5/markup/datatypes.html#form.data.date .
# In the future, use html5 date&time inputs. This needs modernizr or equiv. to avoid
@ -13,8 +14,8 @@ class DatePickerTimeInput < SimpleForm::Inputs::StringInput
value = @builder.object.send attribute_name
date_options = {as: :string, class: 'input-small datepicker'}
time_options = {as: :string, class: 'input-mini'}
@builder.input_field("#{attribute_name}_date_value", input_html_options.merge(date_options)) + ' ' +
@builder.input_field("#{attribute_name}_time_value", input_html_options.merge(time_options))
@builder.input_field("#{attribute_name}_date_value", options.merge(date_options)) + ' ' +
@builder.input_field("#{attribute_name}_time_value", options.merge(time_options))
# time_select requires a date_select
#@builder.time_select("#{attribute_name}_time", {ignore_date: true}, input_html_options.merge(time_options))
end

View file

@ -2,24 +2,25 @@
class DeltaInput < SimpleForm::Inputs::StringInput
# for now, need to pass id or it won't work
def input
@input_html_options[:type] = 'text'
@input_html_options[:data] ||= {}
@input_html_options[:data][:delta] ||= 1
@input_html_options[:autocomplete] ||= 'off'
def input(wrapper_options)
options = merge_wrapper_options(input_html_options, wrapper_options)
options[:type] = 'text'
options[:data] ||= {}
options[:data][:delta] ||= 1
options[:autocomplete] ||= 'off'
# TODO get generated id, don't know how yet - `add_default_name_and_id_for_value` might be an option
template.content_tag :div, class: 'delta-input input-prepend input-append' do
delta_button('', -1) + super + delta_button('+', 1)
delta_button('', -1, options) + @builder.text_field(attribute_name, options) + delta_button('+', 1, options)
end
end
#template.button_tag('', type: :submit, data: {decrement: @input_html_options[:id]}, tabindex: -1, class: 'btn') +
#template.button_tag('', type: :submit, data: {decrement: options[:id]}, tabindex: -1, class: 'btn') +
private
def delta_button(title, direction)
data = { (direction>0 ? 'increment' : 'decrement') => @input_html_options[:id] }
delta = direction * @input_html_options[:data][:delta]
def delta_button(title, direction, options)
data = { (direction>0 ? 'increment' : 'decrement') => options[:id] }
delta = direction * options[:data][:delta]
template.button_tag(title, type: :button, name: 'delta', value: delta, data: data, tabindex: -1, class: 'btn')
end
end

View file

@ -98,7 +98,7 @@ SimpleForm.setup do |config|
config.label_class = 'control-label'
# You can define the class to use on all forms. Default is simple_form.
config.form_class = 'form-horizontal'
config.default_form_class = 'form-horizontal'
# You can define which elements should obtain additional classes
# config.generate_additional_classes_for = [:wrapper, :label, :input]