diff options
author | Piotr Sarnacki <drogus@gmail.com> | 2012-06-09 14:40:50 +0200 |
---|---|---|
committer | Piotr Sarnacki <drogus@gmail.com> | 2012-08-28 10:51:03 +0200 |
commit | ba83aa7f03d2742dd242a45229e0f67785871515 (patch) | |
tree | ff35607be2e123302ba0db65f5c644d577c05dae /actionpack/lib/action_controller/vendor/html-scanner.rb | |
parent | 4efad291c11a7c4fcf178fbb887b4845eaf61757 (diff) | |
download | rails-ba83aa7f03d2742dd242a45229e0f67785871515.tar.gz rails-ba83aa7f03d2742dd242a45229e0f67785871515.tar.bz2 rails-ba83aa7f03d2742dd242a45229e0f67785871515.zip |
Move action_controller/vendor/html-scanner to action_view
This is another step in moving Action View's dependencies in Action Pack
to Action View itself. Also, HtmlScanner seems to be better suited for
views rather than controllers.
Diffstat (limited to 'actionpack/lib/action_controller/vendor/html-scanner.rb')
-rw-r--r-- | actionpack/lib/action_controller/vendor/html-scanner.rb | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/actionpack/lib/action_controller/vendor/html-scanner.rb b/actionpack/lib/action_controller/vendor/html-scanner.rb index 879b31e60e..35f4d1e7fa 100644 --- a/actionpack/lib/action_controller/vendor/html-scanner.rb +++ b/actionpack/lib/action_controller/vendor/html-scanner.rb @@ -1,20 +1,4 @@ -$LOAD_PATH << "#{File.dirname(__FILE__)}/html-scanner" +require 'action_view/vendor/html-scanner' +require 'active_support/deprecation' -module HTML - extend ActiveSupport::Autoload - - eager_autoload do - autoload :CDATA, 'html/node' - autoload :Document, 'html/document' - autoload :FullSanitizer, 'html/sanitizer' - autoload :LinkSanitizer, 'html/sanitizer' - autoload :Node, 'html/node' - autoload :Sanitizer, 'html/sanitizer' - autoload :Selector, 'html/selector' - autoload :Tag, 'html/node' - autoload :Text, 'html/node' - autoload :Tokenizer, 'html/tokenizer' - autoload :Version, 'html/version' - autoload :WhiteListSanitizer, 'html/sanitizer' - end -end +ActiveSupport::Deprecation.warn 'vendored html-scanner was moved to action_view, please require "action_view/vendor/html-scanner" instead' |