effective_bootstrap 0.9.41 → 0.9.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b496c8193535d6f7bb0a74e49665dec14d0330b26682753c5b8721a00da0288
-  data.tar.gz: 20d00e39d97d38d350f81c69abb3fbe35a4e9950b5807108a1c5b819cf596545
+  metadata.gz: 5bfd09a27598da184de3a2f8208d36db4ac3021c76946dc45f7c7c81ed0d0b1f
+  data.tar.gz: e62446f65854520af700752157415cf606d18b43ac631726394c26895a8df705
 SHA512:
-  metadata.gz: 4e8e3c0416424d8f2a675f704a7088b9a5edbc8cbb26d8d8853ad1b9c7d2dac98cf2c7a4352e23ad9a5fd6398c7713d7602cd552e9d95311cf74ea0fdc1b0e51
-  data.tar.gz: 5c5bd0a118f9a68b8901fab25692e95a1728ebdb9a00744a93567fe1185fc23f02d4948609906c75b949440e1340ceaa298fb053f5807cd24195bc825fc2666d
+  metadata.gz: 2ca774aa86d286554166d8780d0a8ba4ddbe187f4decb5295e83728d63b5b5eb7723abd5bf1aa74881ca36c983c94d2fc8b88fb6ed58fbdc7759287ae7886a70
+  data.tar.gz: 9f15e36d568891a388fd9c788887f9fadd195d5bc81d06bf04ba899161a76a55a676850311f41efbb0ec55458b523091c36ca86ddfe430e282b9d402d875fdd7

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/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.9.41'.freeze
+  VERSION = '0.9.42'.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.42
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-08 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails