effective_bootstrap 1.14.5 → 1.14.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3830b85eac4d17ee79fa420b2ed161c4bb395e19a116978cf6b942ce3e11b1ff
-  data.tar.gz: 7763c6ec3e664a607dced1038438479ebdcaf412dfc9ffe20bfcded55f3e7d88
+  metadata.gz: a5dab8378d10d23707e36538dda751cc0a3d8ca0221593f63d1f612b826099d0
+  data.tar.gz: 665eae25b98123231859e04b44c88430c68db4e65cf7f0c32328e45b9164ba1f
 SHA512:
-  metadata.gz: 32cfd50d13eae43a044af215634ff38c5cd2dd09bf6a05ef415c2312d95c6239c70e41067f8b9295f1040735096b42b45d1e1440c48cd9ab3c462166c32c3cb4
-  data.tar.gz: 3b7afe371608c0388ff14a38b1a3d260f49e35486db1692da31d490fb04876486565fc87d835ee13fa8c3c77330d96525f93ad2aae6e8b88b6a8b9c95d0db86c
+  metadata.gz: 582d4816ada40d49a88b1920ac3b04bdf206ab6f634d1b4b92a2892fdf2c645c860b6bf5228a80abd944715fb0fa0d163c3929667479bd5eb561c6e11f141156
+  data.tar.gz: de7c3e442e442af4d9b2689a224644d6065fbdf6d74a99cdef1293ed093cc8978f2fdbec8932cea5e84a80c7fb5cb40aec53c9bf5f5e7567e0ba94876b7760b8

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

@@ -15,7 +15,12 @@ $(document).on('change', "[data-load-ajax-url][data-load-ajax-div]", function(ev
   let value = ($input.val() || '');
   if(value.length == 0) { $container.html(''); return; }
 
-  url = (url + '?' + name + '=' + value);
+  let joiner = (url.indexOf('?') == -1 ? '?' : '&');
+
+  let input = {}
+  input[name] = value;
+
+  url = (url + joiner + $.param(input));
 
   $container.html("<div class='load-ajax-loading'><p>Loading...</p></div>");
 
@@ -27,6 +32,7 @@ $(document).on('change', "[data-load-ajax-url][data-load-ajax-div]", function(ev
     } else {
       $container.replaceWith($content.children(div));
       EffectiveBootstrap.initialize();
+      $(document).trigger('effective-datatables:initialize');
     }
   });
 });

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

@@ -1,28 +1,3 @@
-$(document).on 'change', '[data-toggle=cards] input[type=radio]', (event) ->
-  $input = $(event.currentTarget)
-  return unless $input.is(':checked')
-
-  $card = $input.closest('.card')
-  return unless $card.length > 0
-
-  $cards = $input.closest('.card-deck').children('.card')
-  return unless $cards.length > 0
-
-  $cards.removeClass('active').removeClass('border-secondary')
-  $cards.find('.card-header').removeClass('bg-secondary text-white')
-
-  $card.addClass('active').addClass('border-secondary')
-  $card.find('.card-header').addClass('bg-secondary text-white')
-  true
-
-$(document).on 'click', '[data-toggle=cards] [data-toggle=card]', (event) ->
-  $card = $(event.currentTarget).closest('.card')
-  return unless $card.length > 0
-
-  val = $card.find('input:radio').val()
-  $card.find('input:radio').val([val]).trigger('change')
-  false
-
 $(document).on 'change', '.effective-radios input', (event) ->
   $input = $(event.currentTarget)
   $group = $input.closest('.effective-radios')

data/app/assets/stylesheets/effective_radio/input.scss

@@ -5,25 +5,34 @@ div.btn-group > .btn.first-button {
 
 .effective-radios.is-valid {
   label { border-color: #28a745; }
+  .card { border-color: #28a745; }
   .valid-feedback { display: block; }
 }
 
 .effective-radios.is-invalid {
   label { border-color: #dc3545; }
+  .card { border-color: #dc3545; }
   .invalid-feedback { display: block; }
 }
 
-.effective-radios.card-deck {
-  .card-header { cursor: pointer; }
+.effective-radios.cards {
+  .card { 
+    cursor: pointer; 
+  }
 
   input[type=radio] { display: none; }
 
-  .visible-when-selected { display: none; }
-  .visible-when-unselected { display: block; }
+  input:checked + .card {
+    box-shadow: 0 0 1px 1px #0b3b61;
+  }
 
-  .active {
-    .visible-when-selected { display: block; }
-    .visible-when-unselected { display: none; }
+  input:checked + .card {
+    .show-if-checked { display: inherit; }
+    .show-if-unchecked { display: none; }
   }
-}
 
+  input:not(:checked) + .card {
+    .show-if-checked { display: none; }
+    .show-if-unchecked { display: inherit; }
+  }
+}

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

@@ -6,6 +6,11 @@
 # cards: true
 # custom: false
 
+# For cards, you should pass an html collection like
+# [[card('First Item') {...}, 'first item'], [card('Second Item') {...}, 'second item']]
+# or a collection like
+# [['First Item', 'first'], ['Second Item', 'second']]
+
 module Effective
   module FormInputs
     class Radios < CollectionInput
@@ -54,7 +59,7 @@ module Effective
         [
           'effective-radios',
           ('btn-group btn-group-toggle' if buttons?),
-          ('card-deck' if cards?),
+          ('cards card-deck' if cards?),
           ('no-feedback' unless feedback_options),
           ('is-invalid' if feedback_options && has_error?(name)),
           ('is-valid' if feedback_options && has_error? && !has_error?(name))
@@ -110,21 +115,21 @@ module Effective
           builder.label(opts) { builder.radio_button(id: item_id) + builder.text }
         elsif cards?
           opts = item_label_options.merge(for: item_id)
-          opts[:class] = [opts[:class], ('active border-secondary' if active_item?(builder)), ('first-card' if first_item?) ].compact.join(' ')
+          opts[:class] = [opts[:class], ('active' if active_item?(builder)), ('first-card' if first_item?) ].compact.join(' ')
 
-          if active_item?(builder)
-            builder.label(opts) { builder.radio_button(id: item_id) + builder.text.sub('card-header', 'card-header bg-secondary text-white').html_safe }
-          else
-            builder.label(opts) { builder.radio_button(id: item_id) + builder.text }
-          end
+          builder.label(opts) { builder.radio_button(id: item_id) + build_item_wrap { builder.text } }
         else
           build_item_wrap { builder.radio_button(id: item_id) + builder.label(item_label_options.merge(for: item_id)) }
         end
       end
 
       def build_item_wrap(&block)
-        if cards?
-          content_tag(:div, yield, class: 'card')
+        if cards? && options_collection_includes_cards?
+          yield # Not required.
+        elsif cards?
+          content_tag(:div, class: 'card') do
+            content_tag(:div, yield, class: ('card-body' if card_body?))
+          end
         elsif custom?
           content_tag(:div, yield, class: 'custom-control custom-radio ' + (inline? ? 'custom-control-inline' : 'form-group'))
         else
@@ -136,11 +141,16 @@ module Effective
         options[:input].except(:inline, :custom, :buttons)
       end
 
+      def options_collection_includes_cards?
+        return @options_collection_includes_cards unless @options_collection_includes_cards.nil?
+        @options_collection_includes_cards = options_collection.first(3).any? { |text, _| text.to_s.include?("div class=\"card") }
+      end
+
       def item_label_options
         if buttons?
           { class: 'btn btn-outline-secondary' }
         elsif cards?
-          { class: 'card' }
+          { class: 'form-card-label' }
         elsif custom?
           { class: 'custom-control-label' }
         else
@@ -158,6 +168,12 @@ module Effective
         @cards = (options.delete(:cards) || false)
       end
 
+      def card_body? # default true
+        return @card_body unless @card_body.nil?
+        value = options.delete(:card_body)
+        @card_body = (value == nil ? true : value)
+      end
+
       def button_group_id
         "#{tag_id}_btn_group"
       end

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '1.14.5'.freeze
+  VERSION = '1.14.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 1.14.5
+  version: 1.14.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-30 00:00:00.000000000 Z
+date: 2023-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -737,7 +737,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Everything you need to get set up with bootstrap 4.