aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJavan Makhmali <javan@javan.us>2018-02-14 09:43:49 -0500
committerJavan Makhmali <javan@javan.us>2018-02-14 09:43:49 -0500
commit424070574dd61dfa3710c915526064157411327f (patch)
tree518daa28aad8fb209f10ba2f17582f659625598e /lib
parent28525b4ccad9aca42e4e1d9588c4f0724449f1c7 (diff)
downloadrails-424070574dd61dfa3710c915526064157411327f.tar.gz
rails-424070574dd61dfa3710c915526064157411327f.tar.bz2
rails-424070574dd61dfa3710c915526064157411327f.zip
Make renderer configurable
Diffstat (limited to 'lib')
-rw-r--r--lib/active_text.rb2
-rw-r--r--lib/active_text/attachments/trix_conversion.rb2
-rw-r--r--lib/active_text/content.rb2
-rw-r--r--lib/active_text/engine.rb6
4 files changed, 10 insertions, 2 deletions
diff --git a/lib/active_text.rb b/lib/active_text.rb
index 1981abc4c6..8275d7d17a 100644
--- a/lib/active_text.rb
+++ b/lib/active_text.rb
@@ -5,6 +5,8 @@ require "nokogiri"
module ActiveText
extend ActiveSupport::Autoload
+ mattr_accessor(:renderer)
+
autoload :Attachable
autoload :Attachment
autoload :Attribute
diff --git a/lib/active_text/attachments/trix_conversion.rb b/lib/active_text/attachments/trix_conversion.rb
index 25eada6709..3eb83453f4 100644
--- a/lib/active_text/attachments/trix_conversion.rb
+++ b/lib/active_text/attachments/trix_conversion.rb
@@ -24,7 +24,7 @@ module ActiveText
private
def trix_attachment_content
if partial_path = attachable.try(:to_trix_content_attachment_partial_path)
- ApplicationRenderer.render(partial: partial_path, object: self, as: model_name.element)
+ ActiveText.renderer.render(partial: partial_path, object: self, as: model_name.element)
end
end
end
diff --git a/lib/active_text/content.rb b/lib/active_text/content.rb
index 58589cc110..8bc2356060 100644
--- a/lib/active_text/content.rb
+++ b/lib/active_text/content.rb
@@ -48,7 +48,7 @@ module ActiveText
def to_html
render_attachments do |attachment|
attachment.node.tap do |node|
- node.inner_html = ApplicationController.render(attachment)
+ node.inner_html = ActiveText.renderer.render(attachment)
end
end.to_html
end
diff --git a/lib/active_text/engine.rb b/lib/active_text/engine.rb
index 9a1d08e1ad..ab266aa58d 100644
--- a/lib/active_text/engine.rb
+++ b/lib/active_text/engine.rb
@@ -30,5 +30,11 @@ module ActiveText
helper ActiveText::TagHelper
end
end
+
+ initializer "active_text.config" do
+ config.after_initialize do |app|
+ ActiveText.renderer ||= ApplicationController.renderer
+ end
+ end
end
end