effective_bootstrap 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23f8e41cf8f717cebc0a37b69649827039f10450
-  data.tar.gz: dedfaa4742860d88677c5d7900ae0826c28dad01
+  metadata.gz: 53dac1bf08b5c60e5a707d5ca15430ee6ebd8854
+  data.tar.gz: 149db5e6e0c9780ebda2506321969933d13d551e
 SHA512:
-  metadata.gz: b9a8b2f4057bdd82d4c169ef3f412643483df43060fe96d77b1be1fdf07ffe8764fe5f89e68ea1e6e1ce5d91332b74c0fb5bdbc2117346262c17fb3ebef1e87c
-  data.tar.gz: 2f4b5d343cb64101e1f4733fcecce8dbac86ccc40cd369f1bd408fd6efa288192a030b01fd92271e0fae1d2a8e00711cd49e220188ba9c11ede12703ff14310f
+  metadata.gz: e765a1fc74612b5f85eacc613449ae35b4e24c560483e51e5b236b59e1fa87dfa60aaef59b85bfa8e2b576be0405f4a1de143c60d4feb24d6a176dcd9a3ae38f
+  data.tar.gz: 9bc6d5fef8d632064f1b8f0ebb99e57525517855b343ccd770b6a22e7f0c2971bfab2ab1b97a08071f37957884a84cf4978a6ac4ca6096619ba405a4023cc079

data/app/assets/javascripts/effective_bootstrap.js

@@ -1,4 +1,5 @@
 //= require ./effective_bootstrap/base
+//= require ./effective_bootstrap/form
 
 //= require ./effective_datetime/input
 //= require ./effective_date/input

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

@@ -1,8 +1,4 @@
 this.EffectiveBootstrap ||= new class
-  current_submit: ''              # The $(.form-actions) that clicked
-  remote_form_payload: ''         # A fresh form
-  remote_form_flash: ''           # Array of Arrays
-
   initialize: (target) ->
     $(target || document).find('[data-input-js-options]:not(.initialized)').each (i, element) ->
       $element = $(element)
@@ -17,112 +13,28 @@ this.EffectiveBootstrap ||= new class
       EffectiveBootstrap[method_name].call(this, $element, options)
       $element.addClass('initialized')
 
-  validate: (form) ->
-    valid = form.checkValidity()
-    $form = $(form)
-
-    @clearFlash()
-    @reset($form) if $form.hasClass('was-validated')
-
-    if valid then @submitting($form) else @invalidate($form)
-    valid
-
-  submitting: ($form) ->
-    $form.addClass('form-is-valid').removeClass('form-is-invalid')
-    @spin()
-    setTimeout((-> EffectiveBootstrap.disable($form)), 0)
-
-  invalidate: ($form) ->
-    $form.addClass('was-validated').addClass('form-is-invalid')
-    $form.find('.form-current-submit').removeClass('form-current-submit')
-
-    # These controls need a little bit of help with client side validations
-    $form.find('.effective-radios:not(.no-feedback),.effective-checks:not(.no-feedback)').each ->
-      $(@).addClass(if $(@).find('input:invalid').length > 0 then 'is-invalid' else 'is-valid')
-
-    @flash($form, 'danger')
-
-  disable: ($form) ->
-    $form.find('[type=submit]').prop('disabled', true)
-
-  reset: ($form) ->
-    $form.removeClass('was-validated').removeClass('form-is-invalid').removeClass('form-is-valid')
-    $form.find('.form-current-submit').removeClass('form-current-submit')
-
-    # Clear any server side validation on individual inputs
-    $form.find('.alert.is-invalid').remove()
-    $form.find('.is-invalid').removeClass('is-invalid')
-    $form.find('.is-valid').removeClass('is-valid')
-
-    $form.find('[type=submit]').removeAttr('disabled')
-
-  spin: -> @current_submit.addClass('form-current-submit') if @current_submit.length > 0
-
-  beforeAjax: ($form) ->
-    return unless $form.data('remote')
-
-    $form.one 'ajax:success', (event, thing, another) ->
-      EffectiveBootstrap.loadFromAjax($(event.target), $(event.target).data('method') == 'delete')
-
-    $form.one 'ajax:error', (event, _, status, message) ->
-      EffectiveBootstrap.reset($(event.target))
-      EffectiveBootstrap.flash($(event.target), 'danger', "Ajax #{status}: #{message}")
-
-  # Loads remote for payload that was placed here by effective_resources create.js.erb and update.js.erb
-  loadFromAjax: ($target, was_delete) ->
-    $target = $target.closest('form') unless $target.is('form')
-
-    if @remote_form_payload.length > 0
-      $form = @remote_form_payload.find("form[data-remote-index='#{$target.data('remote-index')}']")
-      $form = @remote_form_payload.find('form') if $form.length == 0
-      $target.replaceWith($form)
-
-    # We update the current submit to point to the new one.
-    unless was_delete
-      if @current_submit.length > 0
-        @current_submit = $form.find("##{@current_submit.attr('id')}.form-actions")
-
-      if @remote_form_flash.length > 0 && was_delete == false
-        for flash in @remote_form_flash
-          @flash($form, flash[0], flash[1], true)
-
-    @remote_form_payload = ''; @remote_form_flash = ''; @current_submit = '';
-
-  flash: ($form, status, message, skip_success = false) ->
-    if status == 'danger' || status == 'error'
-      @current_submit.find('.eb-icon-x').show().delay(1000).fadeOut('slow')
-    else
-      @current_submit.find('.eb-icon-check').show().delay(1000).fadeOut('slow')
-
-    if message? && !(status == 'success' && skip_success)
-      @current_submit.prepend(@buildFlash(status, message))
-
-  clearFlash: -> @current_submit.find('.alert').remove() if @current_submit.length > 0
-
-  buildFlash: (status, message) ->
-    $("
-      <div class='alert alert-dismissable alert-#{status} fade show' role='alert'>
-        #{message}
-        <button class='close' type='button' aria-label='Close' data-dismiss='alert'>
-          <span aria-hidden='true'>&times;</span>
-        </button>
-      </div>
-    ")
-
-  setCurrentSubmit: ($submit) -> @current_submit = $submit if $submit.is('.form-actions')
-
 $ -> EffectiveBootstrap.initialize()
 $(document).on 'turbolinks:load', -> EffectiveBootstrap.initialize()
 $(document).on 'cocoon:after-insert', -> EffectiveBootstrap.initialize()
 $(document).on 'effective-bootstrap:initialize', (event) -> EffectiveBootstrap.initialize(event.currentTarget)
 
-# Sets EffectiveBootstrap. current_click.
-# This displays the spinner here, and directs any flash messages before and after loadRemoteForm
-$(document).on 'click', '.form-actions a[data-remote],.form-actions button[type=submit]', (event) ->
-  EffectiveBootstrap.setCurrentSubmit($(@).parent())
-  EffectiveBootstrap.spin()
-
-# This actually attached the handlers to a remote ajax form when it or an action inside it triggers a remote thing.
-$(document).on 'ajax:beforeSend', 'form[data-remote]', (event) ->
-  EffectiveBootstrap.beforeAjax($(@))
-  this.checkValidity()
+# These next two three methods hijack jquery_ujs data-confirm and do it our own way with a double click confirm
+$(document).on 'confirm', (event) ->
+  $obj = $(event.target)
+
+  if $obj.data('confirmed')
+    true
+  else
+    $obj.data('confirm-original', $obj.html())
+    $obj.html($obj.data('confirm'))
+    $obj.data('confirmed', true)
+    setTimeout(
+      (->
+        $obj.data('confirmed', false)
+        $obj.html($obj.data('confirm-original'))
+      )
+      , 4000)
+    false # don't show the confirmation dialog
+
+$.rails.confirm = (message) -> true
+$(document).on 'confirm:complete', (event) -> $(event.target).data('confirmed')

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

@@ -0,0 +1,113 @@
+this.EffectiveForm ||= new class
+  current_submit: ''              # The $(.form-actions) that clicked
+  remote_form_payload: ''         # A fresh form
+  remote_form_flash: ''           # Array of Arrays
+
+  validate: (form) ->
+    valid = form.checkValidity()
+    $form = $(form)
+
+    @clearFlash()
+    @reset($form) if $form.hasClass('was-validated')
+
+    if valid then @submitting($form) else @invalidate($form)
+    valid
+
+  submitting: ($form) ->
+    $form.addClass('form-is-valid').removeClass('form-is-invalid')
+    @spin()
+    setTimeout((-> EffectiveForm.disable($form)), 0)
+
+  invalidate: ($form) ->
+    $form.addClass('was-validated').addClass('form-is-invalid')
+    $form.find('.form-current-submit').removeClass('form-current-submit')
+
+    # These controls need a little bit of help with client side validations
+    $form.find('.effective-radios:not(.no-feedback),.effective-checks:not(.no-feedback)').each ->
+      $(@).addClass(if $(@).find('input:invalid').length > 0 then 'is-invalid' else 'is-valid')
+
+    @flash($form, 'danger')
+
+  disable: ($form) ->
+    $form.find('[type=submit]').prop('disabled', true)
+
+  reset: ($form) ->
+    $form = $form.closest('form') unless $form.is('form')
+
+    $form.removeClass('was-validated').removeClass('form-is-invalid').removeClass('form-is-valid')
+    $form.find('.form-current-submit').removeClass('form-current-submit')
+
+    # Clear any server side validation on individual inputs
+    $form.find('.alert.is-invalid').remove()
+    $form.find('.is-invalid').removeClass('is-invalid')
+    $form.find('.is-valid').removeClass('is-valid')
+
+    $form.find('[type=submit]').removeAttr('disabled')
+
+  spin: -> @current_submit.addClass('form-current-submit') if @current_submit.length > 0
+
+  beforeAjax: ($form) ->
+    return unless $form.data('remote')
+
+    $form.one 'ajax:success', (event, thing, another) ->
+      EffectiveForm.loadFromAjax($(event.target), $(event.target).data('method') == 'delete')
+
+    $form.one 'ajax:error', (event, _, status, message) ->
+      EffectiveForm.reset($(event.target))
+      EffectiveForm.flash($(event.target), 'danger', "#{status}: #{message || 'unable to contact server. please refresh the page and try again.'}")
+
+  # Loads remote for payload that was placed here by effective_resources create.js.erb and update.js.erb
+  loadFromAjax: ($target, was_delete) ->
+    $target = $target.closest('form') unless $target.is('form')
+
+    if @remote_form_payload.length > 0
+      $form = @remote_form_payload.find("form[data-remote-index='#{$target.data('remote-index')}']")
+      $form = @remote_form_payload.find('form') if $form.length == 0
+      if $form.length > 0
+        EffectiveBootstrap.initialize($form)
+        $target.replaceWith($form)
+
+    # We update the current submit to point to the new one.
+    unless was_delete
+      if @current_submit.length > 0
+        @current_submit = $form.find("##{@current_submit.attr('id')}.form-actions")
+
+      if @remote_form_flash.length > 0 && was_delete == false
+        for flash in @remote_form_flash
+          @flash($form, flash[0], flash[1], true)
+
+    @remote_form_payload = ''; @remote_form_flash = ''; @current_submit = '';
+
+  flash: ($form, status, message, skip_success = false) ->
+    if status == 'danger' || status == 'error'
+      @current_submit.find('.eb-icon-x').show().delay(1000).fadeOut('slow')
+    else
+      @current_submit.find('.eb-icon-check').show().delay(1000).fadeOut('slow')
+
+    if message? && !(status == 'success' && skip_success)
+      @current_submit.prepend(@buildFlash(status, message))
+
+  clearFlash: -> @current_submit.find('.alert').remove() if @current_submit.length > 0
+
+  buildFlash: (status, message) ->
+    $("
+      <div class='alert alert-dismissable alert-#{status} fade show' role='alert'>
+        #{message}
+        <button class='close' type='button' aria-label='Close' data-dismiss='alert'>
+          <span aria-hidden='true'>&times;</span>
+        </button>
+      </div>
+    ")
+
+  setCurrentSubmit: ($submit) -> @current_submit = $submit if $submit.is('.form-actions')
+
+# Sets EffectiveBootstrap. current_click.
+# This displays the spinner here, and directs any flash messages before and after loadRemoteForm
+$(document).on 'click', '.form-actions a[data-remote],.form-actions button[type=submit]', (event) ->
+  EffectiveForm.setCurrentSubmit($(@).parent())
+  EffectiveForm.spin()
+
+# This actually attached the handlers to a remote ajax form when it or an action inside it triggers a remote thing.
+$(document).on 'ajax:beforeSend', 'form[data-remote]', (event) ->
+  EffectiveForm.beforeAjax($(@))
+  this.checkValidity()

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

@@ -36,15 +36,15 @@
 }
 
 .form-actions.justify-content-start {
-  > a,button { margin-right: 0.5em; }
+  > a,button { margin-right: 0.5em; } // Not svg
 }
 
 .form-actions.justify-content-end {
-  > a,button { margin-left: 0.5em; }
+  > a,button { margin-left: 0.5em; } // Not svg
 }
 
 .form-actions.justify-content-center {
-  > a,button { margin-left: 0.5em; }
+  > a,button { margin-left: 0.5em; } // Not svg
 }
 
 // Spinner
@@ -52,16 +52,11 @@
 .form-actions.form-current-submit .eb-icon-spinner { display: inline; }
 
 // Radio and Checkbox fieldsets
-fieldset.form-group > label {
-  display: block;
-}
-
-div.form-group > label + .btn-group {
-  display: block;
-}
+fieldset.form-group > label { display: block; }
+div.form-group > label + .btn-group { display: block; }
 
-.effective-radios.is-invalid ~ .invalid-feedback { display: block }
-.effective-radios.is-valid ~ .valid-feedback { display: block }
+.effective-radios.is-invalid ~ .invalid-feedback { display: block; }
+.effective-radios.is-valid ~ .valid-feedback { display: block; }
 
-.effective-checks.is-invalid .invalid-feedback { display: block }
-.effective-checks.is-valid .valid-feedback { display: block }
+.effective-checks.is-invalid .invalid-feedback { display: block; }
+.effective-checks.is-valid .valid-feedback { display: block; }

data/app/helpers/effective_form_builder_helper.rb

@@ -1,7 +1,7 @@
 module EffectiveFormBuilderHelper
   def effective_form_with(**options, &block)
     options[:class] = [options[:class], 'needs-validation', ('form-inline' if options[:layout] == :inline)].compact.join(' ')
-    options[:html] = (options[:html] || {}).merge(novalidate: true, onsubmit: 'return EffectiveBootstrap.validate(this);')
+    options[:html] = (options[:html] || {}).merge(novalidate: true, onsubmit: 'return EffectiveForm.validate(this);')
 
     if options.delete(:remote) == true
       @_effective_remote_index ||= 0

data/app/models/effective/form_builder.rb

@@ -58,6 +58,12 @@ module Effective
       Effective::FormInputs::FormGroup.new(name, options, builder: self).to_html(&block)
     end
 
+    # This is gonna be a post?
+    def remote_link_to(name, url, options = {}, &block)
+      options[:href] ||= url
+      Effective::FormInputs::RemoteLinkTo.new(name, options, builder: self).to_html(&block)
+    end
+
     def number_field(name, options = {})
       Effective::FormInputs::NumberField.new(name, options, builder: self).to_html { super(name, options) }
     end

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

@@ -1,10 +1,6 @@
 module Effective
   module FormInputs
-    class Delete < Effective::FormInput
-
-      def to_html(&block)
-        return super unless (form_readonly? || form_disabled?)
-      end
+    class Delete < Submit
 
       def build_input(&block)
         tags = [
@@ -17,71 +13,14 @@ module Effective
         (left? ? tags.reverse.join : tags.join).html_safe
       end
 
-      def label_options
-        false
-      end
-
-      def wrapper_options
-        @right = true unless (left? || center? || right?)
-
-        classes = [
-          ('row' if layout == :horizontal),
-          'form-group form-actions',
-          ('form-actions-inline' if inline?),
-          ('form-actions-bordered' if border?),
-          ('justify-content-start' if left? && layout == :vertical),
-          ('justify-content-center' if center? && layout == :vertical),
-          ('justify-content-end' if right? && layout == :vertical)
-        ].compact.join(' ')
-
-        { class: classes, id: tag_id }
-      end
-
       def input_html_options
-        { class: 'btn btn-warning', data: { method: :delete, remote: true, confirm: "Delete #{object}?"} }
+        { class: 'btn btn-warning', data: { method: :delete, remote: true, confirm: "Really delete<br>#{object}?".html_safe } }
       end
 
       def border?
         false
       end
 
-      def inline?
-        return @form_actions_inline unless @form_actions_inline.nil?
-        @form_actions_inline = (options.delete(:inline) || false)
-      end
-
-      def left?
-        return @left unless @left.nil?
-        @left = (options.delete(:left) || false)
-      end
-
-      def center?
-        return @center unless @center.nil?
-        @center = (options.delete(:center) || false)
-      end
-
-      def right?
-        return @right unless @right.nil?
-        @right = (options.delete(:right) || false)
-      end
-
-      def feedback_options
-        # case layout
-        # when :inline
-        #   false
-        # else
-        #   {
-        #     valid: { class: 'valid-feedback', text: 'Looks good! Submitting...' },
-        #     invalid: {
-        #       class: 'invalid-feedback',
-        #       text: 'one or more errors are present. please fix the errors above and try again.'
-        #     }
-        #   }
-        # end
-        false
-      end
-
-
     end
   end
 end

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

@@ -0,0 +1,30 @@
+module Effective
+  module FormInputs
+    class RemoteLinkTo < Submit
+
+      def build_input(&block)
+        tags = [
+          icon('check', style: 'display: none;'),
+          icon('x', style: 'display: none;'),
+          icon('spinner'),
+          (block_given? ? capture(&block) : content_tag(:a, name, options[:input]))
+        ]
+
+        (left? ? tags.reverse.join : tags.join).html_safe
+      end
+
+      def input_html_options
+        { class: '', rel: 'nofollow', data: { method: :post, remote: true, confirm: confirm } }
+      end
+
+      def border?
+        false
+      end
+
+      def confirm
+        (options.delete(:confirm) || "#{name} to<br>#{object}?").html_safe
+      end
+
+    end
+  end
+end

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.0.10'.freeze
+  VERSION = '0.0.11'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-23 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -369,6 +369,7 @@ files:
 - app/assets/images/icons/zoom-out.svg
 - app/assets/javascripts/effective_bootstrap.js
 - app/assets/javascripts/effective_bootstrap/base.js.coffee
+- app/assets/javascripts/effective_bootstrap/form.js.coffee
 - app/assets/javascripts/effective_date/initialize.js.coffee
 - app/assets/javascripts/effective_date/input.js
 - app/assets/javascripts/effective_datetime/bootstrap-datetimepicker.js
@@ -429,6 +430,7 @@ files:
 - app/models/effective/form_inputs/phone_field.rb
 - app/models/effective/form_inputs/price_field.rb
 - app/models/effective/form_inputs/radios.rb
+- app/models/effective/form_inputs/remote_link_to.rb
 - app/models/effective/form_inputs/save.rb
 - app/models/effective/form_inputs/select.rb
 - app/models/effective/form_inputs/static_field.rb