Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

prefer autoloaded html scanner

  • Loading branch information...
commit 426a86ab1e4fc2488215a9adab4511a59646a413 1 parent f0f07c6
@josh josh authored
View
4 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!
View
2  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)
View
1  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:
Please sign in to comment.
Something went wrong with that request. Please try again.