effective_bootstrap 0.9.41 → 0.9.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b496c8193535d6f7bb0a74e49665dec14d0330b26682753c5b8721a00da0288
-  data.tar.gz: 20d00e39d97d38d350f81c69abb3fbe35a4e9950b5807108a1c5b819cf596545
+  metadata.gz: 33fc32e5f8a20002ec07cc4cab552f7bd2e7386b162ce3043b9d2ba73771d2cb
+  data.tar.gz: d28055c2b76376a8efb83c2d89632883c4c599ccca5b5337eabb42f1242d8e6c
 SHA512:
-  metadata.gz: 4e8e3c0416424d8f2a675f704a7088b9a5edbc8cbb26d8d8853ad1b9c7d2dac98cf2c7a4352e23ad9a5fd6398c7713d7602cd552e9d95311cf74ea0fdc1b0e51
-  data.tar.gz: 5c5bd0a118f9a68b8901fab25692e95a1728ebdb9a00744a93567fe1185fc23f02d4948609906c75b949440e1340ceaa298fb053f5807cd24195bc825fc2666d
+  metadata.gz: b748f7cabd901caa3b9626c5bf4a0bc5d00cbc8269c8db15b809708895ac4e08104ec9f75cdf0dd5da0314c8182d882212beedb1aaf9ef72e0c9db43ad8dc0dc
+  data.tar.gz: 6c8259a2cf99443611d197da78129382d1a6c4f870d7678458bf71a49f3ed60cbc64c7c8876482fa93244fdb2b139cb9396af4b8276fa0b858d25431cfad766f

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

@@ -4,19 +4,27 @@ if <%= !!EffectiveBootstrap.use_custom_data_confirm %> && (window.Rails || $.rai
   $(document).on 'confirm', (event) ->
     $obj = $(event.target)
 
-    if $obj.data('confirmed')
-      true
-    else
-      $obj.data('confirm-original', $obj.html())
-      $obj.html($obj.data('confirm'))
-      $obj.data('confirmed', true)
+    # Already confirmed
+    return true if $obj.data('confirmed')
+
+    # Otherwise unconfirmed
+    $obj.data('confirm-original', $obj.html())
+    $obj.html($obj.data('confirm'))
+    $obj.data('confirmed', true)
+
+    # When using the direct to s3 active storage javascript library
+    $activeStorageUpload = $obj.closest('form').find('input[type=file][data-direct-upload-url]')
+
+    if $activeStorageUpload.length == 0
       setTimeout(
         (->
           $obj.data('confirmed', false)
           $obj.html($obj.data('confirm-original'))
         )
         , 4000)
-      false # don't show the confirmation dialog
+
+    # Do not display the confirmation dialog
+    false
 
   if window.Rails
     window.Rails.confirm = (message) -> true

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

@@ -13,7 +13,12 @@ $(document).on 'direct-upload:error', (event) ->
   $("[data-direct-upload-id=#{event.detail.id}]").addClass('direct-upload--error').attr('title', event.detail.error)
 
 $(document).on 'direct-upload:end', (event) ->
-  $("[data-direct-upload-id=#{event.detail.id}]").addClass('direct-upload--complete')
+  $obj = $("[data-direct-upload-id=#{event.detail.id}]")
+
+  $obj.addClass('direct-upload--complete')
+
+  # Rails UJS fix
+  $obj.closest('form').find('[type=submit][data-confirm]').data('confirmed', true)
 
 $(document).on 'change', "input[type='file'][data-click-submit]", (event) ->
   $(event.currentTarget).closest('form').find('button[type=submit],input[type=submit]').first().click()

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

@@ -68,7 +68,9 @@ $(document).on 'click', '[data-effective-form-has-many-remove]', (event) ->
   event.preventDefault()
 
   $obj = $(event.currentTarget)
-  return unless $obj.data('confirmed') if $obj.data('confirm')
+
+  if (window.Rails && window.Rails.effective_bootstrap_custom_data_confirm) || ($.rails && $.rails.effective_bootstrap_custom_data_confirm)
+    return unless $obj.data('confirmed') if $obj.data('confirm')
 
   $hasMany = $obj.closest('.form-has-many')
   return unless $hasMany.length > 0

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.9.41'.freeze
+  VERSION = '0.9.45'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.9.41
+  version: 0.9.45
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-08 00:00:00.000000000 Z
+date: 2021-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails