Skip to content
This repository was archived by the owner on Mar 23, 2024. It is now read-only.

Commit 6b829d3

Browse files
author
Ian Leue
committed
Add support for requirejs.yml.erb filename
1 parent e10e0ed commit 6b829d3

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
requirejs-rails (0.9.0)
4+
requirejs-rails (0.9.1)
55
railties (>= 3.1.1, < 3.3)
66

77
GEM

lib/requirejs/rails/engine.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,13 @@ class Engine < ::Rails::Engine
1515
# merged with the default params. It should be a YAML file with
1616
# a single top-level hash, keys/values corresponding to require.js
1717
# config parameters.
18-
config.requirejs.user_config_file = Pathname.new(app.paths["config"].first)+'requirejs.yml'
18+
config_path = Pathname.new(app.paths["config"].first)
19+
config.requirejs.user_config_file = config_path+'requirejs.yml'
20+
# If requirejs.yml doesn't exist, fall back to requirejs.yml.erb
21+
unless config.requirejs.user_config_file.exist?
22+
config.requirejs.user_config_file = config_path+'requirejs.yml.erb'
23+
end
24+
1925
if config.requirejs.user_config_file.exist?
2026
config.requirejs.user_config = YAML.load(ERB.new(config.requirejs.user_config_file.read).result)
2127
else

0 commit comments

Comments
 (0)