effective_bootstrap 0.6.15 → 0.6.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: baff32b0e2fd189ebfed2965601b5b28f310d06bc81ffcfa21cb4408800535e0
-  data.tar.gz: ea6ad9d1451a5841b2867083693a4a081a84aaea8ca7ff5f882652eca2a7cb0c
+  metadata.gz: ee127d9cd5bf9286c39d6956f815d55187024a996e90752fc44a022401adc6b6
+  data.tar.gz: 3e93f1f0f9caa77a5aeca17550597d80e250471c390924aebcb255b074e1e9d1
 SHA512:
-  metadata.gz: d9171c65eb5ef481eb38f6d93edaff9e1762495825c6c8049aa848b86fc5fa3abb55507c2a262bbca05a77dbbd946e924c68d095f0e6ff2052ace5e7149b11ea
-  data.tar.gz: 8220337bd6dba1c249595984c3b594b456e1cb0ce4e3a577aa455f1af2666771b292ac640bc094472df454ff6c04f50ad915daa024c6cb9de38377c77017b9de
+  metadata.gz: dfcb11403fdacfe1aaf2cb7c4b6b0eb7dfa5963a1ea31c06131cb5e32d1ef93cceab0a83794e357833fe0b9bc18dcb36ea9bdfbcffa17cdccfa150dc0b42fdfe
+  data.tar.gz: 8953ebb9de05d0bc59e20962752706055ac8a00f86fb8e4f43989fa8a601d878b9d4ab0aaeb38c20f24801d5106453247ac7b7740755eaa55047069303d03cb2

data/README.md

@@ -231,6 +231,8 @@ The default is `layout: :vertical`.
 
 All standard form fields have been implemented as per [Rails 5.1 FormHelper](http://api.rubyonrails.org/v5.1/classes/ActionView/Helpers/FormHelper.html)
 
+When working as a `remote: true` form, you can also pass `flash_success: true|false` and `flash_error: true|false` to control the flash behaviour. By default, the errors will be displayed, and the success will be hidden.
+
 ### Options
 
 There are three sets of options hashes that you can pass into any form input:

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

@@ -101,7 +101,7 @@ this.EffectiveForm ||= new class
       flash_status = @remote_form_flash[0][0]
       flash_message = @remote_form_flash[0][1]
 
-    @flash($form, flash_status, flash_message, true)
+    @flash($form, flash_status, flash_message)
 
     # Fire off form events
     was_error = ($form.hasClass('with-errors') || flash_status == 'danger' || flash_status == 'error')
@@ -118,7 +118,7 @@ this.EffectiveForm ||= new class
     @current_submit = ''
     true
 
-  flash: ($form, status, message, skip_success = false) ->
+  flash: ($form, status, message) ->
     return unless @current_submit.length > 0
 
     if status == 'danger' || status == 'error'
@@ -126,7 +126,7 @@ this.EffectiveForm ||= new class
     else
       @current_submit.find('.eb-icon-check').show().delay(1000).fadeOut('slow', -> $form.trigger('effective-form:success-animation-done', @remote_form_commit, message))
 
-    if message? && !(status == 'success' && skip_success)
+    if (message || '').length > 0
       @current_submit.prepend(@buildFlash(status, message))
 
   clearFlash: -> @current_submit.find('.alert').remove() if @current_submit.length > 0

data/app/assets/stylesheets/effective_bootstrap/forms.scss

@@ -12,6 +12,14 @@
   }
 }
 
+form[data-remote="true"]:not(.show-flash-success) {
+  .effective-form-flash.alert-success { display: none; }
+}
+
+form[data-remote="true"].hide-flash-danger {
+  .effective-form-flash.alert-danger { display: none; }
+}
+
 .form-actions-inline.justify-content-end {
   margin-left: 0.5em;
 

data/app/helpers/effective_form_builder_helper.rb

@@ -13,13 +13,6 @@ module EffectiveFormBuilderHelper
       "new_#{class_name}"
     end
 
-    options[:class] = [
-      options[:class],
-      'needs-validation',
-      ('form-inline' if options[:layout] == :inline),
-      ('with-errors' if subject.respond_to?(:errors) && subject.errors.present?)
-    ].compact.join(' ')
-
     options[:html] = (options[:html] || {}).merge(novalidate: true, onsubmit: 'return EffectiveForm.validate(this);')
 
     remote_index = options.except(:model).hash.abs
@@ -31,6 +24,15 @@ module EffectiveFormBuilderHelper
       options[:local] = false
     end
 
+    options[:class] = [
+      options[:class],
+      'needs-validation',
+      ('form-inline' if options[:layout] == :inline),
+      ('with-errors' if subject.respond_to?(:errors) && subject.errors.present?),
+      ('show-flash-success' if options[:remote] && options[:flash_success]),
+      ('hide-flash-danger' if options[:remote] && options.key?(:flash_error) && !options[:flash_error])
+    ].compact.join(' ')
+
     if options.delete(:remote) == true
       @_effective_remote_index ||= {}
       remote_index = remote_index + 1 if @_effective_remote_index[remote_index]

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.6.15'.freeze
+  VERSION = '0.6.16'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.6.15
+  version: 0.6.16
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2020-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails