From 7f9106d5d996fec22fa8306168c21cc62b75ea9c Mon Sep 17 00:00:00 2001 From: Timm Date: Fri, 13 Sep 2013 17:24:15 +0200 Subject: Now only requiring Loofah in the places where it is needed. --- actionview/lib/action_view.rb | 1 - actionview/lib/action_view/helpers/sanitize_helper/sanitizers.rb | 2 ++ actionview/lib/action_view/testing/assertions.rb | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) 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' -- cgit v1.2.3