effective_bootstrap 1.21.13 → 1.21.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 4182e6f0febddf2a578e68038f3ad36d520582349d704bb4c63e49cead8697d0
4
- data.tar.gz: 0e0776aeba797279d2ad1a54f27d87982fe6339c34dbfc2132f6d4c1a94616d6
3
+ metadata.gz: 1ab471b0c1c50b9b695e9665567f9482189b72ee0fc7de58c93aaf3e7a26a543
4
+ data.tar.gz: e94a722cb2f026b280573f53f0262219fd4592d26293cc38440fb51514b4b4ce
5
5
  SHA512:
6
- metadata.gz: ec613462e0819bd8d47f8098de976cbf3035cda37fb57c19f8802bf1c4231bc9e76d369158fee5595ed883329a87db77248901aa0630ff8a36aa8e9d1037a28a
7
- data.tar.gz: 0e767bd0401291845c500cdb121c33e67acb9518edfd1572b368cd3451cba97a06f47f5c57eccb13562c4f0ecf4d40b02a5f46c4acbbf411c523248eef38616f
6
+ metadata.gz: 6ae426535ed027101389d06d1e077b1e265d21b756aefac57c0e8a30d93a051bddc62378f4ad5c703e3f0c14020efe467f96c24f3634d7bbff27e2ba34139029
7
+ data.tar.gz: 954863d1439c7092908be7c89dfb5a36a5a4ddb3a6e4f85b48e7d6f298a2e7df11407cf66794b77ff00b40aee90058140629476e7c4bb3e95772ebc5c3e7275d
@@ -1,13 +1,5 @@
1
1
  elementSelector = 'input,textarea,select,button,div.form-has-many'
2
2
 
3
- # When showing a parent block that contains nested show_if (e.g. scored card contains category
4
- # blocks), trigger change on the inputs those nested blocks depend on so they run and only
5
- # the visible nested block's same-named controls stay enabled (fixes blank operation on first submit).
6
- triggerNestedLogic = ($element, $container) ->
7
- $element.find('.effective-form-logic').not($element).each (i, el) ->
8
- name = $(el).data('input-js-options').name
9
- $container.find('input, select').filter(-> $(this).attr('name') == name).first().trigger('change')
10
-
11
3
  (this.EffectiveBootstrap || {}).effective_hide_if = ($element, options) ->
12
4
  if options.nested
13
5
  $container = $element.parent('div.effective-form-logic') || $element.closest('form,div.effective-datatables-filters')
@@ -21,15 +13,19 @@ triggerNestedLogic = ($element, $container) ->
21
13
  matches = ($target.val() == options.value)
22
14
 
23
15
  if $target.is("[type='checkbox']")
24
- matches = matches || ($target.is(':checked') && "#{options.value}" == 'true')
25
- matches = matches || (!$target.is(':checked') && ("#{options.value}" == 'false' || "#{options.value}" == ''))
16
+ if $target.attr('name').indexOf('[]') == -1
17
+ matches = matches || ($target.is(':checked') && "#{options.value}" == 'true')
18
+ matches = matches || (!$target.is(':checked') && ("#{options.value}" == 'false' || "#{options.value}" == ''))
19
+ else
20
+ selected = $target.closest('fieldset').find("[name='#{options.name}[]']:checked").map((i, el) -> $(el).val()).get()
21
+ matches = selected.find((value) => (value == options.value || "#{value}" == "#{options.value}"))
26
22
 
27
23
  if matches
28
24
  $element.hide()
29
25
  $element.find(elementSelector).prop('disabled', true)
30
26
  else
31
27
  $element.fadeIn()
32
- $element.find(elementSelector).removeAttr('disabled')
28
+ $element.find(elementSelector).not($element.find('.effective-form-logic:hidden').find(elementSelector)).removeAttr('disabled')
33
29
  $element.find('textarea.effective_article_editor').each (i, editor) -> ArticleEditor('#' + $(editor).attr('id')).enable()
34
30
 
35
31
  # Maybe disable it now
@@ -58,9 +54,8 @@ triggerNestedLogic = ($element, $container) ->
58
54
 
59
55
  if matches
60
56
  $element.fadeIn()
61
- $element.find(elementSelector).removeAttr('disabled')
57
+ $element.find(elementSelector).not($element.find('.effective-form-logic:hidden').find(elementSelector)).removeAttr('disabled')
62
58
  $element.find('textarea.effective_article_editor').each (i, editor) -> ArticleEditor('#' + $(editor).attr('id')).enable()
63
- triggerNestedLogic($element, $container)
64
59
  else
65
60
  $element.hide()
66
61
  $element.find(elementSelector).prop('disabled', true)
@@ -80,14 +75,22 @@ triggerNestedLogic = ($element, $container) ->
80
75
  values = JSON.parse(options.value)
81
76
 
82
77
  $affects.on 'change dp.change', (event) ->
83
- selected = $(event.target).val()
78
+ $target = $(event.target)
79
+ selected = $target.val()
84
80
  found = values.find((value) => (value == selected || "#{value}" == "#{selected}"))
85
81
 
82
+ if $target.is("[type='checkbox']")
83
+ if $target.attr('name').indexOf('[]') == -1
84
+ found = found || ($target.is(':checked') && values.find((value) => "#{value}" == 'true'))
85
+ found = found || (!$target.is(':checked') && values.find((value) => ("#{value}" == 'false' || "#{value}" == '')))
86
+ else
87
+ checked = $target.closest('fieldset').find("[name='#{options.name}[]']:checked").map((i, el) -> $(el).val()).get()
88
+ found = values.find((value) => checked.find((sel) => (sel == value || "#{sel}" == "#{value}")))
89
+
86
90
  if found
87
91
  $element.fadeIn()
88
- $element.find(elementSelector).removeAttr('disabled')
92
+ $element.find(elementSelector).not($element.find('.effective-form-logic:hidden').find(elementSelector)).removeAttr('disabled')
89
93
  $element.find('textarea.effective_article_editor').each (i, editor) -> ArticleEditor('#' + $(editor).attr('id')).enable()
90
- triggerNestedLogic($element, $container)
91
94
 
92
95
  else
93
96
  $element.hide()
@@ -1,3 +1,3 @@
1
1
  module EffectiveBootstrap
2
- VERSION = '1.21.13'.freeze
2
+ VERSION = '1.21.14'.freeze
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: effective_bootstrap
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.21.13
4
+ version: 1.21.14
5
5
  platform: ruby
6
6
  authors:
7
7
  - Code and Effect