effective_bootstrap 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 814a553c811fcf629ccae64c8b7600b3c17bd434
-  data.tar.gz: 7582182315089cd457742ec96afec30659ace1f7
+  metadata.gz: c145752a85ba61c3a79bb1de549542107bc82609
+  data.tar.gz: 3bb0a9a81e6e30636b8ade5eea61db4f7ce65aae
 SHA512:
-  metadata.gz: a27f9df29e5f7e9912c276a139dd43900a73ad374193d3d47de6e7cf3c16be78f94c60eb169c903b7c9351e7e09ad31c231b848ba842b118ed91abfbd1aeba70
-  data.tar.gz: 68aa49cbba726414afba0c9465fa29f333ae1c88420ca5570bdd950b417515297275848d731ad5c2fc26c1cf38c2d1836c7cbb1889d6859acddaabcf587d3823
+  metadata.gz: d13825f792cb0308c4f8ce96085979c5d263dd52ae68b9af96900aec046eefe1487af2d2b5dbbec9b5a1683770876c6a76a5a9ca0e57f53eb821da81c2ce2e72
+  data.tar.gz: a20546e182ae29c15d16bdabbcbeb0a27edcab1a332c01ae8f1b3c9a97ebde3b6dbd2802d011413f3d597309a02154afc827923f0e26362f5e21567bd1ea5052

data/README.md

@@ -295,7 +295,7 @@ As a Rails Form Helper input:
 = f.select :category, 10.times.map { |x| "Category #{x}"}
 = f.select :categories, 10.times.map { |x| "Category #{x}"}, multiple: true
 = f.select :categories, 10.times.map { |x| "Category #{x}"}, tags: true
-= f.select :categories, {'Active': [['Post A', 1], ['Post B', 2]], 'Past': ['Post C', 3], ['Post D', 4]}, grouped: true
+= f.select :categories, {'Active': [['Post A', 1], ['Post B', 2]], 'Past': [['Post C', 3], ['Post D', 4]]}, grouped: true
 ```
 
 ### Modes

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

@@ -1,20 +1,24 @@
 (this.EffectiveBootstrap || {}).effective_hide_if = ($element, options) ->
 
-  $affects = $element.closest('form').find("input[name='#{options.name}']")
+  $affects = $element.closest('form').find("input[name='#{options.name}'],select[name='#{options.name}']")
 
   $affects.on 'change', (event) ->
     if $(event.target).val() == options.value
       $element.hide()
+      element.find('input,textarea,select').prop('disabled', true)
     else
       $element.fadeIn()
+      $element.find('input,textarea,select').removeAttr('disabled')
 
 (this.EffectiveBootstrap || {}).effective_show_if = ($element, options) ->
 
-  $affects = $element.closest('form').find("input[name='#{options.name}']")
+  $affects = $element.closest('form').find("input[name='#{options.name}'],select[name='#{options.name}']")
 
   $affects.on 'change', (event) ->
     if $(event.target).val() == options.value
       $element.fadeIn()
+      $element.find('input,textarea,select').removeAttr('disabled')
     else
       $element.hide()
+      $element.find('input,textarea,select').prop('disabled', true)
 

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

@@ -3,7 +3,15 @@ module Effective
     class HideIf < Effective::FormLogic
 
       def to_html(&block)
-        content_tag(:div, options.merge(input_js_options), &block)
+        disabled_was = @builder.disabled
+
+        @builder.disabled = true if hide?
+
+        content = content_tag(:div, options.merge(input_js_options), &block)
+
+        @builder.disabled = disabled_was
+
+        content
       end
 
       def options
@@ -20,7 +28,7 @@ module Effective
       end
 
       def hide?
-        object.send(args.first) == args.second
+        (object.send(args.first) == args.second) || (object.send(args.first).to_s == args.second.to_s)
       end
 
     end

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

@@ -3,7 +3,15 @@ module Effective
     class ShowIf < Effective::FormLogic
 
       def to_html(&block)
-        content_tag(:div, options.merge(input_js_options), &block)
+        disabled_was = @builder.disabled
+
+        @builder.disabled = true unless show?
+
+        content = content_tag(:div, options.merge(input_js_options), &block)
+
+        @builder.disabled = disabled_was
+
+        content
       end
 
       def options
@@ -20,7 +28,7 @@ module Effective
       end
 
       def show?
-        object.send(args.first) == args.second
+        (object.send(args.first) == args.second) || (object.send(args.first).to_s == args.second.to_s)
       end
 
     end

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.3.4'.freeze
+  VERSION = '0.3.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-05 00:00:00.000000000 Z
+date: 2018-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails