Do not load AV inside AP

Move that part to AV railtie
This commit is contained in:
Łukasz Strzałkowski 2013-07-30 00:34:19 +02:00
parent 9e6a1439d1
commit 6c7d895dda
4 changed files with 2 additions and 9 deletions

View File

@ -50,14 +50,6 @@ module ActionController
end
end
# All of these simply register additional autoloads
require 'action_view'
require 'action_view/vendor/html-scanner'
ActiveSupport.on_load(:action_view) do
ActionView::RoutingUrlFor.send(:include, ActionDispatch::Routing::UrlFor)
end
# Common Active Support usage in Action Controller
require 'active_support/core_ext/class/attribute_accessors'
require 'active_support/core_ext/load_error'

View File

@ -1,7 +1,6 @@
require "rails"
require "action_controller"
require "action_dispatch/railtie"
require "action_view/railtie"
require "abstract_controller/railties/routes_helpers"
require "action_controller/railties/helpers"

View File

@ -39,6 +39,7 @@ module ActionView
initializer "action_view.setup_action_pack", before: :add_view_paths do |app|
ActiveSupport.on_load(:action_controller) do
ActionController::Base.superclass.send(:include, ActionView::Layouts)
ActionView::RoutingUrlFor.send(:include, ActionDispatch::Routing::UrlFor)
end
end

View File

@ -269,6 +269,7 @@ end
# Emulate AV railtie.
ActionController::Base.superclass.send(:include, ActionView::Layouts)
ActionView::RoutingUrlFor.send(:include, ActionDispatch::Routing::UrlFor)
module ActionController
class Base