effective_bootstrap 0.7.4 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c17d12fa1cdbbf137c2ceeadd2706db1585a4ffff943af7eb94eab2ce7901b3
-  data.tar.gz: 740cf700d5cda6a9befc85ab28f9155c359e71d7a53a838b7a10879420ef5ab4
+  metadata.gz: fd2b4a321ad92d428321ae94d2b26875a047f209c3b3842ca4f4be921b76071d
+  data.tar.gz: fe91e9b1898dfb4286470bacf83b7ab09f12b091aa1218109d432c330f991493
 SHA512:
-  metadata.gz: 0d3ef5647d976c17ec55672041e646455e5f415eb26236539ddd60a5e724be1c87fe80b95755b743ad5d7eec04ff1b3572abaeb6924c0a3b8a67c85139ce07cc
-  data.tar.gz: 9c2d35ebb17967f306cf8fbd8c4b75772851598cbefbdc808f5b8d91123c396adf37d8efa30530d20f37b09d597d9868abd2df486d7bac5886cb54c084d0f474
+  metadata.gz: 99b921f38e9cc727b520012cb0b4621c127c51dde6491ee69ad297060368af741df1a9b8df83141ff8a84007ffab0f8484e66c53bf03ae0796b1bc1782b6d4bf
+  data.tar.gz: 03422e1c8f7ab703916ce5a0473266d23560e4ad485306acf01aecb387ca4b94a390b3d87b0f6cd7b282a74a4a634755c0f39889c4f198992512efbbd973e67b

data/README.md

@@ -229,6 +229,8 @@ As well, you can specify `layout: :vertical`, `layout: :horizontal`, or `layout:
 
 The default is `layout: :vertical`.
 
+If you would like each form and its fields to have unique ids, use `unique_ids: true`.
+
 All standard form fields have been implemented as per [Rails 5.1 FormHelper](http://api.rubyonrails.org/v5.1/classes/ActionView/Helpers/FormHelper.html)
 
 When working as a `remote: true` form, you can also pass `flash_success: true|false` and `flash_error: true|false` to control the flash behaviour. By default, the errors will be displayed, and the success will be hidden.

data/app/assets/images/icons/microsoft.svg

@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Microsoft Azure icon</title><path d="M5.483 21.3H24L14.025 4.013l-3.038 8.347 5.836 6.938L5.483 21.3zM13.23 2.7L6.105 8.677 0 19.253h5.505v.014L13.23 2.7z"/></svg>

data/app/assets/javascripts/effective_bootstrap/confirm.js.coffee.erb

@@ -1,6 +1,6 @@
-# These next three methods hijack jquery_ujs data-confirm and do it our own way with a double click confirm
+# These next three methods hijack rails/ujs and jquery_ujs data-confirm and do it our own way with a double click confirm
 
-if <%= !!EffectiveBootstrap.use_custom_data_confirm %> && $.rails
+if <%= !!EffectiveBootstrap.use_custom_data_confirm %> && (window.Rails || $.rails)
   $(document).on 'confirm', (event) ->
     $obj = $(event.target)
 
@@ -18,6 +18,11 @@ if <%= !!EffectiveBootstrap.use_custom_data_confirm %> && $.rails
         , 4000)
       false # don't show the confirmation dialog
 
-  $.rails.confirm = (message) -> true 
-  $.rails.effective_bootstrap_custom_data_confirm = true
-  $(document).on 'confirm:complete', (event) -> $(event.target).data('confirmed')
+  (window.Rails || $.rails).confirm = (message) -> true
+  (window.Rails || $.rails).effective_bootstrap_custom_data_confirm = true
+
+  $(document).on 'confirm:complete', (event) -> $(event.target).data('confirmed')
+
+  $(document).on 'click', 'a.dropdown-item[data-confirm]', (event) ->
+    event.preventDefault()
+    false

data/app/helpers/effective_bootstrap_helper.rb

@@ -121,7 +121,7 @@ module EffectiveBootstrapHelper
   def dots(options = nil, &block)
     (options ||= {})[:class] = "dropdown dropdown-dots #{options.delete(:class)}".strip
 
-    content_tag(:span, options) do
+    content_tag(:div, options) do
       content_tag(:button, class: "btn btn-dots dropdown-toggle #{options.delete(:button_class)}", 'aria-expanded': true, 'aria-haspopup': true, 'data-toggle': 'dropdown', type: 'button') do
       end + content_tag(:div, capture(&block), class: 'dropdown-menu')
     end
@@ -154,11 +154,13 @@ module EffectiveBootstrapHelper
   end
 
   # Works with dots ao and dropdown do
-  def dropdown_divider
+  def dropdown_divider(options = {})
+    options[:class] = [options[:class], 'dropdown-divider'].compact.join(' ')
+
     unless @_dropdown_link_tos
-      content_tag(:div, '', class: 'dropdown-divider')
+      content_tag(:div, '', options)
     else
-      @_dropdown_link_tos << content_tag(:div, '', class: 'dropdown-divider')
+      @_dropdown_link_tos << content_tag(:div, '', options)
       nil
     end
   end

data/app/helpers/effective_form_builder_helper.rb

@@ -1,9 +1,9 @@
 module EffectiveFormBuilderHelper
   def effective_form_with(**options, &block)
-
     # Compute the default ID
     subject = Array(options[:scope] || options[:model]).last
     class_name = subject.class.name.underscore
+    unique_id = options.except(:model).hash.abs
 
     html_id = if subject.kind_of?(Symbol)
       subject.to_s
@@ -14,9 +14,6 @@ module EffectiveFormBuilderHelper
     end
 
     options[:html] = (options[:html] || {}).merge(novalidate: true, onsubmit: 'return EffectiveForm.validate(this)')
-
-    remote_index = options.except(:model).hash.abs
-
     options[:local] = true unless options.key?(:local)
 
     if respond_to?(:inline_datatable?) && inline_datatable?
@@ -33,21 +30,27 @@ module EffectiveFormBuilderHelper
       ('hide-flash-danger' if options[:remote] && options.key?(:flash_error) && !options[:flash_error])
     ].compact.join(' ')
 
-    if options.delete(:remote) == true
-      @_effective_remote_index ||= {}
-      remote_index = remote_index + 1 if @_effective_remote_index[remote_index]
+    if options[:remote] || options[:unique_ids]
+      @_effective_unique_id ||= {}
+
+      if @_effective_unique_id.key?(unique_id)
+        unique_id = unique_id + @_effective_unique_id.length
+      end
 
+      options[:unique_id] = unique_id
+      html_id = "#{html_id}_#{unique_id}"
+
+      @_effective_unique_id[unique_id] = true
+    end
+
+    if options.delete(:remote) == true
       if options[:html][:data].kind_of?(Hash)
         options[:html][:data][:remote] = true
-        options[:html][:data]['data-remote-index'] = remote_index
+        options[:html][:data]['data-remote-index'] = unique_id
       else
         options[:html]['data-remote'] = true
-        options[:html]['data-remote-index'] = remote_index
+        options[:html]['data-remote-index'] = unique_id
       end
-
-      html_id = "#{html_id}_#{remote_index}"
-
-      @_effective_remote_index[remote_index] = true
     end
 
     # Assign default ID

data/app/models/effective/form_builder.rb

@@ -20,6 +20,7 @@ module Effective
     alias_method :super_number_field, :number_field
     alias_method :super_text_field, :text_field
     alias_method :super_text_area, :text_area
+    alias_method :super_hidden_field, :hidden_field
 
     def clear(name = 'Clear', options = {})
       (options = name; name = 'Clear') if name.kind_of?(Hash)
@@ -85,6 +86,10 @@ module Effective
       Effective::FormInputs::FormGroup.new(name, options, builder: self).to_html(&block)
     end
 
+    def hidden_field(name = nil, options = {})
+      Effective::FormInputs::HiddenField.new(name, options, builder: self).to_html
+    end
+
     def integer_field(name, options = {})
       Effective::FormInputs::IntegerField.new(name, options, builder: self).to_html
     end
@@ -196,4 +201,3 @@ module Effective
 
   end
 end
-

data/app/models/effective/form_input.rb

@@ -7,7 +7,7 @@ module Effective
     EXCLUSIVE_CLASS_SUFFIXES = ['-primary', '-secondary', '-success', '-danger', '-warning', '-info', '-light', '-dark']
 
     delegate :object, to: :@builder
-    delegate :capture, :content_tag, :link_to, :icon, :asset_path, to: :@template
+    delegate :capture, :content_tag, :image_tag, :link_to, :icon, :asset_path, to: :@template
 
     # So this takes in the options for an entire form group.
     def initialize(name, options, builder:, html_options: nil)
@@ -24,7 +24,7 @@ module Effective
     end
 
     def input_html_options
-      { class: 'form-control' }
+      { class: 'form-control', id: tag_id }
     end
 
     def input_js_options
@@ -408,7 +408,7 @@ module Effective
 
     # https://github.com/rails/rails/blob/master/actionview/lib/action_view/helpers/tags/base.rb#L120
     def tag_id(index = nil)
-      case
+      id = case
       when @builder.object_name.empty?
         sanitized_method_name.dup
       when index
@@ -416,6 +416,8 @@ module Effective
       else
         "#{sanitized_object_name}_#{sanitized_method_name}"
       end.downcase.parameterize
+
+      @builder.options[:unique_ids] ? "#{id}_#{@builder.options[:unique_id]}" : id
     end
 
     def sanitized_object_name

data/app/models/effective/form_inputs/clear.rb

@@ -9,7 +9,7 @@ module Effective
       end
 
       def input_html_options
-        { class: 'btn btn-primary', type: 'clear' }
+        { class: 'btn btn-primary', type: 'clear', id: tag_id }
       end
 
       def icon_name

data/app/models/effective/form_inputs/collection_input.rb

@@ -36,7 +36,7 @@ module Effective
 
         @collection_options = {
           checked: [checked, selected, polymorphic_value, value].find { |value| value != nil },
-          selected: [selected, checked, polymorphic_value, value].find { |value| value != nil },
+          selected: ([selected, checked, polymorphic_value, value].find { |value| value != nil } unless kind_of?(Effective::FormInputs::Radios)),
           include_blank: include_blank
         }.compact
       end

data/app/models/effective/form_inputs/date_field.rb

@@ -5,7 +5,8 @@ module Effective
       def input_html_options
         {
           class: ['form-control', 'effective_date_time_picker', 'effective_date', ('not-date-linked' if not_date_linked?)].compact.join(' '),
-          pattern: pattern
+          pattern: pattern,
+          id: tag_id
         }
       end
 

data/app/models/effective/form_inputs/datetime_field.rb

@@ -5,7 +5,8 @@ module Effective
       def input_html_options
         {
           class: ['form-control', 'effective_date_time_picker', 'effective_datetime', ('not-date-linked' if not_date_linked?)].compact.join(' '),
-          pattern: pattern
+          pattern: pattern,
+          id: tag_id
         }
       end
 

data/app/models/effective/form_inputs/delete.rb

@@ -14,7 +14,11 @@ module Effective
       end
 
       def input_html_options
-        { class: 'btn btn-warning', data: { method: :delete, remote: true, confirm: "Really delete<br>#{object}?".html_safe } }
+        {
+          class: 'btn btn-warning',
+          id: tag_id,
+          data: { method: :delete, remote: true, confirm: "Really delete<br>#{object}?".html_safe }
+        }
       end
 
       def border?

data/app/models/effective/form_inputs/email_cc_field.rb

@@ -7,7 +7,7 @@ module Effective
       end
 
       def input_html_options
-        { class: 'form-control', placeholder: 'one@example.com,two@example.com' }
+        { class: 'form-control', placeholder: 'one@example.com,two@example.com', id: tag_id }
       end
 
       def input_group_options

data/app/models/effective/form_inputs/email_field.rb

@@ -3,7 +3,7 @@ module Effective
     class EmailField < Effective::FormInput
 
       def input_html_options
-        { class: 'form-control', placeholder: 'someone@example.com' }
+        { class: 'form-control', placeholder: 'someone@example.com', id: tag_id }
       end
 
       def input_group_options

data/app/models/effective/form_inputs/error_field.rb

@@ -3,7 +3,7 @@ module Effective
     class ErrorField < Effective::FormInput
 
       def input_html_options
-        { class: 'alert alert-danger' }
+        { class: 'alert alert-danger', id: tag_id }
       end
 
       def to_html(&block)

data/app/models/effective/form_inputs/file_field.rb

@@ -15,6 +15,7 @@ module Effective
 
       def input_html_options
         {
+          id: tag_id,
           class: 'form-control form-control-file btn-outline-secondary',
           multiple: multiple?,
           direct_upload: true,
@@ -93,7 +94,7 @@ module Effective
           content_tag(:div, class: 'card mb-3') do
             if attachment.image?
               content_tag(:div, class: 'card-body') do
-                content_tag(:img, '', class: 'img-fluid', src: url, alt: attachment.filename.to_s) +
+                image_tag(url, alt: attachment.filename.to_s, class: 'img-fluid') +
                 link_to(attachment.filename, url, class: 'card-link')
               end
             else

data/app/models/effective/form_inputs/float_field.rb

@@ -7,7 +7,12 @@ module Effective
       end
 
       def input_html_options
-        { class: 'form-control effective_float', autocomplete: 'off', step: '0.01' }
+        {
+          class: 'form-control effective_float',
+          autocomplete: 'off',
+          step: '0.01',
+          id: tag_id
+        }
       end
 
       # This has gotta be a valid pattern

data/app/models/effective/form_inputs/hidden_field.rb

@@ -0,0 +1,11 @@
+module Effective
+  module FormInputs
+    class HiddenField < Effective::FormInput
+
+      def to_html(&block)
+        @builder.super_hidden_field(name, options[:input].except(:class, :required))
+      end
+
+    end
+  end
+end

data/app/models/effective/form_inputs/integer_field.rb

@@ -7,7 +7,7 @@ module Effective
       end
 
       def input_html_options
-        { class: 'form-control effective_integer', autocomplete: 'off' }
+        { class: 'form-control effective_integer', autocomplete: 'off', id: tag_id }
       end
 
       def value_to_i

data/app/models/effective/form_inputs/number_text_field.rb

@@ -7,7 +7,7 @@ module Effective
       end
 
       def input_html_options
-        { class: 'form-control effective_number_text', autocomplete: 'off' }
+        { class: 'form-control effective_number_text', autocomplete: 'off', id: tag_id }
       end
 
     end

data/app/models/effective/form_inputs/password_field.rb

@@ -3,7 +3,7 @@ module Effective
     class PasswordField < Effective::FormInput
 
       def input_html_options
-        { class: 'form-control' }
+        { class: 'form-control', id: tag_id }
       end
 
       def input_group_options

data/app/models/effective/form_inputs/percent_field.rb

@@ -12,7 +12,7 @@ module Effective
       end
 
       def input_html_options
-        { class: 'form-control effective_percent', autocomplete: 'off' }
+        { class: 'form-control effective_percent', autocomplete: 'off', id: tag_id }
       end
 
       # This has gotta be a valid pattern

data/app/models/effective/form_inputs/phone_field.rb

@@ -6,7 +6,7 @@ module Effective
       DEFAULT_CELL_MASK = '(999) 999-9999'
 
       def input_html_options
-        { class: 'form-control effective_phone', placeholder: '(555) 555-5555' }
+        { class: 'form-control effective_phone', placeholder: '(555) 555-5555', id: tag_id }
       end
 
       def input_js_options

data/app/models/effective/form_inputs/price_field.rb

@@ -12,7 +12,7 @@ module Effective
       end
 
       def input_html_options
-        { class: 'form-control effective_price', autocomplete: 'off' }
+        { class: 'form-control effective_price', autocomplete: 'off', id: tag_id }
       end
 
       private

data/app/models/effective/form_inputs/select.rb

@@ -57,7 +57,7 @@ module Effective
           ('disable-open-on-focus' if disable_open_on_focus?),
         ].compact.join(' ')
 
-        { class: classes, multiple: (true if multiple?), include_blank: (true if include_blank?), include_null: include_null }.compact
+        { class: classes, multiple: (true if multiple?), include_blank: (true if include_blank?), id: tag_id }.compact
       end
 
       def assign_options_collection!
@@ -142,7 +142,7 @@ module Effective
       def no_results
         return @no_results unless @no_results.nil?
 
-        @no_results = options.delete(:no_results) 
+        @no_results = options.delete(:no_results)
 
         if freeform?
           @no_results ||= 'No results. To create a new one, press ENTER after typing your own free form response.'
@@ -160,7 +160,7 @@ module Effective
         obj = options.delete(:placeholder)
 
         @placeholder = case obj
-        when nil then 
+        when nil then
           (freeform? ? 'Choose or enter' : 'Please choose')
         when false then ''
         else obj

data/app/models/effective/form_inputs/static_field.rb

@@ -3,7 +3,7 @@ module Effective
     class StaticField < Effective::FormInput
 
       def input_html_options
-        { class: 'form-control-plaintext', readonly: false }
+        { class: 'form-control-plaintext', readonly: false, id: tag_id }
       end
 
       def feedback_options

data/app/models/effective/form_inputs/text_area.rb

@@ -3,7 +3,7 @@ module Effective
     class TextArea < Effective::FormInput
 
       def input_html_options
-        { class: 'form-control', rows: 3 }
+        { class: 'form-control', rows: 3, id: tag_id }
       end
 
     end

data/app/models/effective/form_inputs/time_field.rb

@@ -5,7 +5,8 @@ module Effective
       def input_html_options
         {
           class: ['form-control', 'effective_date_time_picker', 'effective_time', ('not-date-linked' if not_date_linked?)].compact.join(' '),
-          pattern: pattern
+          pattern: pattern,
+          id: tag_id
         }
       end
 

data/app/models/effective/form_inputs/url_field.rb

@@ -3,7 +3,7 @@ module Effective
     class UrlField < Effective::FormInput
 
       def input_html_options
-        { class: 'form-control', placeholder: 'https://www.example.com' }
+        { class: 'form-control', placeholder: 'https://www.example.com', id: tag_id }
       end
 
       def input_group_options

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.7.4'.freeze
+  VERSION = '0.8.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-28 00:00:00.000000000 Z
+date: 2020-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -262,6 +262,7 @@ files:
 - app/assets/images/icons/message-square.svg
 - app/assets/images/icons/mic-off.svg
 - app/assets/images/icons/mic.svg
+- app/assets/images/icons/microsoft.svg
 - app/assets/images/icons/minimize-2.svg
 - app/assets/images/icons/minimize.svg
 - app/assets/images/icons/minus-circle.svg
@@ -609,6 +610,7 @@ files:
 - app/models/effective/form_inputs/file_field.rb
 - app/models/effective/form_inputs/float_field.rb
 - app/models/effective/form_inputs/form_group.rb
+- app/models/effective/form_inputs/hidden_field.rb
 - app/models/effective/form_inputs/integer_field.rb
 - app/models/effective/form_inputs/number_field.rb
 - app/models/effective/form_inputs/number_text_field.rb