effective_bootstrap 0.9.40 → 0.9.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ec7aa9c72ddbc58533cf76bf8eb8843f957bc2f79be9604f35a41948bbd03e4
-  data.tar.gz: 064e9a0da7b7d2721953348524dcc38f16cd9fb0bffcaca88fe181aa4d7b9e6e
+  metadata.gz: '092f884d4e2928c9cda4247f62caeba2dc0a7b7e7c56b42a4292d611c5d62ee1'
+  data.tar.gz: 8059eaec1762f8846cc1d16d668d0e29dd5fa4e7b27edfbb91434c1f9e8d70f0
 SHA512:
-  metadata.gz: 1237917f4abb0ab752d26a6c7af13169ed0a971c048cfeb1b984912dc54bfa58e7f6bdf312a9b54fa1108d8cf725fba038e0a876ee492522a7a53345ce99537b
-  data.tar.gz: 368f386c0683a11fb99060a79a60cd9d6b6870cf9299173b7a1cb7da865ce23c976af625397f6f2fd0c715999d6b266387efb66b8af02ef73792ac6d88696ace
+  metadata.gz: f9a5de0079ce76d9fe570233344b892ddb8b56407611cb231dbefe9e46c996894a73f3a48f0df377269a0fbd5472ee8bcbb7fae19968da52f50ff3b1ca0b7926
+  data.tar.gz: af189c0bd213dd06adb690673221582d47838ef9ab711e03fc9058c70a8938bfef2da2d6a8c38e14a74c1e4b99f6cc98b004e21e9477355c22c9091fef21ba5b

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/models/effective/form_input.rb

@@ -371,22 +371,7 @@ module Effective
       when String
         defaults.merge(text: obj)
       when Hash
-        html_classes = ((obj[:class] || '').split(' ') + (defaults[:class] || '').split(' ')).uniq
-
-        # Try to smart merge bootstrap classes
-        if (exclusive = html_classes.select { |c| c.include?('-') }).length > 1
-          EXCLUSIVE_CLASS_PREFIXES.each do |prefix|
-            prefixed = exclusive.select { |c| c.start_with?(prefix) }
-            prefixed[1..-1].each { |c| html_classes.delete(c) } if prefixed.length > 1
-          end
-
-          suffixed = exclusive.select { |c| EXCLUSIVE_CLASS_SUFFIXES.any? { |suffix| c.end_with?(suffix) } }
-          suffixed[1..-1].each { |c| html_classes.delete(c) } if suffixed.length > 1
-        end
-
-        obj[:class] = html_classes.join(' ') if html_classes.present?
-        obj.reverse_merge!(defaults)
-        obj
+        obj.reverse_merge!(defaults); obj
       else
         defaults.merge(text: obj.to_s)
       end

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.40'.freeze
+  VERSION = '0.9.44'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.9.40
+  version: 0.9.44
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-06 00:00:00.000000000 Z
+date: 2021-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails