effective_bootstrap 0.9.38 → 0.9.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b22f36af611b8928951e32da7674994739220cf189d8b1486359e58507a66bff
-  data.tar.gz: 884b64100e7d832a0ba995f6b0e14b1ac12e147e560b0a583cb40ea52dd57f69
+  metadata.gz: 5bfd09a27598da184de3a2f8208d36db4ac3021c76946dc45f7c7c81ed0d0b1f
+  data.tar.gz: e62446f65854520af700752157415cf606d18b43ac631726394c26895a8df705
 SHA512:
-  metadata.gz: 4ffe5bbd7785815688f74a8e0c3304438dff1d12f3213c20220e664f40c0d4f71fc37e06f09de4beb15994cc63ff2dd766c79a666b58353ce52b4919f57f7c2e
-  data.tar.gz: 28330b3adfa44c418270d85ace2339960d2664eb5d44fa56158a0ff23aea940648567a3422b7a6f81d5466a13bcab6a2549580bfc1ad53dd24135b4e9633a963
+  metadata.gz: 2ca774aa86d286554166d8780d0a8ba4ddbe187f4decb5295e83728d63b5b5eb7723abd5bf1aa74881ca36c983c94d2fc8b88fb6ed58fbdc7759287ae7886a70
+  data.tar.gz: 9f15e36d568891a388fd9c788887f9fadd195d5bc81d06bf04ba899161a76a55a676850311f41efbb0ec55458b523091c36ca86ddfe430e282b9d402d875fdd7

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

@@ -6,7 +6,25 @@ uploadActiveStorage = (editor, data) ->
 
     upload.create (error, blob) =>
       url = '/rails/active_storage/blobs/redirect/' + blob.signed_id + '/' + blob.filename
-      editor.complete({ file: { url: url }}, data.e)
+      editor.complete({ file: { url: url, name: blob.filename, content_type: blob.content_type }}, data.e)
+
+insertUploadByDrop = (response, e) ->
+  if @app.block.is()
+    instance = @app.block.get()
+    target = e.target
+    type = instance.getType()
+
+    if ((type == 'card' && target && target.tagName == 'IMG' && instance.hasImage()) || type == 'image')
+      return @change(response)
+    else if (e && type != 'card' && instance.isEditable())
+      @app.insertion.insertPoint(e)
+
+  content_type = (response.file.content_type || '')
+
+  unless content_type.startsWith('image') && @app.filelink
+    @app.filelink._insert(response)
+  else
+    @insert(response)
 
 (this.EffectiveBootstrap || {}).effective_article_editor = ($element, options) ->
 
@@ -15,4 +33,9 @@ uploadActiveStorage = (editor, data) ->
       upload: (editor, data) -> uploadActiveStorage(editor, data)
     }
 
-  ArticleEditor($element, options)
+    options['filelink'] = {
+      upload: (editor, data) -> uploadActiveStorage(editor, data)
+    }
+
+  editor = ArticleEditor($element, options)
+  editor.app.image.insertByDrop = insertUploadByDrop

data/app/assets/javascripts/effective_bootstrap/confirm.js.coffee.erb

@@ -4,19 +4,27 @@ if <%= !!EffectiveBootstrap.use_custom_data_confirm %> && (window.Rails || $.rai
   $(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)
+    # Already confirmed
+    return true if $obj.data('confirmed')
+
+    # Otherwise unconfirmed
+    $obj.data('confirm-original', $obj.html())
+    $obj.html($obj.data('confirm'))
+    $obj.data('confirmed', true)
+
+    # When using the direct to s3 active storage javascript library
+    $activeStorageUpload = $obj.closest('form').find('input[type=file][data-direct-upload-url]')
+
+    if $activeStorageUpload.length == 0
       setTimeout(
         (->
           $obj.data('confirmed', false)
           $obj.html($obj.data('confirm-original'))
         )
         , 4000)
-      false # don't show the confirmation dialog
+
+    # Do not display the confirmation dialog
+    false
 
   if window.Rails
     window.Rails.confirm = (message) -> true

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

@@ -13,7 +13,12 @@ $(document).on 'direct-upload:error', (event) ->
   $("[data-direct-upload-id=#{event.detail.id}]").addClass('direct-upload--error').attr('title', event.detail.error)
 
 $(document).on 'direct-upload:end', (event) ->
-  $("[data-direct-upload-id=#{event.detail.id}]").addClass('direct-upload--complete')
+  $obj = $("[data-direct-upload-id=#{event.detail.id}]")
+
+  $obj.addClass('direct-upload--complete')
+
+  # Rails UJS fix
+  $obj.closest('form').find('[type=submit][data-confirm]').data('confirmed', true)
 
 $(document).on 'change', "input[type='file'][data-click-submit]", (event) ->
   $(event.currentTarget).closest('form').find('button[type=submit],input[type=submit]').first().click()

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

@@ -36,8 +36,27 @@ $(document).on 'click', '[data-effective-form-has-many-add]', (event) ->
   template = atob($obj.data('effective-form-has-many-template')).replace(/HASMANYINDEX/g, uid)
 
   $fields = $(template).hide().fadeIn('fast')
-  EffectiveBootstrap.initialize($fields)
   $obj.closest('.has-many-links').before($fields)
+  EffectiveBootstrap.initialize($fields)
+
+  assignPositions($hasMany)
+  true
+
+$(document).on 'click', '[data-effective-form-has-many-insert]', (event) ->
+  event.preventDefault()
+
+  $obj = $(event.currentTarget)
+  $hasMany = $obj.closest('.form-has-many')
+  return unless $hasMany.length > 0
+
+  $add = $hasMany.children('.has-many-links').find('[data-effective-form-has-many-template]')
+
+  uid = (new Date).valueOf()
+  template = atob($add.data('effective-form-has-many-template')).replace(/HASMANYINDEX/g, uid)
+
+  $fields = $(template).hide().fadeIn('fast')
+  $obj.closest('.has-many-fields').before($fields)
+  EffectiveBootstrap.initialize($fields)
 
   assignPositions($hasMany)
   true

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

@@ -1,4 +1,4 @@
+@import './collapse';
 @import './forms';
 @import './icons';
 @import './overrides';
-

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

@@ -0,0 +1,7 @@
+.effective-collapse-actions {
+  .collapse-label-expand { display: none; }
+  .collapse-label-collapse { display: inline-block; }
+
+  &.collapsed .collapse-label-expand { display: inline-block; }
+  &.collapsed .collapse-label-collapse { display: none; }
+}

data/app/assets/stylesheets/effective_has_many/input.scss

@@ -3,12 +3,16 @@
   .has-many-move { display: none; }
   .has-many-remove-disabled { opacity: 0; cursor: default !important; }
 
+  .has-many-actions { margin-bottom: 0.75rem; }
   .has-many-remove { margin-top: 1rem; }
   .has-many-move { margin-top: 1.5rem; }
 }
 
 .form-has-many.reordering {
+  .has-many-actions { display: none; }
   .has-many-move { display: inline-block; cursor: grab; }
+
+  .form-has-many { display: none; }
 }
 
 .form-has-many.tight {

data/app/helpers/effective_bootstrap_helper.rb

@@ -18,6 +18,31 @@ module EffectiveBootstrapHelper
     content
   end
 
+  def accordion_collapse(label, opts = {}, &block)
+    raise 'expected a block' unless block_given?
+
+    id = "collapse-#{effective_bootstrap_unique_id}"
+    show = (opts.delete(:show) == true)
+
+    link_opts = { 'data-toggle': 'collapse', role: 'button', href: "##{id}", 'aria-controls': "##{id}", 'aria-expanded': show }
+
+    link_opts[:class] = opts.delete(:link_class) || 'btn btn-link'
+    div_class = opts.delete(:div_class)
+    card_class = opts.delete(:card_class) || 'card card-body my-2'
+
+    # Accordion collapse
+    content_tag(:div, class: "card mb-0") do
+      content_tag(:div, class: "card-header") do
+        content_tag(:h2, class: "mb-0") do
+          content_tag(:button, label, link_opts.merge(class: "btn btn-link"))
+        end
+      end +
+      content_tag(:div, id: id, class: ['collapse', div_class, ('show' if show)].compact.join(' '), "data-parent": "##{@_accordion_active}") do
+        content_tag(:div, capture(&block), class: "card-body")
+      end
+    end
+  end
+
   # https://getbootstrap.com/docs/4.0/components/card/
   # = card('title do')
   #   %p Stuff
@@ -56,40 +81,67 @@ module EffectiveBootstrapHelper
   # = collapse('already expanded', show: true) do
   #   %p Something Expanded
 
+  # the word 'show' will automatically be replaced with hide and an icon added
+  # = collapse('show items') do
+  #   %p Something Expanded
+
+  # Override the expand and collapse labels directly
+  # = collapse('show items', expand: "Show items" + icon('ok'), collapse: "Hide items" + icon('x')) do
+  #   %p Something Expanded
+
   # collapse(items.length, class: 'btn btn-primary', class: 'mt-2') do
   #   items.map { |item| content_tag(:div, item.to_s) }.join.html_safe
   # end
+
+  COLLAPSE_SUBSTITUTIONS = {
+    'Show ' => 'Hide ',
+    'show ' => 'hide ',
+    'Expand ' => 'Collapse ',
+    'expand ' => 'collapse ',
+    ' More' => ' Less',
+    ' more' => ' less'
+  }
+
   def collapse(label, opts = {}, &block)
     raise 'expected a block' unless block_given?
 
+    return accordian_collapse(label, opts, &block) if @_accordion_active
+
     id = "collapse-#{effective_bootstrap_unique_id}"
     show = (opts.delete(:show) == true)
 
+    # Figure out all the button / link options
     link_opts = { 'data-toggle': 'collapse', role: 'button', href: "##{id}", 'aria-controls': "##{id}", 'aria-expanded': show }
 
+    # Two link labels
+    label_expand = opts.delete(:expand) || label.to_s.tap do |label|
+      COLLAPSE_SUBSTITUTIONS.each { |show, hide| label.sub!(hide, show) }
+    end + icon('chevron-down')
+
+    label_collapse = opts.delete(:collapse) || label.to_s.tap do |label|
+      COLLAPSE_SUBSTITUTIONS.each { |show, hide| label.sub!(show, hide) }
+    end + icon('chevron-up')
+
+    # The link html classes
     link_opts[:class] = opts.delete(:link_class) || 'btn btn-link'
+    link_opts[:class] += ' effective-collapse-actions hidden-print'
+    link_opts[:class] += ' collapsed' unless show
+
+    # The div and the card now
     div_class = opts.delete(:div_class)
     card_class = opts.delete(:card_class) || 'card card-body my-2'
 
-    if @_accordion_active
-      # Accordion collapse
-      content_tag(:div, class: "card mb-0") do
-        content_tag(:div, class: "card-header") do
-          content_tag(:h2, class: "mb-0") do
-            content_tag(:button, label, link_opts.merge(class: "btn btn-link"))
-          end
-        end +
-        content_tag(:div, id: id, class: ['collapse', div_class, ('show' if show)].compact.join(' '), "data-parent": "##{@_accordion_active}") do
-          content_tag(:div, capture(&block), class: "card-body")
-        end
-      end
-    else
-      # Normal collapse
-      content_tag(:a, label, link_opts) +
-      content_tag(:div, id: id, class: ['collapse', div_class, ('show' if show)].compact.join(' ')) do
-        content_tag(:div, capture(&block), class: card_class)
-      end
+    # Normal collapse
+    link_tag = content_tag(:a, link_opts) do
+      content_tag(:div, label_expand.html_safe, class: 'collapse-label-expand') +
+      content_tag(:div, label_collapse.html_safe, class: 'collapse-label-collapse')
+    end
+
+    div_tag = content_tag(:div, id: id, class: ['effective-collapse collapse', div_class, ('show' if show)].compact.join(' ')) do
+      content_tag(:div, capture(&block), class: card_class)
     end
+
+    link_tag + div_tag
   end
 
   # Button Dropdowns

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

@@ -14,6 +14,7 @@ module Effective
             body: 'article-editor-body',
             table: 'table'
           },
+          filelink: nil,
           grid: {
             classname: 'row',
             columns: 12,
@@ -40,7 +41,7 @@ module Effective
               '12': 'col-sm-12'
             }
           },
-          plugins: ['blockcode', 'cellcolor', 'imageposition', 'imageresize', 'inlineformat', 'listitem', 'removeformat', 'reorder', 'style'],
+          plugins: ['blockcode', 'cellcolor', 'imageposition', 'imageresize', 'inlineformat', 'listitem', 'removeformat', 'reorder', 'style', 'filelink'],
           quote: {
             template: '<blockquote><p></p></blockquote>'
           },

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

@@ -51,6 +51,20 @@ module Effective
         end
       end
 
+      # insert: false
+      def insert
+        return @insert unless @insert.nil?
+
+        @insert ||= begin
+          insert = options[:input].delete(:insert)
+          insert.nil? ? false : insert
+        end
+      end
+
+      def insert?
+        !!insert
+      end
+
       # errors: true
       def errors?
         return @errors unless @errors.nil?
@@ -62,7 +76,7 @@ module Effective
       end
 
       # remove: true
-      def remove?
+      def remove
         return @remove unless @remove.nil?
 
         @remove ||= begin
@@ -77,6 +91,10 @@ module Effective
         end
       end
 
+      def remove?
+        !!remove
+      end
+
       def can_remove_method
         return @can_remove_method unless @can_remove_method.nil?
         @can_remove_method = (options[:input].delete(:can_remove_method) || false)
@@ -114,6 +132,7 @@ module Effective
       def render_resource(resource, block)
         remove = BLANK
         reorder = BLANK
+        insert = BLANK
         can_remove = (can_remove_method.blank? || !!resource.send(can_remove_method))
 
         content = @builder.fields_for(name, resource) do |form|
@@ -129,7 +148,11 @@ module Effective
           remove += (can_remove || resource.new_record?) ? link_to_remove(resource) : disabled_link_to_remove(resource)
         end
 
-        content_tag(:div, render_fields(content, (remove + reorder)), class: 'has-many-fields')
+        if insert?
+          insert = render_insert() if add? && reorder?
+        end
+
+        content_tag(:div, insert + render_fields(content, remove + reorder), class: 'has-many-fields')
       end
 
       def render_fields(content, remove)
@@ -141,12 +164,25 @@ module Effective
             content_tag(:div, remove, class: 'col-auto')
           end
         when :cards
-          raise('unsupported')
+          content_tag(:div, class: 'form-row mb-3') do
+            (reorder? ? content_tag(:div, has_many_move, class: 'col-auto') : BLANK) +
+            content_tag(:div, content, class: 'col mr-auto') do
+              content_tag(:div, class: 'card') do
+                content_tag(:div, class: 'card-body') do
+                  content_tag(:div, remove, class: 'float-right') + content
+                end
+              end
+            end
+          end
         else
           content + remove
         end
       end
 
+      def render_insert()
+        content_tag(:div, link_to_insert(), class: 'has-many-actions')
+      end
+
       def render_template(block)
         resource = build_resource()
         index = collection.length
@@ -176,6 +212,27 @@ module Effective
         )
       end
 
+      # f.has_many :things, insert: { label: (icon('plus-circle') + 'Insert Article') }
+      # f.has_many :things, insert: (icon('plus-circle') + 'Insert Article')
+      def link_to_insert
+        tag = (insert[:tag] if insert.kind_of?(Hash))
+        title = (insert[:title] || insert[:label] if insert.kind_of?(Hash))
+        html_class = (insert[:class] if insert.kind_of?(Hash))
+
+        label = (insert[:label] if insert.kind_of?(Hash))
+        label = insert if insert.kind_of?(String)
+
+        content_tag(
+          (tag || :button),
+          (label || (icon('plus-circle') + 'Insert Another')),
+          class: 'has-many-insert ' + (html_class || 'btn btn-secondary'),
+          title: (title || 'Insert Another'),
+          data: {
+            'effective-form-has-many-insert': true,
+          }
+        )
+      end
+
       def link_to_reorder(block)
         content_tag(
           :button,
@@ -189,11 +246,18 @@ module Effective
       end
 
       def link_to_remove(resource)
+        tag = (remove[:tag] if remove.kind_of?(Hash))
+        title = (remove[:title] || remove[:label] if remove.kind_of?(Hash))
+        html_class = (remove[:class] if remove.kind_of?(Hash))
+
+        label = (remove[:label] if remove.kind_of?(Hash))
+        label = remove if remove.kind_of?(String)
+
         content_tag(
-          :button,
-          icon('trash-2'),
-          class: 'has-many-remove btn btn-danger',
-          title: 'Remove',
+          (tag || :button),
+          (label || icon('trash-2')),
+          class: 'has-many-remove ' + (html_class || 'btn btn-danger'),
+          title: (title || 'Remove'),
           data: {
             'confirm': "Remove #{resource}?",
             'effective-form-has-many-remove': true,

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.9.38'.freeze
+  VERSION = '0.9.42'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.9.38
+  version: 0.9.42
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-26 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -615,6 +615,7 @@ files:
 - app/assets/stylesheets/effective_article_editor/input.scss
 - app/assets/stylesheets/effective_bootstrap.scss
 - app/assets/stylesheets/effective_bootstrap/base.scss
+- app/assets/stylesheets/effective_bootstrap/collapse.scss
 - app/assets/stylesheets/effective_bootstrap/forms.scss
 - app/assets/stylesheets/effective_bootstrap/icons.scss
 - app/assets/stylesheets/effective_bootstrap/overrides.scss