effective_bootstrap 0.9.29 → 0.9.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7962cda76a99f9a2af980a67a9f876223b722d83ecafee967bc15cbd3da22a2
-  data.tar.gz: 7adf1ba3532157b54039e67a6faeb2675a5f6826c88271a0597aca25dfb121d7
+  metadata.gz: 58f7d739c4c9d00ead21293bee0bcceefbca0b57e8ac958bec112f5aadeee535
+  data.tar.gz: 9a069cd5fefdce47db3f69095fef7e0f8eed3829036c264bf1ee3c3b36f36f51
 SHA512:
-  metadata.gz: '079863a2874583e9d3080aea824fd847e1026c0d7c7ac6591a13a6b7927633e25c4f5ada8278d0aed219facebff6901ab06498d7c34794d256300701fb5b8e9e'
-  data.tar.gz: 352ccfac174eb0fed1f10627a881407e9f9f331a23968c72a259dac329e4abe46521588cb5aa0d40a4b280e86a2fcdaab0b9f8e84024a8f196eb5c701c24a877
+  metadata.gz: 513dcea0768e7af3828d1742d0929e021b02ce7041ebbd5e24208a7a452f109ad62a8367bed9f851b01b43f5cc82d102bc6d7c680036333ee94eb9fbda743d66
+  data.tar.gz: 82c31a8d062c6070bdc6d146150f169757be27979a4d429218af739f7d45cba797a22e0e5ed11263eb3b920a02c68476e9269cbc80e50950fcba7363bbaac913

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

@@ -18,8 +18,13 @@ if <%= !!EffectiveBootstrap.use_custom_data_confirm %> && (window.Rails || $.rai
         , 4000)
       false # don't show the confirmation dialog
 
-  (window.Rails || $.rails).confirm = (message) -> true
-  (window.Rails || $.rails).effective_bootstrap_custom_data_confirm = true
+  if window.Rails
+    window.Rails.confirm = (message) -> true
+    window.Rails.effective_bootstrap_custom_data_confirm = true
+
+  if $.rails
+    $.rails.confirm = (message) -> true
+    $.rails.effective_bootstrap_custom_data_confirm = true
 
   $(document).on 'confirm:complete', (event) -> $(event.target).data('confirmed')
 

data/app/assets/stylesheets/effective_article_editor/content.scss

@@ -0,0 +1,3 @@
+// Styles for the article editor iframe body content
+// This file is included by the article editor iframe.
+body { padding-top: 0px !important; }

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

@@ -1 +1,5 @@
-@import 'overrides';
+// Styles for the article editor look and feel
+// Use this to customize the textarea input, toolbar, etc
+// Does not affect the article editor iframe contents
+
+.indented-list { list-style-type: none !important; }

data/app/assets/stylesheets/effective_bootstrap.scss

@@ -1,5 +1,6 @@
 @import 'effective_bootstrap/base';
 
+@import 'effective_article_editor/input';
 @import 'effective_checks/input';
 @import 'effective_datetime/input';
 @import 'effective_file/input';

data/app/assets/stylesheets/effective_bootstrap_article_editor.scss

@@ -1 +1 @@
-@import 'effective_article_editor/input';
+@import 'effective_article_editor/content';

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

@@ -2,18 +2,11 @@ module Effective
   module FormInputs
     class ArticleEditor < Effective::FormInput
 
-      def build_input(&block)
-        @builder.super_text_area(name, options[:input])
-      end
-
-      def input_html_options
-        { class: 'effective_article_editor form-control', id: unique_id, autocomplete: 'off' }
-      end
-
-      def input_js_options
+      # https://imperavi.com/article/docs/settings/
+      def self.defaults
         {
-          active_storage: active_storage,
-          css: '/assets/effective_article_editor/',
+          active_storage: nil,
+          css: '/assets/article_editor/',
           custom: {
             css: ['/assets/application.css', '/assets/effective_bootstrap_article_editor.css']
           },
@@ -47,7 +40,7 @@ module Effective
               '12': 'col-sm-12'
             }
           },
-          plugins: ['blockcode', 'imageposition', 'imageresize', 'inlineformat', 'removeformat', 'reorder', 'style'],
+          plugins: ['blockcode', 'cellcolor', 'imageposition', 'imageresize', 'inlineformat', 'removeformat', 'reorder', 'style'],
           quote: {
             template: '<blockquote><p></p></blockquote>'
           },
@@ -58,10 +51,33 @@ module Effective
               'small': { title: 'Small', classname: 'table-sm' },
               'striped': { title: 'Striped', classname: 'table-striped' },
             }
+          },
+          cellcolors: {
+            'primary': { title: 'Primary', classname: 'table-primary' },
+            'secondary': { title: 'Secondary', classname: 'table-secondary' },
+            'active': { title: 'Active', classname: 'table-active' },
+            'success': { title: 'Success', classname: 'table-success' },
+            'danger': { title: 'Danger', classname: 'table-danger' },
+            'warning': { title: 'Warning', classname: 'table-warning' },
+            'info': { title: 'Info', classname: 'table-info' },
+            'light': { title: 'Light', classname: 'table-light' },
+            'dark': { title: 'Dark', classname: 'table-dark' }
           }
         }
       end
 
+      def build_input(&block)
+        @builder.super_text_area(name, options[:input])
+      end
+
+      def input_html_options
+        { class: 'effective_article_editor form-control', id: unique_id, autocomplete: 'off' }
+      end
+
+      def input_js_options
+        self.class.defaults.merge(active_storage: active_storage)
+      end
+
       def active_storage
         return @active_storage unless @active_storage.nil?
 

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.9.29'.freeze
+  VERSION = '0.9.34'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.9.29
+  version: 0.9.34
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-09 00:00:00.000000000 Z
+date: 2021-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -611,8 +611,8 @@ files:
 - app/assets/javascripts/moment/locale/zh-hk.js
 - app/assets/javascripts/moment/locale/zh-tw.js
 - app/assets/javascripts/moment/moment.js
+- app/assets/stylesheets/effective_article_editor/content.scss
 - app/assets/stylesheets/effective_article_editor/input.scss
-- app/assets/stylesheets/effective_article_editor/overrides.scss
 - app/assets/stylesheets/effective_bootstrap.scss
 - app/assets/stylesheets/effective_bootstrap/base.scss
 - app/assets/stylesheets/effective_bootstrap/forms.scss

data/app/assets/stylesheets/effective_article_editor/overrides.scss

@@ -1 +0,0 @@
-body { padding-top: 0px !important; }