Skip to content

Commit 4888a36

Browse files
Revert "Merge pull request #43 from rubys/rails_issues_9461"
This reverts commit ccf92ee, reversing changes made to 8105eb9. Reason: Helper module should be included into AV::Base, extending it with the helpers and config options.
1 parent ae2bf82 commit 4888a36

File tree

1 file changed

+20
-18
lines changed

1 file changed

+20
-18
lines changed

lib/sprockets/railtie.rb

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -81,24 +81,26 @@ def configure(&block)
8181
app.assets.append_path path
8282
end
8383

84-
include Sprockets::Rails::Helper
85-
86-
# Copy relevant config to AV context
87-
self.debug_assets = config.assets.debug
88-
self.digest_assets = config.assets.digest
89-
self.assets_prefix = config.assets.prefix
90-
91-
# Copy over to Sprockets as well
92-
context = app.assets.context_class
93-
context.assets_prefix = config.assets.prefix
94-
context.digest_assets = config.assets.digest
95-
context.config = config.action_controller
96-
97-
if config.assets.compile
98-
self.assets_environment = app.assets
99-
self.assets_manifest = Sprockets::Manifest.new(app.assets, manifest_path)
100-
else
101-
self.assets_manifest = Sprockets::Manifest.new(manifest_path)
84+
ActiveSupport.on_load(:action_view) do
85+
include Sprockets::Rails::Helper
86+
87+
# Copy relevant config to AV context
88+
self.debug_assets = config.assets.debug
89+
self.digest_assets = config.assets.digest
90+
self.assets_prefix = config.assets.prefix
91+
92+
# Copy over to Sprockets as well
93+
context = app.assets.context_class
94+
context.assets_prefix = config.assets.prefix
95+
context.digest_assets = config.assets.digest
96+
context.config = config.action_controller
97+
98+
if config.assets.compile
99+
self.assets_environment = app.assets
100+
self.assets_manifest = Sprockets::Manifest.new(app.assets, manifest_path)
101+
else
102+
self.assets_manifest = Sprockets::Manifest.new(manifest_path)
103+
end
102104
end
103105

104106
app.assets.js_compressor = config.assets.js_compressor

0 commit comments

Comments
 (0)