effective_bootstrap 0.3.14 → 0.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fe27ec0f7e80f2eb443ef732080279c0bda7b59
-  data.tar.gz: 66a908a12cc17816782cdabdee51a64145702356
+  metadata.gz: 5bbf6bd3ec7def180b40cbcb63051fd4df9bcd34
+  data.tar.gz: 6a12b389a429f0172bc3c98e07f5309591a22c1d
 SHA512:
-  metadata.gz: 72bcff10833ff251624f1d29efbc786ec4cf31890e146e14c390c3a47cebfcc17a788618c56edd3823f5b4ba717722b5fd5a2a5309749336c02745df29096c4b
-  data.tar.gz: c341f4ce42b5d3e89bf40081768fb2e239e6e6c406287b1402402d92434f695534c4fb4225daf22e76e7e1d6fc97dfaa93ce61630c525451123ed6e74c72e4e2
+  metadata.gz: 5fc72b857ca9fd5b05396472c55ebd870aa4c739f749f84d96ce658e71d4a3b68ade1ad128d0d7923dfbe3d525a2d426aeb9b9050140f23cffa4534ea1a54b4f
+  data.tar.gz: 03b7fabea05279fb5579cbf61fbbf753234c5768547db87dc1ad3a45de917d02303e477b22834bffad17a9ad729c2e290ac5ee944be6afd8427f6e245c21a477

data/app/assets/javascripts/effective_select_or_text/initialize.js

@@ -13,8 +13,15 @@ $(document).on('click', '[data-effective-select-or-text]', function(event) {
   $visible = $obj.children('.form-group:visible').first();
   $hidden = $obj.children('.form-group:not(:visible)').first();
 
-  $visible.hide();
-  $hidden.slideDown();
+  visible_name = $visible.find('input,textarea,select').first().attr('name');
+  hidden_name = $hidden.find('input,textarea,select').first().attr('name');
+
+  if(visible_name == hidden_name) { $hidden.find('input,textarea,select').removeAttr('disabled'); }
+
+  $visible.fadeOut('fast', function() {
+    if(visible_name == hidden_name) { $(this).find('input,textarea,select').prop('disabled', true); }
+    $hidden.fadeIn('fast');
+  });
 
   return false; // This implicitly calls event.preventDefault() to cancel the action, and prevent the link from going somewhere.
 });

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

@@ -7,7 +7,7 @@ module Effective
       attr_accessor :text_options
 
       VISIBLE = {}
-      HIDDEN = { wrapper: { style: 'display: none;' } }
+      HIDDEN_AND_DISABLED = { wrapper: { style: 'display: none;' }, disabled: true }
 
       def initialize(name, options, builder:)
         @name_text = options.delete(:name_text) || raise('Please include a text method name')
@@ -36,13 +36,13 @@ module Effective
         return true if object.errors[name].present?
         return false if object.errors[name_text].present?
 
-        object.send(name).present? || (object.send(name).blank? && object.send(name_text).blank?)
+        value = object.send(name)
+
+        (value.present? && select_collection.include?(value)) || (value.blank? && object.send(name_text).blank?)
       end
 
       def text?
-        return false if object.errors[name].present?
-
-        object.send(name_text).present? || object.errors[name_text].present?
+        !select?
       end
 
       def email_field?
@@ -50,11 +50,11 @@ module Effective
       end
 
       def select_options
-        @select_options.merge(select? ? VISIBLE : HIDDEN)
+        @select_options.merge(select? ? VISIBLE : HIDDEN_AND_DISABLED)
       end
 
       def text_options
-        @text_options.merge(text? ? VISIBLE : HIDDEN)
+        @text_options.merge(text? ? VISIBLE : HIDDEN_AND_DISABLED)
       end
 
     end

data/app/views/effective/style_guide/_feather_icons.html.haml

@@ -1,7 +1,7 @@
 %p These icons are a combination of #{link_to 'Feather', 'https://feathericons.com/'} and #{link_to 'FontAwesome', 'https://fontawesome.com/'} icons.
 
 .row.text-center
-  - Dir["#{__dir__}/../../../assets/images/icons/*.svg"].map { |path| path.split('/').last.chomp('.svg') }.each do |name|
+  - Dir["#{__dir__}#{'/..' * 3}/assets/images/icons/*.svg"].map { |path| path.split('/').last.chomp('.svg') }.sort.each do |name|
     .col-sm-2.my-3
       = icon(name)
       %br

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.3.14'.freeze
+  VERSION = '0.3.15'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.3.15
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-22 00:00:00.000000000 Z
+date: 2019-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails