effective_bootstrap 1.26.1 → 1.26.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ceb3bba806853497fb5290b90df0d1ad27710099de47f927b99b0037f6ce13ce
-  data.tar.gz: 8ac20f1907bdb52800c6330df1f36a51b36303bf05829c2a8f89b4a74d4c6002
+  metadata.gz: af1499bdd3b77b6451a0a196fb9c62e6e4139c5369ef49aa56a42f72cdc4f360
+  data.tar.gz: f9b452dbc296dc48db3e29132481a1bb917f5691603ffb31948236e12ab1cc39
 SHA512:
-  metadata.gz: a9bd10a1395c70a946df7cc8367190c7b21a4fd6f6ba65030384a1810c6479922aa7c5194d9c59e90eef5c33005b1f4d8f4544c9f068d53eea40580a539eda05
-  data.tar.gz: 2185a0c41f8063f37223ff1b10cc785da1d69656c400bf5fa14d424774b355a7643533987ed458a09bf9893f34ca971b474f2c249462e4c40c50e9bfdbc27c47
+  metadata.gz: 3cdc9f65d070e5f3539fa1670b8464e78cb32559c758e73ea944574f81e369c8dea237503ed63e0c880bc4023ca2f19d2dfd63813c14586b573937be7e838e06
+  data.tar.gz: e61dd1b4bdaaf2482e54412de96c78275828f84d8672570809264580610941736a48fca4c9c6e563b2505880c9ecc9ac3608bbf09c99ddf8bcafd724e1bbec3c

data/app/assets/javascripts/effective_bootstrap/form.js.coffee

@@ -6,7 +6,7 @@ this.EffectiveForm ||= new class
   remote_form_flash: ''               # Array of Arrays
   remote_form_redirect: ''            # String containing the redirect path (optional)
 
-  validate: (form) ->
+  validate: (form, event) ->
     $form = $(form)
     valid = form.checkValidity() && @allChecksValid($form)
 
@@ -14,13 +14,15 @@ this.EffectiveForm ||= new class
     @reset($form) if $form.hasClass('was-validated')
 
     if valid then @submitting($form) else @invalidate($form)
+    event?.stopImmediatePropagation() unless valid # Keep Rails UJS from disabling an invalid form.
     valid
 
   allChecksValid: ($form) ->
     valid = true
 
     $form.find('.effective-checks-required').each ->
-      valid = false unless $(@).find('input:checked').length > 0
+      $checks = $(@).find('input[type=checkbox]:enabled')
+      valid = false if $checks.length > 0 && $checks.filter(':checked').length == 0
     
     valid
 
@@ -43,7 +45,10 @@ this.EffectiveForm ||= new class
       $(@).addClass(if $(@).find('input:invalid').length > 0 then 'is-invalid' else 'is-valid')
 
     $form.find('.effective-checks-required').each ->
-      if $(@).find('input:checked').length > 0 
+      $checks = $(@).find('input[type=checkbox]:enabled')
+      if $checks.length == 0
+        $(@).removeClass('is-valid is-invalid')
+      else if $checks.filter(':checked').length > 0
         $(@).addClass('is-valid').removeClass('is-invalid') 
       else 
         $(@).addClass('is-invalid').removeClass('is-valid')

data/app/assets/javascripts/effective_bootstrap/logic.js.coffee

@@ -1,5 +1,13 @@
 elementSelector = 'input,textarea,select,button,div.form-has-many'
 
+enableFields = ($element) ->
+  $element.find(elementSelector).not($element.find('.effective-form-logic:hidden').find(elementSelector)).each ->
+    $input = $(this)
+    return if $input.closest('.marked-for-destruction').length > 0 && !$input.is("input[type=hidden][name$='[id]'],input[type=hidden][name$='[_destroy]']")
+    return if $input.is('.effective-file-remove-input') && !$input.closest('.effective-file-attachment--pending-removal').length
+    $input.removeAttr('disabled')
+
+
 # When multiple show_if blocks contain radio buttons with the same name, the browser only keeps the last one checked. 
 # If that radio is in a # hidden/disabled block, the visible block's radio won't be checked.
 # This syncs the checked state from disabled radios to their enabled counterparts.
@@ -34,7 +42,7 @@ syncDisabledRadioButtons = ($container) ->
       $element.find(elementSelector).prop('disabled', true)
     else
       $element.fadeIn()
-      $element.find(elementSelector).not($element.find('.effective-form-logic:hidden').find(elementSelector)).removeAttr('disabled')
+      enableFields($element)
       $element.find('textarea.effective_article_editor').each (i, editor) -> ArticleEditor('#' + $(editor).attr('id')).enable()
 
   # Maybe disable it now
@@ -48,11 +56,12 @@ syncDisabledRadioButtons = ($container) ->
   else
     $container = $element.closest('form,div.effective-datatables-filters')
 
-  $affects = $container.find("input[name='#{options.name}'],select[name='#{options.name}'],input[name='#{options.name}[]']")
+  $affects = $container.find("input[name='#{options.name}'],select[name='#{options.name}'],select[name='#{options.name}[]'],input[name='#{options.name}[]']")
 
   $affects.on 'change dp.change', (event) ->
     $target = $(event.target)
-    matches = ($target.val() == options.value)
+    selected = $target.val()
+    matches = if Array.isArray(selected) then selected.indexOf(options.value) != -1 else selected == options.value
 
     if $target.is("[type='checkbox']")
       if $target.attr('name').indexOf('[]') == -1
@@ -64,7 +73,7 @@ syncDisabledRadioButtons = ($container) ->
 
     if matches
       $element.fadeIn()
-      $element.find(elementSelector).not($element.find('.effective-form-logic:hidden').find(elementSelector)).removeAttr('disabled')
+      enableFields($element)
       $element.find('textarea.effective_article_editor').each (i, editor) -> ArticleEditor('#' + $(editor).attr('id')).enable()
     else
       $element.hide()
@@ -100,7 +109,7 @@ syncDisabledRadioButtons = ($container) ->
 
     if found
       $element.fadeIn()
-      $element.find(elementSelector).not($element.find('.effective-form-logic:hidden').find(elementSelector)).removeAttr('disabled')
+      enableFields($element)
       $element.find('textarea.effective_article_editor').each (i, editor) -> ArticleEditor('#' + $(editor).attr('id')).enable()
 
     else

data/app/assets/javascripts/effective_clipboard/initialize.js.coffee

@@ -1,4 +1,13 @@
+clipboard = null
+
+destroy = ->
+  clipboard?.destroy()
+  clipboard = null
+  $('.btn-clipboard-copy.initialized').off('click.effective-clipboard').removeClass('initialized').each ->
+    $(@).html($(@).data('clipboard-label'))
+
 initialize = ->
+  destroy()
   $buttons = $('.btn-clipboard-copy:not(.initialized)')
   return if $buttons.length == 0
 
@@ -10,10 +19,10 @@ initialize = ->
     $obj = $(event.trigger).text('Copied!').focus().blur()
     setTimeout((-> $obj.html($obj.data('clipboard-label'))), 1500)
 
-  $buttons.on 'click', (event) -> event.preventDefault()
+  $buttons.on 'click.effective-clipboard', (event) -> event.preventDefault()
 
   $buttons.addClass('initialized')
 
 $ -> initialize()
 $(document).on 'turbolinks:load turbo:load', -> initialize()
-$(document).on 'turbolinks:before-cache turbo:before-cache', -> $('.btn-clipboard-copy.initialized').removeClass('initialized')
+$(document).on 'turbolinks:before-cache turbo:before-cache', -> destroy()

data/app/assets/javascripts/effective_datetime/navigation.js.coffee

@@ -1,5 +1,5 @@
 $(document).on 'turbolinks:before-cache turbo:before-cache', ->
   $('input.initialized.effective_date_time_picker').each (i, element) ->
     $input = $(element)
-    $input.datetimepicker('destroy') if $input.data('datetimepicker')
+    $input.datetimepicker('destroy') if $input.data('DateTimePicker')
     $input.removeClass('initialized')

data/app/assets/javascripts/effective_has_many/initialize.js.coffee

@@ -1,3 +1,7 @@
+disableRemovedFields = ($fields) ->
+  # Rails still needs the record ID and destruction flag to delete persisted rows.
+  $fields.find('input,textarea,select,button').not("input[type=hidden][name$='[id]'],input[type=hidden][name$='[_destroy]']").prop('disabled', true)
+
 assignPositions = (target) ->
   $hasMany = $(target)
   return unless $hasMany.length > 0
@@ -16,6 +20,8 @@ assignPositions = (target) ->
   true
 
 (this.EffectiveBootstrap || {}).effective_has_many = ($element, options) ->
+  disableRemovedFields($element.find('.has-many-fields.marked-for-destruction'))
+
   if options.sortable
     # https://github.com/SortableJS/Sortable
     $element.sortable({
@@ -78,6 +84,8 @@ $(document).on 'click', '[data-effective-form-has-many-remove]', (event) ->
   $input = $obj.siblings("input[name$='[_destroy]']").first()
   $fields = $obj.closest('.has-many-fields').first()
 
+  disableRemovedFields($fields)
+
   if $input.length > 0
     $input.val('true')
     $fields.addClass('marked-for-destruction').fadeOut('fast')

data/app/helpers/effective_form_builder_helper.rb

@@ -18,7 +18,7 @@ module EffectiveFormBuilderHelper
       "new_#{class_name}"
     end
 
-    options[:html] = (options[:html] || {}).merge(novalidate: true, onsubmit: 'return EffectiveForm.validate(this)')
+    options[:html] = (options[:html] || {}).merge(novalidate: true, onsubmit: 'return EffectiveForm.validate(this, event)')
     options[:html]['data-turbo'] = false
     options[:local] = true unless options.key?(:local)
 

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

@@ -52,7 +52,7 @@ module Effective
           if multiple?
             @builder.hidden_field(name, multiple: true, id: (tag_id + "_#{index}"), value: attachment.signed_id)
           else
-            @builder.hidden_field(name, id: tag_id, value: attachment.signed_id)
+            @builder.hidden_field(name, id: "#{tag_id}_attachment", value: attachment.signed_id)
           end
         end.join.html_safe
       end

data/app/models/effective/form_logics/show_if.rb

@@ -37,7 +37,11 @@ module Effective
         first = object.try(args.first)
         second = args.second
 
-        first == second || first.to_s == second.to_s || Array(first) == Array(second) || Array(first.to_s) == Array(second.to_s)
+        first == second ||
+          first.to_s == second.to_s ||
+          Array(first) == Array(second) ||
+          Array(first.to_s) == Array(second.to_s) ||
+          Array(first).any? { |value| value.to_s == second.to_s }
       end
 
     end

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '1.26.1'.freeze
+  VERSION = '1.26.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 1.26.1
+  version: 1.26.3
 platform: ruby
 authors:
 - Code and Effect