effective_bootstrap 0.9.17 → 0.9.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c76bc463f1c4a4b5c248ac9072bdb2cc971da468cf13292519e80f64d3ec693
-  data.tar.gz: 85349386858572224e4a1127d8afc3dbc98250751282f60e29678833eab0ee86
+  metadata.gz: dc2972eec59594f06ea675c943277a99d67ca6e1e75e30e10bcc7252c776a15d
+  data.tar.gz: 22debca767e9449ba70d890bd98d38e262641d39fcc6b7c53fd184f28a9d83ae
 SHA512:
-  metadata.gz: 59b788edfb7934ad72a406d79ceab25c813c27343a4cefb0f871bc4fb026110a0646eae6df0fbc663d14168644f91b421a381b326705582c8dfb2f259f3e909d
-  data.tar.gz: 6cc0cbc87baa14e033a480ce895be3c0570c78639a6891017e57cd9cf105027287c5b3ed83990f38024315d76a06f56cf734b7f87a01d4814fa8ff58b1a1b832
+  metadata.gz: f14eceace3be9ceead1d2fdec73c34959223e3a47684355da505d41165e4d68b3c24203c95d1b5009b58153725052f5c91398c6c6affd499ba3ca00ca35fd7df
+  data.tar.gz: 7a847310a0b44fae9ce81e7fb21f5cf89bfc43c2200bfafea61eddc6341adf32e1cb2b3d8e896d6add4c52a663b2d399e261b4e2a6b9d62897ffb17db1bc8802

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

@@ -4,6 +4,7 @@ this.EffectiveForm ||= new class
   remote_form_commit: ''              # String containing the last params[:commit]
   remote_form_payload: ''             # String containing html from server side render of this form
   remote_form_flash: ''               # Array of Arrays
+  remote_form_redirect: ''            # String containing the redirect path (optional)
 
   validate: (form) ->
     valid = form.checkValidity()
@@ -73,6 +74,15 @@ this.EffectiveForm ||= new class
     $target = $target.closest('form') unless $target.is('form')
     $form = ''
 
+    if @remote_form_redirect.length > 0
+      if window.Turbolinks
+        window.Turbolinks.visit(@remote_form_redirect)
+      else
+        window.location.href = @remote_form_redirect
+
+      @remote_form_redirect = ''
+      return
+
     if @remote_form_payload.length > 0
       $payload = $("<div>#{@remote_form_payload}</div>")
       $form = $payload.find("form[data-remote-index='#{$target.data('remote-index')}']")
@@ -160,7 +170,7 @@ this.EffectiveForm ||= new class
 # 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()
+  EffectiveForm.spin() unless $(@).attr('data-confirm')
 
 # 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) ->

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

@@ -3,7 +3,7 @@ assignPositions = (target) ->
   return unless $hasMany.length > 0
 
   $fields = $hasMany.children('.has-many-fields:not(.marked-for-destruction)')
-  positions = $fields.find("input[name$='[position]']").map(-> this.value).get()
+  positions = $fields.find("input[name$='[position]'][type=hidden]").map(-> this.value).get()
 
   if positions.length > 0
     index = Math.min.apply(Math, positions) || 0
@@ -35,7 +35,7 @@ $(document).on 'click', '[data-effective-form-has-many-add]', (event) ->
   return unless $hasMany.length > 0
 
   uid = (new Date).valueOf()
-  template = $obj.data('effective-form-has-many-template').replace(/HASMANYINDEX/g, uid)
+  template = atob($obj.data('effective-form-has-many-template')).replace(/HASMANYINDEX/g, uid)
 
   $fields = $(template).hide().fadeIn('fast')
   EffectiveBootstrap.initialize($fields)

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

@@ -1,9 +1,9 @@
 # Prevent non-currency buttons from being pressed
-$(document).on 'click', 'button[data-effective-password]', (event) ->
+$(document).on 'click', 'span[data-effective-password]', (event) ->
   $obj = $(event.currentTarget)
   $input = $obj.closest('.input-group')
 
   $input.find('input').attr('type', $obj.data('effective-password'))
-  $input.find('button[data-effective-password]').toggle()
+  $input.find('span[data-effective-password]').toggle()
 
   false

data/app/helpers/effective_bootstrap_helper.rb

@@ -411,7 +411,9 @@ module EffectiveBootstrapHelper
 
     @_tab_active = nil if @_tab_active == :first
 
-    if @_tab_mode == :tablist # Inserting the label into the tablist top
+    if @_tab_mode == :tablist_vertical
+      content_tag(:a, label, id: ('tab-' + controls), class: ['nav-link', ('active' if active)].compact.join(' '), href: '#' + controls, 'aria-controls': controls, 'aria-selected': active.to_s, 'data-toggle': 'tab', role: 'tab')
+    elsif @_tab_mode == :tablist # Inserting the label into the tablist top
       content_tag(:li, class: 'nav-item') do
         content_tag(:a, label, id: ('tab-' + controls), class: ['nav-link', ('active' if active)].compact.join(' '), href: '#' + controls, 'aria-controls': controls, 'aria-selected': active.to_s, 'data-toggle': 'tab', role: 'tab')
       end
@@ -423,6 +425,29 @@ module EffectiveBootstrapHelper
     end
   end
 
+  def vertical_tabs(active: nil, unique: false, list: {}, content: {}, &block)
+    raise 'expected a block' unless block_given?
+
+    @_tab_mode = :tablist_vertical
+    @_tab_active = (active || :first)
+    @_tab_unique = ''.object_id if unique
+
+    content_tag(:div, class: 'row border') do
+      content_tag(:div, class: 'col-3 border-right') do
+        content_tag(:div, {class: 'nav flex-column nav-pills my-2', role: 'tablist', 'aria-orientation': :vertical}.merge(list)) do
+          yield # Yield to tab the first time
+        end
+      end +
+      content_tag(:div, class: 'col-9') do
+        content_tag(:div, {class: 'tab-content my-2'}.merge(content)) do
+          @_tab_mode = :content
+          @_tab_active = (active || :first)
+          yield # Yield to tab the second time
+        end
+      end
+    end
+  end
+
   def merge_class_key(hash, value)
     return { :class => value } unless hash.kind_of?(Hash)
 

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

@@ -75,6 +75,8 @@ module Effective
 
       def build_table_attachment(attachment)
         url = (@template.url_for(attachment) rescue false)
+        url ||= (Rails.application.routes.url_helpers.rails_blob_path(attachment, only_path: true) rescue false)
+
         return unless url
 
         image_tag = content_tag(:img, '', class: '', src: url, alt: attachment.filename.to_s) if attachment.image?
@@ -98,6 +100,8 @@ module Effective
 
       def build_card_attachment(attachment)
         url = (@template.url_for(attachment) rescue false)
+        url ||= (Rails.application.routes.url_helpers.rails_blob_path(attachment, only_path: true) rescue false)
+
         return unless url
 
         content_tag(:div, class: 'col') do

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

@@ -150,7 +150,7 @@ module Effective
         html.gsub!("#{name}_attributes][#{index}]", "#{name}_attributes][HASMANYINDEX]")
         html.gsub!("#{name}_attributes_#{index}_", "#{name}_attributes_HASMANYINDEX_")
 
-        html.html_safe
+        Base64.encode64(html)
       end
 
       def link_to_add(block)

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

@@ -11,12 +11,12 @@ module Effective
       end
 
       def eyes
-        content_tag(:button, icon('eye'),
+        content_tag(:span, icon('eye'),
           class: 'btn input-group-text',
           title: 'Show password',
           'data-effective-password': 'text'
         ) +
-        content_tag(:button, icon('eye-off'),
+        content_tag(:span, icon('eye-off'),
           class: 'btn input-group-text',
           title: 'Hide password',
           style: 'display: none;',

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.9.17'.freeze
+  VERSION = '0.9.22'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.9.17
+  version: 0.9.22
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-09 00:00:00.000000000 Z
+date: 2021-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -615,7 +615,6 @@ files:
 - app/helpers/effective_editor_helper.rb
 - app/helpers/effective_form_builder_helper.rb
 - app/helpers/effective_icons_helper.rb
-- app/models/effective/access_denied.rb
 - app/models/effective/form_builder.rb
 - app/models/effective/form_input.rb
 - app/models/effective/form_inputs/check_box.rb

data/app/models/effective/access_denied.rb

@@ -1,17 +0,0 @@
-unless defined?(Effective::AccessDenied)
-  module Effective
-    class AccessDenied < StandardError
-      attr_reader :action, :subject
-
-      def initialize(message = nil, action = nil, subject = nil)
-        @message = message
-        @action = action
-        @subject = subject
-      end
-
-      def to_s
-        @message || I18n.t(:'unauthorized.default', :default => 'Access Denied')
-      end
-    end
-  end
-end