effective_bootstrap 0.6.24 → 0.6.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 890a186876e731a63911b2315397482879db023570b38177f849ddfe3d262c63
-  data.tar.gz: b3fef68f79fa022df72c873fa219ddafa7ffd7d3688cdcf32889c58cc6836817
+  metadata.gz: c26dafae8b20f6de729f010e19ba6690ccc45257fd7151fea3d7175715ae7a7d
+  data.tar.gz: 218ed4f9c1c4a0e8727bdd9af016829cfcb18f310004f3b3307a23b90d9e91ba
 SHA512:
-  metadata.gz: 526a608720159a66c91c9a58db1cd30bbdd61a4584155572582f54b864b2882c11a0bec0df629c4c037e417cc743e2b7aabcc513d3b963744cfbc717fddb7f88
-  data.tar.gz: 3c6a4025acab54296be4d4aae3466c082aee32a6ee8ac69000fe3716a1d79dbce81e905e2d28c29a717094e66a9ab3da58abbaaeba3b96ff4d23210b97d546b8
+  metadata.gz: 0416207fe706d79b6cdecb1bc7d424f33786ec91ca26e887c93d8036339060854ca9d23d3e76072939b37ecddda44c6a1e19c380207b81c4e3c6571ed909539b
+  data.tar.gz: 45aa015d4e1648f49c7bad6909bc5ce1e6ee61d92fb93f9613253d719f1b8e38cc474578283ffc7e7a68d9dcfde02eabe4134c5853daf0beace9e88170bcecd0

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

@@ -2,7 +2,14 @@
   $affects = $element.closest('form').find("input[name='#{options.name}'],select[name='#{options.name}']")
 
   $affects.on 'change', (event) ->
-    if $(event.target).val() == options.value
+    $target = $(event.target)
+    matches = ($target.val() == options.value)
+
+    if $target.is("[type='checkbox']")
+      matches = matches || ($target.is(':checked') && "#{options.value}" == 'true')
+      matches = matches || (!$target.is(':checked') && ("#{options.value}" == 'false' || "#{options.value}" == ''))
+
+    if matches
       $element.hide()
       $element.find('input,textarea,select').prop('disabled', true)
     else
@@ -18,7 +25,14 @@
   $affects = $element.closest('form').find("input[name='#{options.name}'],select[name='#{options.name}']")
 
   $affects.on 'change', (event) ->
-    if $(event.target).val() == options.value
+    $target = $(event.target)
+    matches = ($target.val() == options.value)
+
+    if $target.is("[type='checkbox']")
+      matches = matches || ($target.is(':checked') && "#{options.value}" == 'true')
+      matches = matches || (!$target.is(':checked') && ("#{options.value}" == 'false' || "#{options.value}" == ''))
+
+    if matches
       $element.fadeIn()
       $element.find('input,textarea,select').removeAttr('disabled')
     else

data/app/assets/javascripts/effective_bootstrap/tabs.js

@@ -1,16 +1,14 @@
-let initTabs = function() {
-  let $tab_with_error = $(".form-control.is-invalid").first().closest('.tab-pane');
+$(document).ready(function() {
+  var $tab_with_error = $(".form-control.is-invalid").first().closest('.tab-pane');
 
   if ($tab_with_error.length > 0) {
     $(".nav.nav-tabs").find("a[href^='#" + $tab_with_error.attr('id') + "']").tab('show');
   } else if (document.location.hash.length > 0) {
-    let $tab_from_url = $(".nav.nav-tabs").find("a[href^='" + document.location.hash + "']");
+    var $tab_from_url = $(".nav.nav-tabs").find("a[href^='" + document.location.hash + "']");
 
     if ($tab_from_url.length > 0) {
       document.location.hash = ""; // This prevents scrolling to the wrong place in the page
       $tab_from_url.tab("show");
     }
   }
-}
-
-$(document).ready(initTabs);
+});

data/app/assets/stylesheets/effective_bootstrap/forms.scss

@@ -3,13 +3,6 @@
   display: flex;
   align-items: center;
   position: relative;
-
-  // This is the inline ajax flash next to the save button.
-  .effective-form-flash {
-    position: absolute;
-    top: 3.0em;
-    z-index: 1;
-  }
 }
 
 form[data-remote="true"]:not(.show-flash-success) {

data/app/helpers/effective_bootstrap_helper.rb

@@ -37,7 +37,7 @@ module EffectiveBootstrapHelper
 
     link_opts[:class] = opts.delete(:link_class) || 'btn btn-link'
     div_class = opts.delete(:div_class)
-    card_class = opts.delete(:card_class) || 'my-2'
+    card_class = opts.delete(:card_class) || 'card card-body my-2'
 
     if @_accordion_active
       # Accordion collapse
@@ -55,7 +55,7 @@ module EffectiveBootstrapHelper
       # Normal collapse
       content_tag(:a, label, link_opts) +
       content_tag(:div, id: id, class: ['collapse', div_class, ('show' if show)].compact.join(' ')) do
-        content_tag(:div, capture(&block), class: ['card', 'card-body', card_class].compact.join(' '))
+        content_tag(:div, capture(&block), class: card_class)
       end
     end
   end

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

@@ -77,7 +77,7 @@ module Effective
         end
 
         if options_collection.kind_of?(Hash)
-          options_collection[include_null] = [[include_null, 'nil']]
+          options_collection[include_null] = [Struct.new(:to_s, :id).new(include_null, 'nil')]
         end
 
         options_collection

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.6.24'.freeze
+  VERSION = '0.6.29'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.6.24
+  version: 0.6.29
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails