effective_bootstrap 0.3.17 → 0.3.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82d56b3ce9fb868c32b156d3daa37aa908fd1246
-  data.tar.gz: af4af4ee0bd8457b0b2f445016acb75eb0a83301
+  metadata.gz: 4ccfe6cf9b10dafad917ac4e6311f0fb4eec24e8
+  data.tar.gz: c8efb6470623663cfba0197533373f9608c8a8f0
 SHA512:
-  metadata.gz: 1ef9d83a6eaf3d0c5328539ce0e63bc201820897337279a93da7726d24c098a4a48a8bb6aae9506133e24ba9c801847e22013fea20d3868ec9ac4964562786dc
-  data.tar.gz: 51a1af53771c0aa27cbe870a47831e781473cc37f581d27e5745cfded86f8d7fc721b8ddcce06b0a12cfcdb6cc08d68c16817b55d71b39d8d4c882c57b0c11b6
+  metadata.gz: 4c80e53176e6f7e849d37c4f306119b598f3f5671249717876b9043d4954a84eb9817beae3d61ba3da9e04853ddb6a180b2624c2685354694437741fac4733e7
+  data.tar.gz: 9c0d9b638d3c5d643b3cc4a30a33eb144ba2c1ba0ec39560031b003b26e68a85698c9e6717fb0a21b3ae9563cd039b1273d56d5aaf5bd5e432cfc3276290a690

data/app/assets/javascripts/effective_bootstrap.js

@@ -10,6 +10,7 @@
 //= require ./effective_checks/input
 //= require ./effective_editor/input
 //= require ./effective_file/input
+//= require ./effective_number_text/input
 //= require ./effective_percent/input
 //= require ./effective_phone/input
 //= require ./effective_price/input

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

@@ -85,14 +85,22 @@ this.EffectiveForm ||= new class
       @current_submit = $form.find("##{@current_submit.attr('id')}.form-actions")
 
     # Process Flash
+    flash_status = ''
+    flash_message = ''
+
     if @remote_form_flash.length > 0
-      @flash($form, flash[0], flash[1], true) for flash in @remote_form_flash
-      @remote_form_flash = ''
-    else
-      @flash($form, 'success', '', true)
+      flash_status = @remote_form_flash[0][0]
+      flash_message = @remote_form_flash[0][1]
+
+    @flash($form, flash_status, flash_message, true)
+
+    # Fire off form events
+    was_error = ($form.hasClass('with-errors') || flash_status == 'danger' || flash_status == 'error')
+
+    $form.trigger((if was_error then 'effective-form:error' else 'effective-form:success'), flash_message)
+    $form.trigger('effective-form:complete', flash_message, was_error)
 
-    $form.trigger(if $form.hasClass('with-errors') then 'effective-form:error' else 'effective-form:success')
-    $form.trigger('effective-form:complete')
+    @remote_form_flash = ''
     true
 
   flash: ($form, status, message, skip_success = false) ->

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

@@ -0,0 +1,6 @@
+# Prevent non-currency buttons from being pressed
+$(document).on 'keydown', "input[type='text'].effective_number_text", (event) ->
+  allowed = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-', ',', '.']
+
+  if event.key && event.key.length == 1 && event.metaKey == false && allowed.indexOf(event.key) == -1
+    event.preventDefault()

data/app/assets/javascripts/effective_number_text/input.js

@@ -0,0 +1 @@
+//= require ./initialize

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

@@ -13,15 +13,18 @@ $(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_name = $visible.find('input,textarea,select').first().attr('name');
-  hidden_name = $hidden.find('input,textarea,select').first().attr('name');
+  $visible_input = $visible.find('input,textarea,select').first()
+  $hidden_input = $hidden.find('input,textarea,select').first()
 
-  if(visible_name == hidden_name) { $hidden.find('input,textarea,select').removeAttr('disabled'); }
+  required = $visible_input.prop('required') || $hidden_input.prop('required')
+
+  $hidden_input.prop('required', required)
+  $visible_input.removeAttr('required')
 
   $visible.fadeOut('fast', function() {
-    if(visible_name == hidden_name) { $(this).find('input,textarea,select').prop('disabled', true); }
-    $hidden.fadeIn('fast');
+    $hidden.prop('required', required).detach().insertAfter($visible).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_builder.rb

@@ -82,6 +82,10 @@ module Effective
       Effective::FormInputs::NumberField.new(name, options, builder: self).to_html { super(name, options) }
     end
 
+    def number_text_field(name, options = {})
+      Effective::FormInputs::NumberTextField.new(name, options, builder: self).to_html
+    end
+
     def password_field(name, options = {})
       Effective::FormInputs::PasswordField.new(name, options, builder: self).to_html { super(name, options) }
     end

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

@@ -0,0 +1,15 @@
+module Effective
+  module FormInputs
+    class NumberTextField < Effective::FormInput
+
+      def build_input(&block)
+        @builder.super_text_field(name, options[:input])
+      end
+
+      def input_html_options
+        { class: 'form-control effective_number_text', autocomplete: 'off' }
+      end
+
+    end
+  end
+end

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

@@ -7,7 +7,7 @@ module Effective
       attr_accessor :text_options
 
       VISIBLE = {}
-      HIDDEN_AND_DISABLED = { wrapper: { style: 'display: none;' }, disabled: true }
+      HIDDEN = { wrapper: { style: 'display: none;' } }
 
       def initialize(name, options, builder:)
         @name_text = options.delete(:name_text) || raise('Please include a text method name')
@@ -26,8 +26,13 @@ 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) +
+          if select?
+            @builder.send(email_field? ? :email_field : :text_field, name_text, text_options) +
+            @builder.select(name, select_collection, select_options)
+          else
+            @builder.select(name, select_collection, select_options) +
+            @builder.send(email_field? ? :email_field : :text_field, name_text, text_options)
+          end +
           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
@@ -38,7 +43,10 @@ module Effective
 
         value = object.send(name)
 
-        (value.present? && select_collection.include?(value)) || (value.blank? && object.send(name_text).blank?)
+        return true if (value.present? && select_collection.include?(value))
+        return true if (value.to_i > 0 && select_collection.find { |obj| obj.respond_to?(:id) && obj.id == value.to_i })
+
+        return true if value.blank? && object.send(name_text).blank?
       end
 
       def text?
@@ -50,11 +58,11 @@ module Effective
       end
 
       def select_options
-        @select_options.merge(select? ? VISIBLE : HIDDEN_AND_DISABLED)
+        @select_options.merge(select? ? VISIBLE : HIDDEN)
       end
 
       def text_options
-        @text_options.merge(text? ? VISIBLE : HIDDEN_AND_DISABLED)
+        @text_options.merge(text? ? VISIBLE : HIDDEN)
       end
 
     end

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.3.17'.freeze
+  VERSION = '0.3.18'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.3.17
+  version: 0.3.18
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-05 00:00:00.000000000 Z
+date: 2019-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -388,6 +388,8 @@ files:
 - app/assets/javascripts/effective_editor/quill.js
 - app/assets/javascripts/effective_file/initialize.js.coffee
 - app/assets/javascripts/effective_file/input.js
+- app/assets/javascripts/effective_number_text/initialize.js.coffee
+- app/assets/javascripts/effective_number_text/input.js
 - app/assets/javascripts/effective_percent/initialize.js.coffee
 - app/assets/javascripts/effective_percent/input.js
 - app/assets/javascripts/effective_phone/initialize.js.coffee
@@ -448,6 +450,7 @@ files:
 - app/models/effective/form_inputs/float_field.rb
 - app/models/effective/form_inputs/form_group.rb
 - app/models/effective/form_inputs/number_field.rb
+- app/models/effective/form_inputs/number_text_field.rb
 - app/models/effective/form_inputs/password_field.rb
 - app/models/effective/form_inputs/percent_field.rb
 - app/models/effective/form_inputs/phone_field.rb