tao_form 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d96005eb91438b5a448dc3f866d0a295f3ebf431
-  data.tar.gz: 6ca595c40e534aab13fa386bbacbde325ce7c5c7
+  metadata.gz: 619ace8cb3ec0b3a47a26c5db99922704ba92a9f
+  data.tar.gz: 4e7e50d1316526a50555152e64e0c12223283af3
 SHA512:
-  metadata.gz: 205f4bbfa701369898fec6afbf39de7df13c8e96636708d459fa4777fbc8a086ed2ec51fc38194bbc19e0a1de1378b0d8ee5a2f2ab1679a8d335a90e8d3fd944
-  data.tar.gz: 48e6b9d3e5288fc6df5e7f3489071715daddf42a7f9d70e1875cae85d14d6853b84f416c612289201a80d0c6b450e3ad92bb8ccb21de791ab4ba06a0a262f26d
+  metadata.gz: f2db8ed70e5763f6bc141ca73e780ff257f99888bf79de1df59ca23656544afa571c6d8e95a40f4e651f6036ab6f9a2029ad8936376d2859b0c9ebc85453094d
+  data.tar.gz: f3380c92cacad1677c1fde7145dba3a89b51358061f794e1ff6a5ab10ca5565d49bf845b50463191f1e569a3721b0bd0d8c382aac444e97716d23979dc05077e

data/lib/assets/javascripts/tao/form/shared/fields/datetime_picker.coffee

@@ -22,6 +22,7 @@ class Tao.Form.DatetimePicker extends TaoComponent
   _bind: ->
     @on 'tao:change', '.moment-picker', (e, m) =>
       @_syncMoment()
+      @trigger 'tao:change', [@moment]
 
     datePickerDeferred = $.Deferred()
     timePickerDeferred = $.Deferred()

data/lib/assets/stylesheets/tao/form/fields/select/multiple_result.scss

@@ -42,6 +42,10 @@ tao-multiple-select-result {
       margin: 0 0.25rem 0 0;
     }
 
+    .text {
+      line-height: 1.5rem;
+    }
+
     &:focus {
       box-shadow: 0px 0px 2px 0px rgba($border-color, 0.5);
     }

data/lib/assets/stylesheets/tao/form/layout.scss

@@ -2,10 +2,9 @@
 
 tao-form {
   display: block;
+  margin: 2em 0 0 0;
 
   form {
-    margin: 2em 0 0 0;
-
     fieldset {
       border: none;
       padding: 0;

data/lib/assets/stylesheets/tao/form/shared/fields/select/_multiple_result.scss

@@ -30,6 +30,10 @@ tao-multiple-select-result {
       margin: 0 0 0 0.5rem;
       fill: $lighter-grey-color;
     }
+
+    .name {
+      line-height: 1.5rem;
+    }
   }
 
   &.disabled {

data/lib/tao_form/components/check_box_component.rb

@@ -2,13 +2,14 @@ module TaoForm
   module Components
     class CheckBoxComponent < FieldComponent
 
-      attr_reader :checked_value, :unchecked_value, :checked
+      attr_reader :checked_value, :unchecked_value, :checked, :disabled
 
-      def initialize view, builder = nil, attribute_name = nil, options = {}, checked_value = '1', unchecked_value = '0'
+      def initialize view, builder = nil, attribute_name = nil, options = {}
         super view, builder, attribute_name, options
+        @checked_value = @options.delete(:checked_value)
+        @unchecked_value = @options.delete(:unchecked_value)
         @checked = @options.delete(:checked)
-        @checked_value = checked_value
-        @unchecked_value = unchecked_value
+        @disabled = @options.delete(:disabled)
       end
 
       def self.component_name
@@ -18,9 +19,12 @@ module TaoForm
       def render &block
         if block_given?
           super
-        else
+        elsif builder && attribute_name
           super {
-            builder.check_box attribute_name, {checked: checked}, checked_value, unchecked_value
+            builder.check_box attribute_name, {
+              checked: checked,
+              disabled: disabled
+            }, checked_value, unchecked_value
           }
         end
       end

data/lib/tao_form/components/datetime_picker_component.rb

@@ -2,13 +2,15 @@ module TaoForm
   module Components
     class DatetimePickerComponent < FieldComponent
 
-      attr_reader :html_options, :disabled, :value
+      attr_reader :disabled, :value, :date_picker_options, :time_picker_options
 
-      def initialize view, builder, attribute_name, options = {}, html_options = {}
+      def initialize view, builder, attribute_name, options = {}
         super view, builder, attribute_name, options
-        @html_options = transform_html_options html_options
-        @value = @html_options.delete(:value)
-        @disabled = @html_options[:disabled].presence || false
+        @value = @options.delete(:value)
+        @disabled = @options[:disabled].presence || false
+
+        init_date_picker_options
+        init_time_picker_options
       end
 
       def render &block
@@ -22,22 +24,13 @@ module TaoForm
       end
 
       def render_date_picker
-        date_options = {
-          placeholder: options[:date_placeholder]
-        }
-        date_html_options = {disabled: disabled}
-        view.tao_date_picker nil, nil, date_options, date_html_options do
+        view.tao_date_picker date_picker_options do
           view.date_field_tag nil, nil, class: 'date-field', disabled: disabled
         end
       end
 
       def render_time_picker
-        time_options = {
-          placeholder: options[:time_placeholder],
-          minute_step: options[:minute_step]
-        }
-        time_html_options = {disabled: disabled}
-        view.tao_time_picker nil, nil, time_options, time_html_options do
+        view.tao_time_picker time_picker_options do
           view.time_field_tag nil, nil, class: 'time-field', disabled: disabled
         end
       end
@@ -46,6 +39,34 @@ module TaoForm
         :datetime_picker
       end
 
+      private
+
+      def init_date_picker_options
+        @date_picker_options = {
+          placeholder: options.delete(:date_placeholder),
+          disabled: disabled
+        }
+
+        if options.key?(:date_icon)
+          @date_picker_options[:date_icon] = options.delete(:date_icon)
+        end
+      end
+
+      def init_time_picker_options
+        @time_picker_options = {
+          placeholder: options.delete(:time_placeholder),
+          disabled: disabled
+        }
+
+        if options.key?(:time_icon)
+          @time_picker_options[:time_icon] = options.delete(:time_icon)
+        end
+
+        if options.key?(:minute_step)
+          @time_picker_options[:minute_step] = options.delete(:minute_step)
+        end
+      end
+
     end
   end
 end

data/lib/tao_form/components/field_component.rb

@@ -4,7 +4,13 @@ module TaoForm
 
       attr_reader :builder, :attribute_name
 
-      def initialize view, builder, attribute_name, options = {}
+      def initialize view, builder = nil, attribute_name = nil, options = {}
+        if builder.is_a? Hash
+          options = builder
+          builder = nil
+          attribute_name = nil
+        end
+
         super view, options
         @builder = builder
         @attribute_name = attribute_name

data/lib/tao_form/components/moment_picker/base.rb

@@ -7,15 +7,14 @@ module TaoForm
     module MomentPicker
       class Base < TaoForm::Components::FieldComponent
 
-        attr_reader :placeholder, :disabled, :html_options, :block_for_render, :value
+        attr_reader :block_for_render, :result_options
 
-        def initialize view, builder, attribute_name, options = {}, html_options = {}
+        def initialize view, builder = nil, attribute_name = nil, options = {}
           super view, builder, attribute_name, options
-          @html_options = transform_html_options default_html_options, html_options
-          @value = @html_options.delete(:value)
-          @disabled = @html_options[:disabled].presence || false
+          init_result_options
         end
 
+
         def input_type
           # to be implemented
         end
@@ -35,8 +34,7 @@ module TaoForm
 
         def render_result
           view.tao_moment_picker_result(
-            builder, attribute_name, input_type: input_type, icon: options[:icon],
-            placeholder: placeholder, disabled: disabled, value: value, &block_for_render
+            builder, attribute_name, result_options, &block_for_render
           )
         end
 
@@ -46,21 +44,23 @@ module TaoForm
         end
 
         def placeholder
-          @placeholder ||= if options[:placeholder].present?
-            options[:placeholder]
-          else
-            t :placeholder
-          end
+          @placeholder ||= options.delete(:placeholder) || t(:placeholder)
         end
 
         private
 
-        def default_options
-          {icon: :calendar}
+        def init_result_options
+          @result_options = {
+            input_type: input_type,
+            placeholder: placeholder,
+            icon: options.delete(:icon),
+            disabled: options[:disabled],
+            value: options.delete(:value)
+          }
         end
 
-        def default_html_options
-          {class: 'moment-picker'}
+        def default_options
+          {icon: :calendar, class: 'moment-picker'}
         end
 
       end

data/lib/tao_form/components/moment_picker/result_component.rb

@@ -3,18 +3,20 @@ module TaoForm
     module MomentPicker
       class ResultComponent < TaoForm::Components::FieldComponent
 
-        attr_reader :input_type, :value
+        attr_reader :input_type, :value, :icon, :placeholder
 
-        def initialize view, builder, attribute_name, options = {}
+        def initialize view, builder = nil, attribute_name = nil, options = {}
+          super view, builder, attribute_name, options
           @input_type = options.delete(:input_type)
           @value = options.delete(:value)
-          super view, builder, attribute_name, options
+          @icon = options.delete(:icon)
+          @placeholder = options.delete(:placeholder)
         end
 
         def render &block
           if block_given?
             super
-          else
+          elsif builder && attribute_name
             super {
               builder.send :"#{input_type}_field", attribute_name,
                 {disabled: options[:disabled], value: value}

data/lib/tao_form/components/moment_picker/segments/minute_segment_component.rb

@@ -8,7 +8,7 @@ module TaoForm
 
           def initialize view, options = {}
             super view, options
-            @step = options[:step].presence || 5
+            @step = options.delete(:step)
           end
 
           def self.component_name

data/lib/tao_form/components/radio_button_component.rb

@@ -2,13 +2,14 @@ module TaoForm
   module Components
     class RadioButtonComponent < FieldComponent
 
-      attr_reader :checked_value, :unchecked_value, :checked
+      attr_reader :checked_value, :unchecked_value, :checked, :disabled
 
-      def initialize view, builder = nil, attribute_name = nil, options = {}, checked_value = '1', unchecked_value = '0'
+      def initialize view, builder = nil, attribute_name = nil, options = {}
         super view, builder, attribute_name, options
+        @checked_value = @options.delete(:checked_value)
+        @unchecked_value = @options.delete(:unchecked_value)
         @checked = @options.delete(:checked)
-        @checked_value = checked_value
-        @unchecked_value = unchecked_value
+        @disabled = @options.delete(:disabled)
       end
 
       def self.component_name
@@ -20,7 +21,10 @@ module TaoForm
           super
         else
           super {
-            builder.radio_button attribute_name, {checked: checked}, checked_value, unchecked_value
+            builder.radio_button attribute_name, {
+              checked: checked,
+              disabled: disabled
+            }, checked_value, unchecked_value
           }
         end
       end

data/lib/tao_form/components/select/list_component.rb

@@ -3,20 +3,16 @@ module TaoForm
     module Select
       class ListComponent < TaoOnRails::Components::Base
 
-        def initialize view, options = {}
-          super view, options
-
-          if html_options[:class].present?
-            html_options[:class] += " select-list"
-          else
-            html_options[:class] = "select-list"
-          end
-        end
-
         def self.component_name
           :select_list
         end
 
+        private
+
+        def default_options
+          {class: 'select-list'}
+        end
+
       end
     end
   end

data/lib/tao_form/components/select/multiple_result_component.rb

@@ -1,14 +1,26 @@
 module TaoForm
   module Components
     module Select
-      class MultipleResultComponent < ResultComponent
+      class MultipleResultComponent < TaoForm::Components::FieldComponent
+
+        attr_reader :choices, :field_options
+
+        def initialize view, builder, attribute_name, choices = nil, options = {}
+          super view, builder, attribute_name, options
+          @choices = choices
+
+          init_field_options
+        end
 
         def render &block
           if block_given?
             super
-          else
+          elsif builder && attribute_name
             super {
-              builder.select attribute_name, choices, options, {multiple: true}
+              builder.select attribute_name, choices, field_options, {
+                disabled: options[:disabled],
+                multiple: true
+              }
             }
           end
         end
@@ -17,6 +29,20 @@ module TaoForm
           :multiple_select_result
         end
 
+        private
+
+        def init_field_options
+          @field_options = {
+            disabled: options.delete(:option_disabled),
+            include_blank: options.delete(:include_blank),
+            prompt: options.delete(:prompt)
+          }
+        end
+
+        def default_options
+          {class: 'select-result'}
+        end
+
       end
     end
   end

data/lib/tao_form/components/select/result_component.rb

@@ -3,25 +3,23 @@ module TaoForm
     module Select
       class ResultComponent < TaoForm::Components::FieldComponent
 
-        attr_reader :choices, :html_options
+        attr_reader :choices, :field_options, :placeholder
 
-        def initialize view, builder, attribute_name, choices = nil, options = {}, html_options
+        def initialize view, builder, attribute_name, choices = nil, options = {}
           super view, builder, attribute_name, options
           @choices = choices
-          @html_options = transform_html_options html_options
+          @placeholder = options.delete(:placeholder)
 
-          if @html_options[:class].present?
-            @html_options[:class] += " select-result"
-          else
-            @html_options[:class] = "select-result"
-          end
+          init_field_options
         end
 
         def render &block
           if block_given?
             super
-          else
-            super {builder.select attribute_name, choices, options}
+          elsif builder && attribute_name
+            super {
+              builder.select attribute_name, choices, field_options, {disabled: options[:disabled]}
+            }
           end
         end
 
@@ -29,6 +27,20 @@ module TaoForm
           :select_result
         end
 
+        private
+
+        def init_field_options
+          @field_options = {
+            disabled: options.delete(:option_disabled),
+            include_blank: options.delete(:include_blank),
+            prompt: options.delete(:prompt)
+          }
+        end
+
+        def default_options
+          {class: 'select-result'}
+        end
+
       end
     end
   end

data/lib/tao_form/components/select_component.rb

@@ -6,23 +6,16 @@ module TaoForm
   module Components
     class SelectComponent < FieldComponent
 
-      attr_reader :choices, :html_options, :disabled, :multiple, :max_list_size, :block_for_render
+      attr_reader :choices, :multiple, :result_options, :list_options, :block_for_render
 
-      def initialize view, builder, attribute_name, choices = nil, options = {}, html_options = {}
+      def initialize view, builder = nil, attribute_name = nil, choices = nil, options = {}
         super view, builder, attribute_name, options
         @choices = choices
-        @max_list_size = html_options.delete(:max_list_size)
-        @disabled = html_options[:disabled].presence || false
-        @multiple = @options.delete(:multiple) || html_options.delete(:multiple) || false
+        @multiple = @options[:multiple].presence || false
 
-        html_options[:multiple] = @multiple
-        html_options[:remote] = @options.delete(:remote)
-
-        if html_options[:remote].present? && html_options[:remote].is_a?(Hash)
-          html_options[:remote] = html_options[:remote].to_json
-        end
-
-        @html_options = transform_html_options html_options
+        init_result_options
+        init_list_options
+        init_remote_options
       end
 
       def render &block
@@ -31,33 +24,25 @@ module TaoForm
       end
 
       def render_result
-        if multiple
-          view.tao_multiple_select_result(
-            builder, attribute_name, choices, options, disabled: disabled, &block_for_render
-          )
-        else
-          view.tao_select_result(
-            builder, attribute_name, choices, options,
-            placeholder: placeholder, clearable: clearable, disabled: disabled, &block_for_render
-          )
-        end
+        result_method = multiple ? :tao_multiple_select_result : :tao_select_result
+        view.send(result_method, builder, attribute_name, choices, result_options, &block_for_render)
       end
 
       def render_list
-        view.tao_select_list max_list_size: max_list_size
+        view.tao_select_list list_options
       end
 
       def clearable
-        @clearable ||= options[:include_blank].present? || options[:prompt].present?
+        @clearable ||= options.delete(:clearable) || result_options[:include_blank].present? || result_options[:prompt].present?
       end
 
       def placeholder
-        @placeholder ||= if options[:placeholder].present?
-          options[:placeholder]
-        elsif options[:include_blank].present? && options[:include_blank].is_a?(String)
-          options[:include_blank]
-        elsif options[:prompt].present? && options[:prompt].is_a?(String)
-          options[:prompt]
+        @placeholder ||= if (text = options.delete(:placeholder))
+          text
+        elsif result_options[:include_blank].present? && result_options[:include_blank].is_a?(String)
+          result_options[:include_blank]
+        elsif result_options[:prompt].present? && result_options[:prompt].is_a?(String)
+          result_options[:prompt]
         else
           t :placeholder
         end
@@ -69,8 +54,32 @@ module TaoForm
 
       private
 
-      def default_options
-        {icon: :arrow_down}
+      def init_result_options
+        @result_options = {
+          disabled: options.delete(:disabled),
+          option_disabled: options.delete(:option_disabled),
+          include_blank: options.delete(:include_blank),
+          prompt: options.delete(:prompt)
+        }
+
+        unless multiple
+          @result_options.merge!({
+            placeholder: placeholder,
+            clearable: clearable
+          })
+        end
+      end
+
+      def init_list_options
+        @list_options = {
+          max_list_size: options.delete(:max_list_size)
+        }
+      end
+
+      def init_remote_options
+        if options[:remote].present? && options[:remote].is_a?(Hash)
+          options[:remote] = options[:remote].to_json
+        end
       end
 
     end

data/lib/tao_form/components/time_picker_component.rb

@@ -21,7 +21,7 @@ module TaoForm
       private
 
       def default_options
-        super.merge({icon: :clock})
+        super.merge({icon: :clock, minute_step: 5})
       end
 
     end

data/lib/tao_form/inputs/boolean_input.rb

@@ -3,19 +3,12 @@ module TaoForm
     class BooleanInput < ::SimpleForm::Inputs::BooleanInput
 
       def input(wrapper_options = nil)
-        merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
+        merged_html_options = merge_wrapper_options(input_html_options, wrapper_options)
+        merged_component_options = component_options.merge(merged_html_options)
 
-        if switch?
-          input_content = template.tao_switch(
-            @builder, attribute_name, merged_input_options,
-            checked_value, unchecked_value
-          )
-        else
-          input_content = template.tao_check_box(
-            @builder, attribute_name, merged_input_options,
-            checked_value, unchecked_value
-          )
-        end
+        input_content = template.send(switch? ? :tao_switch : :tao_check_box,
+          @builder, attribute_name, merged_component_options
+        )
 
         template.content_tag(:div, input_content, class: 'boolean-field')
       end
@@ -25,6 +18,14 @@ module TaoForm
       def switch?
         input_options[:switch]
       end
+
+      def component_options
+        @component_options ||= {
+          disabled: input_options[:disabled],
+          checked_value: checked_value,
+          unchecked_value: unchecked_value
+        }
+      end
     end
   end
 end

data/lib/tao_form/inputs/collection_select_input.rb

@@ -4,18 +4,35 @@ module TaoForm
 
       def input(wrapper_options = nil)
         label_method, value_method = detect_collection_methods
+        merged_html_options = merge_wrapper_options(input_html_options, wrapper_options)
+        merged_component_options = component_options.merge(merged_html_options)
 
-        merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
-        multiple = input_options[:multiple] || merged_input_options[:multiple] || false
-        input_options[:icon] = :arrow_right
-
-        template.send :tao_select, @builder, attribute_name, nil, input_options, merged_input_options do
+        template.send :tao_select, merged_component_options do
           @builder.collection_select(
-            attribute_name, collection, value_method, label_method, input_options, {multiple: multiple}
+            attribute_name, collection, value_method, label_method, field_options, {
+              multiple: merged_component_options[:multiple],
+              disabled: merged_component_options[:disabled]
+            }
           )
         end
       end
 
+      private
+
+      def component_options
+        @component_options ||= input_options.slice(:multiple, :remote, :max_list_size,
+          :searchable_size, :clearable, :placeholder, :disabled, :option_disabled,
+          :include_blank, :prompt)
+      end
+
+      def field_options
+        @field_options ||= begin
+          opts = input_options.slice(:selected, :option_disabled, :include_blank, :prompt)
+          opts[:disabled] = opts.delete(:option_disabled)
+          opts
+        end
+      end
+
     end
   end
 end

data/lib/tao_form/inputs/date_time_input.rb

@@ -3,11 +3,10 @@ module TaoForm
     class DateTimeInput < ::SimpleForm::Inputs::DateTimeInput
 
       def input(wrapper_options = nil)
-        merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
-
+        merged_html_options = merge_wrapper_options(input_html_options, wrapper_options)
+        merged_component_options = component_options.merge(merged_html_options)
         template.send(
-          :"tao_#{input_type}_picker", @builder, attribute_name,
-          input_options, merged_input_options
+          :"tao_#{input_type}_picker", @builder, attribute_name, merged_component_options
         )
       end
 
@@ -17,6 +16,14 @@ module TaoForm
         true
       end
 
+      def component_options
+        @component_options ||= input_options.slice(
+          :value_format, :display_format, :date_display_format, :time_display_format,
+          :date_placeholder, :time_placeholder, :placeholder, :icon, :disabled,
+          :value, :minute_step, :date_icon, :time_icon
+        )
+      end
+
     end
   end
 end

data/lib/tao_form/inputs/grouped_collection_select_input.rb

@@ -4,19 +4,36 @@ module TaoForm
 
       def input(wrapper_options = nil)
         label_method, value_method = detect_collection_methods
+        merged_html_options = merge_wrapper_options(input_html_options, wrapper_options)
+        merged_component_options = component_options.merge(merged_html_options)
 
-        merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
-        multiple = input_options[:multiple] || merged_input_options[:multiple] || false
-        input_options[:icon] = :arrow_right
-
-        template.send :tao_select, @builder, attribute_name, nil, input_options, merged_input_options do
+        template.send :tao_select, merged_component_options do
           @builder.grouped_collection_select(
             attribute_name, grouped_collection, group_method, group_label_method,
-            value_method, label_method, input_options, {multiple: multiple}
+            value_method, label_method, field_options, {
+              multiple: merged_component_options[:multiple],
+              disabled: merged_component_options[:disabled]
+            }
           )
         end
       end
 
+      private
+
+      def component_options
+        @component_options ||= input_options.slice(:multiple, :remote, :max_list_size,
+          :searchable_size, :clearable, :placeholder, :disabled, :option_disabled,
+          :include_blank, :prompt, :icon)
+      end
+
+      def field_options
+        @field_options ||= begin
+          opts = input_options.slice(:selected, :option_disabled, :include_blank, :prompt)
+          opts[:disabled] = opts.delete(:option_disabled)
+          opts
+        end
+      end
+
     end
   end
 end

data/lib/tao_form/version.rb

@@ -1,3 +1,3 @@
 module TaoForm
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/lib/views/components/tao_form/components/_moment_picker.html+mobile.erb

@@ -1,7 +1,7 @@
 <%= content_tag component.tag_name, component.html_options do %>
   <%= component.render_result %>
 
-  <%= tao_slide_box direction: 'rtl', size: '-40', with_close_button: false, class: 'slide-box' do %>
+  <%= tao_slide_box direction: 'rtl', size: '-40', without_padding: true, modal: true, class: 'slide-box' do %>
     <div class="header">
       <div class="left">
         <%= link_to 'javascript:;', class: 'link-close', title: I18n.t('tao_form.components.moment_picker.close') do %>

data/lib/views/components/tao_form/components/_select.html+mobile.erb

@@ -3,11 +3,11 @@
     <div class="selected-text"></div>
     <div class="placeholder"><%= component.placeholder %></div>
     <div class="icon-wrapper">
-      <%= tao_icon component.options[:icon] %>
+      <%= tao_icon :arrow_right %>
     </div>
   </div>
 
-  <%= tao_slide_box direction: 'rtl', size: '-40', with_close_button: false, class: 'slide-box' do %>
+  <%= tao_slide_box direction: 'rtl', size: '-40', without_padding: true, modal: true, class: 'slide-box' do %>
     <div class="header">
       <div class="left">
         <%= link_to 'javascript:;', class: 'link-close', title: component.t(:close) do %>

data/lib/views/components/tao_form/components/moment_picker/_result.html.erb

@@ -1,12 +1,12 @@
 <%= content_tag component.tag_name, component.html_options do %>
   <%= yield %>
   <div class="icon-wrapper">
-    <%= tao_icon component.options[:icon] %>
+    <%= tao_icon component.icon %>
   </div>
   <div class="result-text">
   </div>
   <div class="placeholder">
-    <%= component.html_options[:placeholder].presence %>
+    <%= component.placeholder %>
   </div>
   <%= link_to 'javascript:;', tabindex: '-1', class: 'link-clear', title: component.t(:clear_option) do %>
     <%= tao_icon :close %>

data/lib/views/components/tao_form/components/select/_multiple_result.html.erb

@@ -2,6 +2,6 @@
   <%= yield %>
   <%= link_to 'javascript:;', class: 'link-add' do %>
     <span class="icon-add">&#65291;</span>
-    <%= component.t(:add) %>
+    <span class="text"><%= component.t(:add) %></span>
   <% end %>
 <% end %>

data/lib/views/components/tao_form/components/select/_result.html+mobile.erb

@@ -2,7 +2,7 @@
   <%= yield %>
   <%= link_to 'javascript:;', class: 'link-clear' do %>
     <span>
-      <%= component.t :clear_selected %>: 
+      <%= component.t :clear_selected %>:
       <span class="selected-text"></span>
     </span>
     <%= tao_icon :close %>

data/lib/views/components/tao_form/components/select/_result.html.erb

@@ -3,7 +3,7 @@
   <div class="selected-text">
   </div>
   <div class="placeholder">
-    <%= component.html_options[:placeholder].presence %>
+    <%= component.placeholder %>
   </div>
   <div class="icon-wrapper">
     <%= tao_icon :arrow_down %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tao_form
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - your name
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-15 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tao_on_rails