effective_bootstrap 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 001fe5fbf1a05352d82ae59be2b0181078e391f2
-  data.tar.gz: 24d5ec77cc725518659bcde94d09e80a37209395
+  metadata.gz: 8a416000ffb3b4e11e0fd61842b003ac41fba8c6
+  data.tar.gz: 5dfca3d53a870ed1e2d2bfb7b9b970c1089198d1
 SHA512:
-  metadata.gz: 95d57accc1d088e060bfb7c1d66deb5625dca51f627e1c0f7cdb7d68f80589d68f192cc22bbd33efe6c17b9260e045d3c14bbd3e72b27bfbe44df30a1a9a81d6
-  data.tar.gz: 5ab5aa1dfd214b0ff47935425f9839ab55c888f8c9a6beb072845bee00c5a586261d7df3e8da7db9d05d1dcdb6c224dda15406ef0a073cff88ca0e3bf80766d5
+  metadata.gz: a24a2ae5bb0f5dc9dc3e45e268ed9e254596dfc64b4cdd9c91269c6c79279448ee9b88fcda9a447aa9e13db4bb8e129412257cf89fc73963a53544a32a0444d3
+  data.tar.gz: 631c95b4ecd4af1e60c7f9913c9e0d6b9087a8072c1e9f0eca62585836117fa65bc6b72063d6173333f36c7615e60d6b3fa19f9c52a22596f18dd4c2b849d263

data/app/assets/javascripts/effective_bootstrap.js

@@ -1,6 +1,8 @@
 //= require ./effective_bootstrap/base
+//= require ./effective_bootstrap/confirm
 //= require ./effective_bootstrap/form
 //= require ./effective_bootstrap/logic
+//= require ./effective_bootstrap/other
 
 //= require ./effective_datetime/input
 //= require ./effective_date/input

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

@@ -18,29 +18,3 @@ $ -> EffectiveBootstrap.initialize()
 $(document).on 'turbolinks:load', -> EffectiveBootstrap.initialize()
 $(document).on 'cocoon:after-insert', -> EffectiveBootstrap.initialize()
 $(document).on 'effective-bootstrap:initialize', (event) -> EffectiveBootstrap.initialize(event.currentTarget)
-
-# These next three methods hijack jquery_ujs data-confirm and do it our own way with a double click confirm
-$(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)
-    setTimeout(
-      (->
-        $obj.data('confirmed', false)
-        $obj.html($obj.data('confirm-original'))
-      )
-      , 4000)
-    false # don't show the confirmation dialog
-
-$.rails.confirm = (message) -> true if $.rails
-$(document).on 'confirm:complete', (event) -> $(event.target).data('confirmed')
-
-# Fade out cocoon remove.
-$(document).on 'cocoon:before-remove', (event, $obj) ->
-  $(event.target).data('remove-timeout', 1000)
-  $obj.fadeOut('slow')

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

@@ -0,0 +1,22 @@
+# These next three methods hijack jquery_ujs data-confirm and do it our own way with a double click confirm
+
+if <%= !!EffectiveBootstrap.use_custom_data_confirm %> && $.rails
+  $(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)
+      setTimeout(
+        (->
+          $obj.data('confirmed', false)
+          $obj.html($obj.data('confirm-original'))
+        )
+        , 4000)
+      false # don't show the confirmation dialog
+
+  $.rails.confirm = (message) -> true 
+  $(document).on 'confirm:complete', (event) -> $(event.target).data('confirmed')

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

@@ -0,0 +1,4 @@
+# Fade out cocoon remove.
+$(document).on 'cocoon:before-remove', (event, $obj) ->
+  $(event.target).data('remove-timeout', 1000)
+  $obj.fadeOut('slow')

data/app/helpers/effective_form_builder_helper.rb

@@ -33,7 +33,7 @@ module EffectiveFormBuilderHelper
     end
 
     # Assign default ID
-    options[:id] ||= options[:html].delete(:id) || html_id
+    options[:id] ||= (options[:html].delete(:id) || html_id) unless options.key?(:id)
 
     without_error_proc do
       form_with(**options.merge(builder: Effective::FormBuilder), &block)

data/config/effective_bootstrap.rb

@@ -21,4 +21,7 @@ EffectiveBootstrap.setup do |config|
   # end
   config.authorization_method = Proc.new { |controller, action, resource| authorize!(action, resource) }
 
+  # Replaces rails_ujs data-confirm with a custom inline implementation.
+  # You will need to recompile assets (or "rm -rf tmp/") if you change this.
+  config.use_custom_data_confirm = true
 end

data/lib/effective_bootstrap.rb

@@ -7,6 +7,8 @@ module EffectiveBootstrap
   # The following are all valid config keys
   mattr_accessor :authorization_method
 
+  mattr_accessor :use_custom_data_confirm
+
   def self.setup
     yield self
   end

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.4.6'.freeze
+  VERSION = '0.4.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-19 00:00:00.000000000 Z
+date: 2019-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -371,8 +371,10 @@ files:
 - app/assets/images/icons/zoom-out.svg
 - app/assets/javascripts/effective_bootstrap.js
 - app/assets/javascripts/effective_bootstrap/base.js.coffee
+- app/assets/javascripts/effective_bootstrap/confirm.js.coffee.erb
 - app/assets/javascripts/effective_bootstrap/form.js.coffee
 - app/assets/javascripts/effective_bootstrap/logic.js.coffee
+- app/assets/javascripts/effective_bootstrap/other.js.coffee
 - app/assets/javascripts/effective_checks/initialize.js.coffee
 - app/assets/javascripts/effective_checks/input.js
 - app/assets/javascripts/effective_ck_editor/initialize.js.coffee