diff options
| author | Joshua Peek <josh@joshpeek.com> | 2008-11-24 10:20:41 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2008-11-24 10:20:41 -0600 |
| commit | 426a86ab1e4fc2488215a9adab4511a59646a413 (patch) | |
| tree | f8fe3e2f290646afda613d3a82091d9db6e7d83e /actionpack | |
| parent | f0f07c6427c7c80783ee59705f82dcdd1cd8fdb1 (diff) | |
| download | rails-426a86ab1e4fc2488215a9adab4511a59646a413.tar.gz rails-426a86ab1e4fc2488215a9adab4511a59646a413.tar.bz2 rails-426a86ab1e4fc2488215a9adab4511a59646a413.zip | |
prefer autoloaded html scanner
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller.rb | 4 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/assertions/selector_assertions.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/sanitize_helper.rb | 1 |
3 files changed, 2 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index 678938af86..8b4819bf65 100644 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -31,8 +31,6 @@ rescue LoadError 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 CGI 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 index 40ac572fdb..e03fed7abb 100644 --- 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 index 200c1d6085..d89b955317 100644 --- 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: |