effective_bootstrap 0.6.25 → 0.6.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bd272496df4534d4a096a99118c4614a09c4abcead6472e8fe35e4afac69750
-  data.tar.gz: cda866751363becaed7667b5b6b170d86170627239931e4d760f64df4f5c149d
+  metadata.gz: cea2d98355204f9fbffa818109b13fb58cdf6fb06bf3d9fd0aa5edc5c9e83f8d
+  data.tar.gz: f76f2322ea5d270db922b6b9bf7f81912206290cf36c900284265e3b5e5bab84
 SHA512:
-  metadata.gz: 7ca2b6237032c11011187f82108888f44592d083b413048351b7784acb632f26612cac669b71cf025c9b2c2651e5e674d7cce10d0417637449a8453e82b8f31a
-  data.tar.gz: 15c5474cd55dfd1c5d6239448041195833ad078920a312a3afba3c50df99691cff19c40c086fae55e9f51b3270747c30f71412da0bccaf2da0522bb59cee5dbe
+  metadata.gz: 5bd53873dbec00c9e902de0e296a5ece80f110bf83433904c16efdea22d0344d1c4e2109d1dfa51c14309c311b5e4611942cf705da9bc3a76f369fbff6ddd867
+  data.tar.gz: 6558d15ea204361d5c3642f5b02668d382af5966d0a1714f070c238b5496aaec198267a58f770776c572499d96da8c0a2de0db0354a73a41bff4d19bc986c938

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/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,9 @@ 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, :first, :second).new(include_null, 'nil', include_null, 'nil')
+          ]
         end
 
         options_collection

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.6.25'.freeze
+  VERSION = '0.6.30'.freeze
 end

metadata

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