effective_bootstrap 0.3.12 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a413a43fe8afc26a398fada64c130819a1914a46
-  data.tar.gz: 62bb5c67a83990375e733cbc30ed4a712638ae65
+  metadata.gz: 21710cbfc9e2de8f89f0485b6c2cde1c45ce40cc
+  data.tar.gz: 6335b029c56b3991616887884c1cd638217a1923
 SHA512:
-  metadata.gz: 41ac345f9d6b0d8a6ba4488e14cf1fb9fe81b7fa79f010accabe30f006cf76d5f5150cd2b0ebcf6f8659d43d3a3a87b1f3f900cc06b68a36e448c9fbd5076947
-  data.tar.gz: b05a8b54efe3aaeb1bc556c9fafcf125210c3e020de2a70fd807665be56dd6f653a557800126d973ef69864772f7edc0c51ebbc60b2a60b2b30c276ec0b2b707
+  metadata.gz: 02eb31d8e8545d68ad9afd86d5089e1c14a442640b32e19abdf9748128273c4af06a18685227a9c6c95dbd21b15b596b1ed6dafcc516f23e4db9329a393ec73f
+  data.tar.gz: 56692cf5b6b01a20505f07479e30b5f77f9bcaeedde8a4d4b5395e391f71f2656495c7d7b164372992028cd890e103d6fbc9658d21d1ea2cb20484552afa5f63

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

@@ -0,0 +1,20 @@
+$(document).on('change', '.effective-select-or-text input', function(event) {
+  $(event.currentTarget).closest('.effective-select-or-text').find('select').val('').trigger('change.select2');
+});
+
+$(document).on('change', '.effective-select-or-text select', function(event) {
+  $(event.currentTarget).closest('.effective-select-or-text').find('input').val('');
+});
+
+// This is the icon that switches them
+$(document).on('click', '[data-effective-select-or-text]', function(event) {
+  $obj = $(event.currentTarget).closest('.effective-select-or-text');
+
+  $visible = $obj.children('.form-group:visible').first();
+  $hidden = $obj.children('.form-group:not(:visible)').first();
+
+  $visible.hide();
+  $hidden.slideDown();
+
+  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

@@ -27,7 +27,7 @@ module Effective
       def to_html(&block)
         content_tag(:div, class: 'effective-select-or-text') do
           @builder.select(name, select_collection, select_options) +
-          @builder.send(email_field? ? :email_field : text_field, name_text, text_options) +
+          @builder.send(email_field? ? :email_field : :text_field, name_text, text_options) +
           link_to(icon('rotate-ccw'), '#', class: 'effective-select-or-text-switch', title: 'Switch between choice and freeform', 'data-effective-select-or-text': true)
         end
       end

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.3.12'.freeze
+  VERSION = '0.3.13'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-31 00:00:00.000000000 Z
+date: 2019-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -401,7 +401,7 @@ files:
 - app/assets/javascripts/effective_select/input.js
 - app/assets/javascripts/effective_select/overrides.js.coffee
 - app/assets/javascripts/effective_select/select2.js
-- app/assets/javascripts/effective_select_or_text/initialize.js.coffee
+- app/assets/javascripts/effective_select_or_text/initialize.js
 - app/assets/javascripts/effective_select_or_text/input.js
 - app/assets/javascripts/effective_time/initialize.js.coffee
 - app/assets/javascripts/effective_time/input.js

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

@@ -1,15 +0,0 @@
-$(document).on 'click', '[data-effective-select-or-text]', (event) ->
-  $obj = $(event.currentTarget).closest('.effective-select-or-text')
-
-  $visible = $obj.children('.form-group:visible').first()
-  $hidden = $obj.children('.form-group:not(:visible)').first()
-
-  $visible.fadeOut('fast', ->
-    $visible.find('select').val('').trigger('change.select2')
-    $visible.find('input').val('')
-
-    $hidden.slideDown('fast')
-  )
-
-  false
-