prefer autoloaded html scanner

rails · Nov 24, 2008 · 426a86a · 426a86a
1 parent f0f07c6
commit 426a86a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
@@ -31,8 +31,6 @@
   end
 end
 
-$:.unshift "#{File.dirname(__FILE__)}/action_controller/vendor/html-scanner"
-
 module ActionController
   # TODO: Review explicit to see if they will automatically be handled by
   # the initilizer if they are really needed.
@@ -99,6 +97,8 @@ class Session
 end
 
 autoload :Mime, 'action_controller/mime_type'
+
+autoload :HTML, 'action_controller/vendor/html-scanner'
 autoload :Rack, 'action_controller/vendor/rack'
 
 ActionController.load_all!
diff --git a/actionpack/lib/action_controller/assertions/selector_assertions.rb b/actionpack/lib/action_controller/assertions/selector_assertions.rb
@@ -3,8 +3,6 @@
 # Under MIT and/or CC By license.
 #++
 
-require 'action_controller/vendor/html-scanner'
-
 module ActionController
   module Assertions
     unless const_defined?(:NO_STRIP)

diff --git a/actionpack/lib/action_view/helpers/sanitize_helper.rb b/actionpack/lib/action_view/helpers/sanitize_helper.rb
@@ -1,5 +1,4 @@
 require 'action_view/helpers/tag_helper'
-require 'action_controller/vendor/html-scanner'
 
 module ActionView
   module Helpers #:nodoc: