diff options
| author | tomhuda <tomhuda@strobecorp.com> | 2011-05-23 23:30:06 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2011-05-24 00:39:04 -0700 |
| commit | 00be5bd75d0980c467d76b5eecf43490d0f32553 (patch) | |
| tree | c37b4f6459f307a9ca8d5bc4fe441c9d41b636b6 /actionpack/lib/sprockets | |
| parent | 72c7160d0d641e12562412ac0872c7452581e5e0 (diff) | |
| download | rails-00be5bd75d0980c467d76b5eecf43490d0f32553.tar.gz rails-00be5bd75d0980c467d76b5eecf43490d0f32553.tar.bz2 rails-00be5bd75d0980c467d76b5eecf43490d0f32553.zip | |
Remaining cleanup from changes to AssetTagHelper
Diffstat (limited to 'actionpack/lib/sprockets')
| -rw-r--r-- | actionpack/lib/sprockets/helpers/rails_helper.rb | 3 | ||||
| -rw-r--r-- | actionpack/lib/sprockets/railtie.rb | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb index 3b64be67d9..a99dcad81d 100644 --- a/actionpack/lib/sprockets/helpers/rails_helper.rb +++ b/actionpack/lib/sprockets/helpers/rails_helper.rb @@ -4,6 +4,9 @@ require "action_view/helpers/asset_tag_helper" module Sprockets module Helpers module RailsHelper + extend ActiveSupport::Concern + include ActionView::Helpers::AssetTagHelper + def asset_paths @asset_paths ||= begin config = self.config if respond_to?(:config) diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb index da5cb320a6..db0f02a6ab 100644 --- a/actionpack/lib/sprockets/railtie.rb +++ b/actionpack/lib/sprockets/railtie.rb @@ -36,6 +36,8 @@ module Sprockets app.assets = asset_environment(app) ActiveSupport.on_load(:action_view) do + include ::Sprockets::Helpers::RailsHelper + app.assets.context_class.instance_eval do include ::Sprockets::Helpers::RailsHelper end |