aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimm <kaspth@gmail.com>2013-09-13 17:24:15 +0200
committerTimm <kaspth@gmail.com>2014-06-16 21:04:14 +0200
commit7f9106d5d996fec22fa8306168c21cc62b75ea9c (patch)
treec6accca6d4778aeedb0aac5e126b8048111d1887
parent19406dad7d1d96b122d691dd34ee5d701945e77b (diff)
downloadrails-7f9106d5d996fec22fa8306168c21cc62b75ea9c.tar.gz
rails-7f9106d5d996fec22fa8306168c21cc62b75ea9c.tar.bz2
rails-7f9106d5d996fec22fa8306168c21cc62b75ea9c.zip
Now only requiring Loofah in the places where it is needed.
-rw-r--r--actionview/lib/action_view.rb1
-rw-r--r--actionview/lib/action_view/helpers/sanitize_helper/sanitizers.rb2
-rw-r--r--actionview/lib/action_view/testing/assertions.rb2
3 files changed, 4 insertions, 1 deletions
diff --git a/actionview/lib/action_view.rb b/actionview/lib/action_view.rb
index 706a6afbf0..6a1837c6e2 100644
--- a/actionview/lib/action_view.rb
+++ b/actionview/lib/action_view.rb
@@ -24,7 +24,6 @@
require 'active_support'
require 'active_support/rails'
require 'action_view/version'
-require 'loofah'
module ActionView
extend ActiveSupport::Autoload
diff --git a/actionview/lib/action_view/helpers/sanitize_helper/sanitizers.rb b/actionview/lib/action_view/helpers/sanitize_helper/sanitizers.rb
index 251820b81b..7ff465ca52 100644
--- a/actionview/lib/action_view/helpers/sanitize_helper/sanitizers.rb
+++ b/actionview/lib/action_view/helpers/sanitize_helper/sanitizers.rb
@@ -1,6 +1,8 @@
require 'active_support/core_ext/class/attribute'
require 'active_support/core_ext/object/blank'
require 'active_support/deprecation'
+
+require 'loofah'
require 'action_view/helpers/sanitize_helper/scrubbers'
module ActionView
diff --git a/actionview/lib/action_view/testing/assertions.rb b/actionview/lib/action_view/testing/assertions.rb
index 9714d3510d..f8a751aae3 100644
--- a/actionview/lib/action_view/testing/assertions.rb
+++ b/actionview/lib/action_view/testing/assertions.rb
@@ -1,3 +1,5 @@
+require 'loofah'
+
module ActionView
module Assertions
autoload :DomAssertions, 'action_view/testing/assertions/dom'