Skip to content

Commit 3fd8ee3

Browse files
committed
Merge pull request #123 from amatsuda/drop_legacy
Drop legacy support
2 parents dc613df + 8e37fb9 commit 3fd8ee3

File tree

4 files changed

+4
-174
lines changed

4 files changed

+4
-174
lines changed

lib/sprockets/rails/helper.rb

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,8 @@ def initialize(source)
3838
end
3939
end
4040

41-
if defined? ActionView::Helpers::AssetUrlHelper
42-
include ActionView::Helpers::AssetUrlHelper
43-
include ActionView::Helpers::AssetTagHelper
44-
else
45-
require 'sprockets/rails/legacy_asset_tag_helper'
46-
require 'sprockets/rails/legacy_asset_url_helper'
47-
include LegacyAssetTagHelper
48-
include LegacyAssetUrlHelper
49-
end
41+
include ActionView::Helpers::AssetUrlHelper
42+
include ActionView::Helpers::AssetTagHelper
5043

5144
VIEW_ACCESSORS = [:assets_environment, :assets_manifest,
5245
:assets_prefix, :digest_assets, :debug_assets]

lib/sprockets/rails/legacy_asset_tag_helper.rb

Lines changed: 0 additions & 32 deletions
This file was deleted.

lib/sprockets/rails/legacy_asset_url_helper.rb

Lines changed: 0 additions & 129 deletions
This file was deleted.

lib/sprockets/railtie.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,8 @@ def configure(&block)
128128
Sprockets::Rails::Helper.raise_runtime_errors = app.config.assets.raise_runtime_errors
129129

130130
if config.assets.compile
131-
if app.routes.respond_to?(:prepend)
132-
app.routes.prepend do
133-
mount app.assets => config.assets.prefix
134-
end
131+
app.routes.prepend do
132+
mount app.assets => config.assets.prefix
135133
end
136134
end
137135
end

0 commit comments

Comments
 (0)