effective_bootstrap 0.9.44 → 0.9.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '092f884d4e2928c9cda4247f62caeba2dc0a7b7e7c56b42a4292d611c5d62ee1'
-  data.tar.gz: 8059eaec1762f8846cc1d16d668d0e29dd5fa4e7b27edfbb91434c1f9e8d70f0
+  metadata.gz: da46c75a27275d4efcc243c43a23aa48cb648d1468504455401ff0f0cfd1b359
+  data.tar.gz: 8bbe1fbf6fb3fc4c5ae9f629f70b68a35688c9607c1d3567eaa6237b30271a66
 SHA512:
-  metadata.gz: f9a5de0079ce76d9fe570233344b892ddb8b56407611cb231dbefe9e46c996894a73f3a48f0df377269a0fbd5472ee8bcbb7fae19968da52f50ff3b1ca0b7926
-  data.tar.gz: af189c0bd213dd06adb690673221582d47838ef9ab711e03fc9058c70a8938bfef2da2d6a8c38e14a74c1e4b99f6cc98b004e21e9477355c22c9091fef21ba5b
+  metadata.gz: b04511ccc048cffc701deb7e60c4a282288b3916fd8aaeb6cd9a401436d29b02c2526024413e179731022e75b2a36a05152905c75d64be0ee4e36236b0035242
+  data.tar.gz: ea6241b0a004f16a6ebd2c61303cd3b7b3944cfff3f327d6871556864f3ca3cec84685eed559811ae05604b24d76d96264c0d5e2e96da638049c310f3716b799

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

@@ -11,14 +11,14 @@
 
     if matches
       $element.hide()
-      $element.find('input,textarea,select').prop('disabled', true)
+      $element.find('input,textarea,select,button').prop('disabled', true)
     else
       $element.fadeIn()
-      $element.find('input,textarea,select').removeAttr('disabled')
+      $element.find('input,textarea,select,button').removeAttr('disabled')
 
   # Maybe disable it now
   if options.needDisable
-    $element.find('input,textarea,select').prop('disabled', true)
+    $element.find('input,textarea,select,button').prop('disabled', true)
 
 
 (this.EffectiveBootstrap || {}).effective_show_if = ($element, options) ->
@@ -34,14 +34,14 @@
 
     if matches
       $element.fadeIn()
-      $element.find('input,textarea,select').removeAttr('disabled')
+      $element.find('input,textarea,select,button').removeAttr('disabled')
     else
       $element.hide()
-      $element.find('input,textarea,select').prop('disabled', true)
+      $element.find('input,textarea,select,button').prop('disabled', true)
 
   # Maybe disable it now
   if options.needDisable
-    $element.find('input,textarea,select').prop('disabled', true)
+    $element.find('input,textarea,select,button').prop('disabled', true)
 
 (this.EffectiveBootstrap || {}).effective_show_if_any = ($element, options) ->
   $affects = $element.closest('form').find("input[name='#{options.name}'],select[name='#{options.name}']")
@@ -53,12 +53,11 @@
 
     if found
       $element.fadeIn()
-      $element.find('input,textarea,select').removeAttr('disabled')
+      $element.find('input,textarea,select,button').removeAttr('disabled')
     else
       $element.hide()
-      $element.find('input,textarea,select').prop('disabled', true)
+      $element.find('input,textarea,select,button').prop('disabled', true)
 
   # Maybe disable it now
   if options.needDisable
-    $element.find('input,textarea,select').prop('disabled', true)
-
+    $element.find('input,textarea,select,button').prop('disabled', true)

data/app/models/effective/form_input.rb

@@ -8,7 +8,7 @@ module Effective
     EMPTY_HASH = {}
 
     EXCLUSIVE_CLASS_PREFIXES = [] # None
-    EXCLUSIVE_CLASS_SUFFIXES = ['-primary', '-secondary', '-success', '-danger', '-warning', '-info', '-light', '-dark']
+    EXCLUSIVE_CLASS_SUFFIXES = ['-primary', '-secondary', '-success', '-danger', '-warning', '-info', '-light', '-dark', '-link']
 
     DEFAULT_INPUT_GROUP_OPTIONS = { input_group: { class: 'input-group' }, prepend: false, append: false }
 
@@ -371,7 +371,22 @@ module Effective
       when String
         defaults.merge(text: obj)
       when Hash
-        obj.reverse_merge!(defaults); obj
+        html_classes = ((obj[:class] || '').split(' ') + (defaults[:class] || '').split(' ')).uniq
+
+        # Try to smart merge bootstrap classes
+        if (exclusive = html_classes.select { |c| c.include?('-') }).length > 1
+          EXCLUSIVE_CLASS_PREFIXES.each do |prefix|
+            prefixed = exclusive.select { |c| c.start_with?(prefix) }
+            prefixed[1..-1].each { |c| html_classes.delete(c) } if prefixed.length > 1
+          end
+
+          suffixed = exclusive.select { |c| EXCLUSIVE_CLASS_SUFFIXES.any? { |suffix| c.end_with?(suffix) } }
+          suffixed[1..-1].each { |c| html_classes.delete(c) } if suffixed.length > 1
+        end
+
+        obj[:class] = html_classes.join(' ') if html_classes.present?
+        obj.reverse_merge!(defaults)
+        obj
       else
         defaults.merge(text: obj.to_s)
       end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class ArticleEditor < Effective::FormInput

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class CheckBox < Effective::FormInput

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
 
   module FormInputs

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class CkEditor < Effective::FormInput

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class Clear < Effective::FormInput

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class CollectionInput < Effective::FormInput

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class DateField < DatetimeField

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class DatetimeField < Effective::FormInput

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class Delete < Submit

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class Editor < Effective::FormInput

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class EmailCcField < Effective::FormInput

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class EmailField < Effective::FormInput

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class ErrorField < Effective::FormInput
@@ -32,7 +34,7 @@ module Effective
           end
         )
 
-        content_tag(:div, content, options[:input])
+        content_tag(:div, content.html_safe, options[:input])
       end
 
       private

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class FileField < Effective::FormInput

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class FloatField < Effective::FormInput

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class FormGroup < Effective::FormInput

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class HasMany < Effective::FormInput

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class HiddenField < Effective::FormInput

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class IntegerField < Effective::FormInput

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class NumberField < Effective::FormInput

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class NumberTextField < Effective::FormInput

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class PasswordField < Effective::FormInput

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class PercentField < Effective::FormInput

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class PhoneField < Effective::FormInput

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class PriceField < Effective::FormInput

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # http://api.rubyonrails.org/classes/ActionView/Helpers/FormOptionsHelper.html#method-i-select
 
 # buttons: true

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class RemoteLinkTo < Submit

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class Reset < Effective::FormInput

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class RichTextArea < Effective::FormInput

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class Save < Effective::FormInput

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class SearchField < Effective::FormInput

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # http://api.rubyonrails.org/classes/ActionView/Helpers/FormOptionsHelper.html#method-i-select
 # select(object, method, choices = nil, options = {}, html_options = {}, &block)
 # ActionView::Helpers::FormBuilder.instance_method(:check_box).bind(self).call(m, opts, v)`

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class SelectOrText < Effective::FormInput

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class StaticField < Effective::FormInput

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

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class Submit < Effective::FormInput
 
       def to_html(&block)
-        return super unless (form_readonly? || form_disabled?)
+        return nil if form_readonly?
+        super()
       end
 
       def build_input(&block)

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class TextArea < Effective::FormInput

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class TextField < Effective::FormInput

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class TimeField < DatetimeField

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class TimeZoneSelect < Select

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormInputs
     class UrlField < Effective::FormInput

data/app/models/effective/form_logics/hide_if.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormLogics
     class HideIf < Effective::FormLogic

data/app/models/effective/form_logics/show_if.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormLogics
     class ShowIf < Effective::FormLogic

data/app/models/effective/form_logics/show_if_any.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module FormLogics
     class ShowIfAny < Effective::FormLogic

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.9.44'.freeze
+  VERSION = '0.9.48'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.9.44
+  version: 0.9.48
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-29 00:00:00.000000000 Z
+date: 2021-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails