effective_bootstrap 0.9.39 → 0.9.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac9e0d6013b991db010ef717fe181ea041d2d9e756e0bb477d9ff7544248b718
-  data.tar.gz: f212aea0848dd0d7d50b0186b798ce9cb52d8c5e17bba7f4cfd63b69cc716861
+  metadata.gz: 8f0ef370fca1da439ea16cd2708d95e49a7783097817ba724c54a4da175188fe
+  data.tar.gz: 33471717cd69b0cba4eff2122ad7fb7c638393df3114fbccb3c0c1f60b9f7849
 SHA512:
-  metadata.gz: a87134d9311b1837d06e9e37857c03930a52cb0c211a2bd1dd05276ecd7eca76d57615e71cea80b271b9f11a7469647ff4915f790330f19ddd8a2c185a0604c6
-  data.tar.gz: 35fca4a527a44b58237cc6e71ab8846aa4da76d0f1c7e82078d272323bfb90be12ca16c4f27574603b118a90f5831753fb0e010bc7e5586626c982cf8be33901
+  metadata.gz: 49ac133d45de49472654194c63aaf7b1ecf29b38745572f3f5567eeb3ea221b4066b84b0e00c7d21cf979657ab7b93b9f4698f6d0b0b31d3921e85089aa77f4a
+  data.tar.gz: 87d0cdb39ab2317f53dbfdee5944e8bef922c5122e8e6542e2257f1a8b27edc635dba42a618af02113b175807d852d8f6efce373b0b3c68bd91bdd79ab399404

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

@@ -68,7 +68,9 @@ $(document).on 'click', '[data-effective-form-has-many-remove]', (event) ->
   event.preventDefault()
 
   $obj = $(event.currentTarget)
-  return unless $obj.data('confirmed') if $obj.data('confirm')
+
+  if (window.Rails && window.Rails.effective_bootstrap_custom_data_confirm) || ($.rails && $.rails.effective_bootstrap_custom_data_confirm)
+    return unless $obj.data('confirmed') if $obj.data('confirm')
 
   $hasMany = $obj.closest('.form-has-many')
   return unless $hasMany.length > 0

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/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/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.9.39'.freeze
+  VERSION = '0.9.43'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.9.39
+  version: 0.9.43
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-28 00:00:00.000000000 Z
+date: 2021-09-23 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