effective_bootstrap 0.8.0 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d221a2264a9a64787ad5a179b836fc0c6fbc1cb7b3ea3a968af87eeb708a4b14
-  data.tar.gz: 33f8635737e17de6393c39a899293e8696ef4d5e2726d3cf9d1fcc29bfec890c
+  metadata.gz: ade33f888106bb76e27393ff4df00caa77191edc2cc52a78b7fb4e493c9c9110
+  data.tar.gz: c0e9d1338dd33e388f6d6824bac883f4a3317378800cca7c387e153808452b1c
 SHA512:
-  metadata.gz: 0704a3f0bc5866589d8117dd10955978e20c36a5938fcd674a5f148868af9a9fa90d4a93b95df8944771a7b147473517fe98838330fa4fd6c469acd48e2f06c7
-  data.tar.gz: cd48f3bd938979dfb1dbbec28d0a0285fd101b2140b7301feb07d5a44fd0d5da2761f08e85b4148f2c615ef4ccc429a455e38e54efd80f1d7a17973242a72a55
+  metadata.gz: 235ab74535c20e7d94bf83e2a28c7996fd4ff420b923a41de39046f4ff2e6ef36966bf71c5468e016a537a0a5ff88a5f3318ca554fec88dae8c045ddcdc58bf5
+  data.tar.gz: 3a249ed15f0047c90dffe53ea90d677a9c9905f6b3265db7a5c4c5c2093b75bf2600c9318ff0bb64bd834901b524bf78936f49b2390008a9a63aa71e57653197

data/app/assets/images/icons/microsoft.svg

@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Microsoft Azure icon</title><path d="M5.483 21.3H24L14.025 4.013l-3.038 8.347 5.836 6.938L5.483 21.3zM13.23 2.7L6.105 8.677 0 19.253h5.505v.014L13.23 2.7z"/></svg>

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

@@ -1,6 +1,6 @@
-# These next three methods hijack jquery_ujs data-confirm and do it our own way with a double click confirm
+# These next three methods hijack rails/ujs and jquery_ujs data-confirm and do it our own way with a double click confirm
 
-if <%= !!EffectiveBootstrap.use_custom_data_confirm %> && $.rails
+if <%= !!EffectiveBootstrap.use_custom_data_confirm %> && (window.Rails || $.rails)
   $(document).on 'confirm', (event) ->
     $obj = $(event.target)
 
@@ -18,6 +18,11 @@ if <%= !!EffectiveBootstrap.use_custom_data_confirm %> && $.rails
         , 4000)
       false # don't show the confirmation dialog
 
-  $.rails.confirm = (message) -> true 
-  $.rails.effective_bootstrap_custom_data_confirm = true
-  $(document).on 'confirm:complete', (event) -> $(event.target).data('confirmed')
+  (window.Rails || $.rails).confirm = (message) -> true
+  (window.Rails || $.rails).effective_bootstrap_custom_data_confirm = true
+
+  $(document).on 'confirm:complete', (event) -> $(event.target).data('confirmed')
+
+  $(document).on 'click', 'a.dropdown-item[data-confirm]', (event) ->
+    event.preventDefault()
+    false

data/app/assets/stylesheets/effective_bootstrap.scss

@@ -10,3 +10,5 @@
 @import 'effective_select/input';
 @import 'effective_select_or_text/input';
 @import 'effective_radio/input';
+
+@import 'effective_rich_text_area/input';

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

@@ -0,0 +1,25 @@
+.trix-content {
+  height: 100%;
+  border-color: #ccc;
+
+  &:hover,
+  &:active,
+  &:focus, {
+    border-color: #ccc;
+    outline: 0px !important;
+    -webkit-appearance: none;
+    box-shadow: none !important;
+  }
+}
+
+// Bootstrap 4 Feedback client side
+.was-validated .form-control:invalid ~ .trix-content, { border-color: #dc3545 !important; }
+.was-validated .form-control:valid ~ .trix-content { border-color: #28a745 !important; }
+.was-validated .form-control:invalid ~ trix-toolbar, { border-color: #dc3545 !important; }
+.was-validated .form-control:valid ~ trix-toolbar { border-color: #28a745 !important; }
+
+// Bootstrap 4 Server side feedback
+.form-control.is-invalid ~ .trix-content { border-color: #dc3545 !important; }
+.form-control.is-invalid ~ trix-toolbar { border-color: #dc3545 !important; }
+.form-control.is-valid ~ .trix-content { border-color: #28a745 !important; }
+.form-control.is-valid ~ trix-toolbar { border-color: #28a745 !important; }

data/app/helpers/effective_bootstrap_helper.rb

@@ -154,11 +154,13 @@ module EffectiveBootstrapHelper
   end
 
   # Works with dots ao and dropdown do
-  def dropdown_divider
+  def dropdown_divider(options = {})
+    options[:class] = [options[:class], 'dropdown-divider'].compact.join(' ')
+
     unless @_dropdown_link_tos
-      content_tag(:div, '', class: 'dropdown-divider')
+      content_tag(:div, '', options)
     else
-      @_dropdown_link_tos << content_tag(:div, '', class: 'dropdown-divider')
+      @_dropdown_link_tos << content_tag(:div, '', options)
       nil
     end
   end

data/app/models/effective/form_builder.rb

@@ -100,6 +100,10 @@ module Effective
       Effective::FormInputs::RemoteLinkTo.new(name, options, builder: self).to_html(&block)
     end
 
+    def rich_text_area(name, options = {})
+      Effective::FormInputs::RichTextArea.new(name, options, builder: self).to_html { super(name, options) }
+    end
+
     def search_field(name, options = {})
       Effective::FormInputs::SearchField.new(name, options, builder: self).to_html { super(name, options) }
     end

data/app/models/effective/form_input.rb

@@ -7,7 +7,7 @@ module Effective
     EXCLUSIVE_CLASS_SUFFIXES = ['-primary', '-secondary', '-success', '-danger', '-warning', '-info', '-light', '-dark']
 
     delegate :object, to: :@builder
-    delegate :capture, :content_tag, :link_to, :icon, :asset_path, to: :@template
+    delegate :capture, :content_tag, :image_tag, :link_to, :icon, :asset_path, to: :@template
 
     # So this takes in the options for an entire form group.
     def initialize(name, options, builder:, html_options: nil)

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

@@ -94,7 +94,7 @@ module Effective
           content_tag(:div, class: 'card mb-3') do
             if attachment.image?
               content_tag(:div, class: 'card-body') do
-                content_tag(:img, '', class: 'img-fluid', src: url, alt: attachment.filename.to_s) +
+                image_tag(url, alt: attachment.filename.to_s, class: 'img-fluid') +
                 link_to(attachment.filename, url, class: 'card-link')
               end
             else

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

@@ -0,0 +1,11 @@
+module Effective
+  module FormInputs
+    class RichTextArea < Effective::FormInput
+
+      def input_html_options
+        { class: 'form-control effective_rich_text_area trix-content', id: tag_id }
+      end
+
+    end
+  end
+end

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.8.0'.freeze
+  VERSION = '0.8.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-29 00:00:00.000000000 Z
+date: 2020-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -262,6 +262,7 @@ files:
 - app/assets/images/icons/message-square.svg
 - app/assets/images/icons/mic-off.svg
 - app/assets/images/icons/mic.svg
+- app/assets/images/icons/microsoft.svg
 - app/assets/images/icons/minimize-2.svg
 - app/assets/images/icons/minimize.svg
 - app/assets/images/icons/minus-circle.svg
@@ -581,6 +582,7 @@ files:
 - app/assets/stylesheets/effective_editor/quill.scss
 - app/assets/stylesheets/effective_file/input.scss
 - app/assets/stylesheets/effective_radio/input.scss
+- app/assets/stylesheets/effective_rich_text_area/input.scss
 - app/assets/stylesheets/effective_select/bootstrap-theme.css
 - app/assets/stylesheets/effective_select/input.scss
 - app/assets/stylesheets/effective_select/overrides.scss
@@ -620,6 +622,7 @@ files:
 - app/models/effective/form_inputs/radios.rb
 - app/models/effective/form_inputs/remote_link_to.rb
 - app/models/effective/form_inputs/reset.rb
+- app/models/effective/form_inputs/rich_text_area.rb
 - app/models/effective/form_inputs/save.rb
 - app/models/effective/form_inputs/search_field.rb
 - app/models/effective/form_inputs/select.rb
@@ -663,7 +666,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Everything you need to get set up with bootstrap 4.