effective_form_inputs 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1e577be5802efc63230b2b66f9f3d52bec1ee06
-  data.tar.gz: 3dfe18e3f27b3039a16fbbb638b615ababe9be03
+  metadata.gz: 2f903f343a6b2612545534ce9a86fa00e953bb50
+  data.tar.gz: 81bafa3159d6e521f38dca2b5f31f3970b638ce5
 SHA512:
-  metadata.gz: 220cd031a9bd83bd4999b3f69dc387bc0d899ecb3cb1462ac0d9900df841ec028606d526e6fbdf3e24f2db366645ef6d61e622a0b23251c6c6368fe73ca32a25
-  data.tar.gz: 1a2a5508b86cd3ad67e17622eb32719d7d8b7f131adc2c9c8fa5187984b80ce61f69373a4eaa15616658088b9908f532e523a5a0c41410e1746936656b65b8e5
+  metadata.gz: 2d09274264261dcb884eaccb193926de684985ebac1bbc20c34948dbfd7ee95bca244d36eb72b764672c106dba726cfd1cb4e7a15b2a6003cf5be230fbfeb353
+  data.tar.gz: d29abe9f25363244106b176a81be578f86c4b11563276a84f28a165073b405c87110d2847abfc2d7e7bb365412fcea4d1fbee5a8e673abdfcc39afaeb5d25270

data/app/assets/stylesheets/effective_select/overrides.scss

@@ -4,9 +4,3 @@
   margin-top: -1px;
   margin-right: 0px;
 }
-
-.form-group {
-  .select2-container--bootstrap {
-    min-width: 178px;
-  }
-}

data/app/models/inputs/effective_date_picker/input.rb

@@ -12,6 +12,10 @@ module Inputs
       end
 
       def to_html
+        if options.delete(:input_group) == false
+          return text_field_tag(field_name, value, options)
+        end
+
         content_tag(:div, :class => 'input-group') do
           content_tag(:span, :class => 'input-group-addon') do
             content_tag(:i, '', :class => 'glyphicon glyphicon-calendar').html_safe

data/app/models/inputs/effective_date_picker_input.rb

@@ -6,6 +6,7 @@ if defined?(SimpleForm)
   class EffectiveDatePickerInput < SimpleForm::Inputs::StringInput
     def input(wrapper_options = nil)
       options = merge_wrapper_options(input_html_options, wrapper_options) || {}
+      options.merge!(input_options.select { |k, _| EffectiveFormInputs::REJECTED_INPUT_JS_OPTIONS.include?(k) })
       options['data-input-js-options'] = input_options.reject { |k, _| EffectiveFormInputs::REJECTED_INPUT_JS_OPTIONS.include?(k) }
 
       Inputs::EffectiveDatePicker::Input.new(object, object_name, template, attribute_name, options).to_html

data/app/models/inputs/effective_date_time_picker/input.rb

@@ -12,6 +12,10 @@ module Inputs
       end
 
       def to_html
+        if options.delete(:input_group) == false
+          return text_field_tag(field_name, value, options)
+        end
+
         content_tag(:div, :class => 'input-group') do
           content_tag(:span, :class => 'input-group-addon') do
             content_tag(:i, '', :class => 'glyphicon glyphicon-calendar').html_safe

data/app/models/inputs/effective_date_time_picker_input.rb

@@ -6,6 +6,7 @@ if defined?(SimpleForm)
   class EffectiveDateTimePickerInput < SimpleForm::Inputs::StringInput
     def input(wrapper_options = nil)
       options = merge_wrapper_options(input_html_options, wrapper_options) || {}
+      options.merge!(input_options.select { |k, _| EffectiveFormInputs::REJECTED_INPUT_JS_OPTIONS.include?(k) })
       options['data-input-js-options'] = input_options.reject { |k, _| EffectiveFormInputs::REJECTED_INPUT_JS_OPTIONS.include?(k) }
 
       Inputs::EffectiveDateTimePicker::Input.new(object, object_name, template, attribute_name, options).to_html

data/app/models/inputs/effective_select_input.rb

@@ -8,10 +8,7 @@ if defined?(SimpleForm)
       label_method, value_method = detect_collection_methods
 
       options = merge_wrapper_options(input_html_options, wrapper_options) || {}
-
-      # This gives us multiple and include_blank properly
       options.merge!(input_options.select { |k, _| EffectiveFormInputs::REJECTED_INPUT_JS_OPTIONS.include?(k) })
-
       options['data-input-js-options'] = input_options.reject { |k, _| EffectiveFormInputs::REJECTED_INPUT_JS_OPTIONS.include?(k) }
 
       options[:collection] = collection

data/app/models/inputs/effective_static_control_input.rb

@@ -6,6 +6,7 @@ if defined?(SimpleForm)
   class EffectiveStaticControlInput < SimpleForm::Inputs::StringInput
     def input(wrapper_options = nil)
       options = merge_wrapper_options(input_html_options, wrapper_options) || {}
+      options.merge!(input_options.select { |k, _| EffectiveFormInputs::REJECTED_INPUT_JS_OPTIONS.include?(k) })
       options['data-input-js-options'] = input_options.reject { |k, _| EffectiveFormInputs::REJECTED_INPUT_JS_OPTIONS.include?(k) }
 
       Inputs::EffectiveStaticControl::Input.new(object, object_name, template, attribute_name, options).to_html

data/app/views/effective/style_guide/_form_default.html.haml

@@ -3,5 +3,5 @@
 = form_for Effective::StyleGuide.new(:category => 'Category 2'), :url => '/' do |f|
   = f.effective_date_time_picker :updated_at
   = f.effective_date_picker :updated_at
-  = f.select :category, 10.times.map { |x| "Category #{x}"}, :include_blank => false, :placeholder => 'Pleze chooze', :multiple => true
-  = f.effective_select :category, 10.times.map { |x| "Category #{x}"}, :include_blank => false, :placeholder => 'Pleze chooze', :multiple => true
+  = f.select :category, 10.times.map { |x| "Category #{x}"}, :include_blank => true
+  = f.effective_select :category, 10.times.map { |x| "Category #{x}"}, :include_blank => false, :placeholder => 'Pleze chooze', :input_group => false

data/lib/effective_form_inputs/version.rb

@@ -1,3 +1,3 @@
 module EffectiveFormInputs
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.4.2'.freeze
 end

data/lib/effective_form_inputs.rb

@@ -2,5 +2,5 @@ require "effective_form_inputs/engine"
 require "effective_form_inputs/version"
 
 module EffectiveFormInputs
-  REJECTED_INPUT_JS_OPTIONS = [:as, :hint, :error, :readonly, :disabled, :required, :label, :inline_label, :prompt, :min_max, :maxlength, :pattern, :input_html, :wrapper_html, :error_html, :id, :wrapper, :collection, :multiple, :include_blank, :label_method, :value_method]
+  REJECTED_INPUT_JS_OPTIONS = [:as, :hint, :error, :readonly, :disabled, :required, :label, :inline_label, :prompt, :min_max, :maxlength, :pattern, :input_html, :wrapper_html, :error_html, :id, :wrapper, :collection, :multiple, :include_blank, :label_method, :value_method, :input_group]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_form_inputs
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails