effective_bootstrap 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c8ff2ddc7846693eda910018d90b746abe50f7a617eea476edd16920672df78
-  data.tar.gz: 544986295a3ac4a9b05e5cdf70f17b766682c4f95c8ba9ac0a551ebfa8c07fef
+  metadata.gz: 4538dcdf672ff18dadb24146b5186498ffad746ff81d736fbfd24ba8f23a7f89
+  data.tar.gz: b0a95bd9c6d58c1a3cf86da55a871c5d5da85faa4296d9d5de3201bd6b45ba67
 SHA512:
-  metadata.gz: ee013e77368c0443632902e1a67870012d270e8d15fa4051aa9cf3e67d479b4f121e40a4b2b8aee389370bf183fcecdbc4dac0c79f8dae4c75b9c580d63d38ce
-  data.tar.gz: 363f67e6ac798acd14506af81b769d5e8d56fe130281719bd71743f1738193a615e943b7df7df7039446eb19cd2bc359e4b8776040a43279f39eb4c4b9e5829b
+  metadata.gz: 653f533b1ae794be6558a9da86c99fc4c69bab5fe19c85a16395a10b24d3c8d43c4878386586006dea73d1380177c09ffeb5fca5986dc317b452f5a003251ea9
+  data.tar.gz: eedc133811ffea31458b65ae3d2c76a2562b410ac285d25bdf07056568cc0ac587b708b310bcedc278f180bf769970ee5996f27afde0bd4ac0d04e2999bf76d4

data/README.md

@@ -323,7 +323,7 @@ The end date selector will have its date <= start_date disabled.
 To disable this behaviour, call with `date_linked: false`.
 
 ```ruby
-= f.input :end_at, date_linked: false
+= f.date_field :end_at, date_linked: false
 ```
 
 ### Events
@@ -334,6 +334,34 @@ More info is available here:
 
 http://eonasdan.github.io/bootstrap-datetimepicker/Events/
 
+## Custom editor
+
+A drop in ready rich text editor based on
+
+https://quilljs.com/
+
+To use the editor, you must make additional javascript and stylesheet includes:
+
+In your application.js
+
+```
+//= require effective_bootstrap
+//= require effective_bootstrap_editor
+```
+
+In your application.scss
+
+```
+@import 'effective_bootstrap';
+@import 'effective_bootstrap_editor';
+```
+
+And then in any form, instead of a text area:
+
+```
+= f.editor :body
+```
+
 ## Custom percent_field
 
 This custom form input uses no 3rd party jQuery plugins.
@@ -622,6 +650,8 @@ The `f.save` is purely a input submit button.
 ```
 
 
+
+
 ## License
 
 MIT License.  Copyright [Code and Effect Inc.](http://www.codeandeffect.com/)

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.js

@@ -13,7 +13,7 @@
 //= require ./effective_clear/input
 //= require ./effective_checks/input
 //= require ./effective_ck_editor/input
-//= require ./effective_editor/input
+
 //= require ./effective_file/input
 //= require ./effective_integer/input
 //= require ./effective_number_text/input

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/javascripts/effective_bootstrap_editor.js

@@ -0,0 +1 @@
+//= require ./effective_editor/input

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

@@ -1,4 +1,3 @@
-# http://eonasdan.github.io/bootstrap-datetimepicker/Options/
 (this.EffectiveBootstrap || {}).effective_ck_editor = ($element, options) ->
   setupCkeditor($element)
   initCkeditor($element, $element.data('input-js-options'))
@@ -69,4 +68,4 @@ initCkeditor = ($element, input_options) ->
   ckeditor.on 'insertElement', (event) ->
     element = $(event.data.$)
     if element.is('table')
-      element.removeAttr('style').addClass('table')
+      element.removeAttr('style').addClass('table')

data/app/assets/stylesheets/effective_bootstrap.scss

@@ -5,8 +5,8 @@
 @import 'effective_date/input';
 @import 'effective_time/input';
 
-@import 'effective_editor/input';
 @import 'effective_file/input';
+@import 'effective_rich_text_area/input';
 @import 'effective_select/input';
 @import 'effective_select_or_text/input';
 @import 'effective_radio/input';

data/app/assets/stylesheets/effective_bootstrap_editor.scss

@@ -0,0 +1 @@
+@import 'effective_editor/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_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.1'.freeze
+  VERSION = '0.9.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 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
@@ -395,6 +396,7 @@ files:
 - app/assets/javascripts/effective_bootstrap/logic.js.coffee
 - app/assets/javascripts/effective_bootstrap/other.js.coffee
 - app/assets/javascripts/effective_bootstrap/tabs.js
+- app/assets/javascripts/effective_bootstrap_editor.js
 - app/assets/javascripts/effective_checks/initialize.js.coffee
 - app/assets/javascripts/effective_checks/input.js
 - app/assets/javascripts/effective_ck_editor/initialize.js.coffee
@@ -571,6 +573,7 @@ files:
 - app/assets/stylesheets/effective_bootstrap/forms.scss
 - app/assets/stylesheets/effective_bootstrap/icons.scss
 - app/assets/stylesheets/effective_bootstrap/overrides.scss
+- app/assets/stylesheets/effective_bootstrap_editor.scss
 - app/assets/stylesheets/effective_checks/input.scss
 - app/assets/stylesheets/effective_date/input.scss
 - app/assets/stylesheets/effective_datetime/bootstrap-datetimepicker.scss
@@ -581,6 +584,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 +624,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 +668,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.