effective_bootstrap 0.11.12 → 0.11.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7aeffb5b3abbf1a71b2092b995ab03f2945ec88fc62558fd6133cfe201ff17c
-  data.tar.gz: bf0bee697c97e88955e6d68ad44d54f5098987924fa6ea4dfd416fe9b9d0d5f2
+  metadata.gz: 92c48deef88d8891fbd457afbd1294dab443032fc2fb2c4fceef1f6c6bb76d7a
+  data.tar.gz: bc74c439babfe29ef5ffe484e1bb1b31b1274ff6f73deed035f28d02c3e5bd2d
 SHA512:
-  metadata.gz: 0ca84d15a1a3c2cae9fee3481bcf79d3cf21427ce888752f4718036ca747b2da6abcf999c5d79ebb4a1c4f0c73174ab639164a27bb0fff586f67b68d65063fd6
-  data.tar.gz: 3d2b105641a41fcb866bf458e4efdac8b20dcd224377ff466bb0354df02bfdf2175de92e89f15312d9c2713a9a7d3dc32de710d1cc5735c1bef3a254be0c5560
+  metadata.gz: eb5873bc5b64b2626e9d981f24a228e84d472706b1bb47c390f6f4ed76e00d9cff42bf7b8736c396e6ee17a1e70ea2f84716b4d7b9ba2b2b102f89afe2be12f0
+  data.tar.gz: b3062220f045454fb4fe86cad596ac9a34ad3aef7b5618db96c8456a1115324abd78ac2dfa25d4eb1ee6bc95afceaad7fe7cb8796d341e8f21864b28a57ee84f

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

@@ -7,11 +7,21 @@ module Effective
       # https://imperavi.com/article/docs/settings/
       def self.defaults
         {
+           # This is overridden by the active_storage() method below
           active_storage: nil,
+
+          # This is overridden by the css() method below
           css: ['/assets/article_editor/arx-frame.min.css'],
+
+          # This is overridden by the custom_css() method below
           custom: {
-            css: ['/assets/effective_bootstrap_article_editor.css']
+            css: [
+              'application.css',
+              '/assets/effective_bootstrap_article_editor.css'
+            ]
           },
+
+          # The rest of these are just normal Hash options
           align: {
             'left': 'text-left',
             'center': 'text-center',
@@ -126,15 +136,36 @@ module Effective
       end
 
       def input_js_options
-        self.class.defaults.merge(active_storage: active_storage, custom: { css: custom_css })
+        self.class.defaults.merge(active_storage: active_storage, css: css, custom: { css: custom_css })
+      end
+
+      def css
+        if @template.respond_to?(:asset_pack_path)
+          [@template.asset_pack_path('article_editor/arx-frame.min.css')]
+        elsif @template.respond_to?(:asset_path)
+          [@template.asset_path('article_editor/arx-frame.min.css')]
+        else
+          ['/assets/article_editor/arx-frame.min.css']
+        end
       end
 
       def custom_css
-        [
-          (@template.asset_pack_path('application.css') if @template.respond_to?(:asset_pack_path)),
-          (@template.asset_path('application.css') if @template.respond_to?(:asset_path)),
-          ('/assets/effective_bootstrap_article_editor.css')
-        ].compact
+        if @template.respond_to?(:asset_pack_path)
+          [
+            @template.asset_pack_path('application.css'),
+            @template.asset_pack_path('effective_bootstrap_article_editor.css')
+          ]
+        elsif @template.respond_to?(:asset_path)
+          [
+            @template.asset_path('application.css'),
+            @template.asset_path('effective_bootstrap_article_editor.css')
+          ]
+        else
+          [
+            '/assets/application.css',
+            '/assets/effective_bootstrap_article_editor.css'
+          ]
+        end
       end
 
       def active_storage

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.11.12'.freeze
+  VERSION = '0.11.13'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.11.12
+  version: 0.11.13
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-12 00:00:00.000000000 Z
+date: 2022-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails