@@ -49,26 +49,30 @@ def requirejs_include_tag(name = nil, &block)
49
49
end
50
50
51
51
if Rails . application . config . assets . digest
52
- modules = requirejs . build_config [ 'modules' ] . map { |m | requirejs . module_name_for m }
52
+ modules = requirejs . build_config [ "modules" ] . map { |m | requirejs . module_name_for m }
53
+ user_paths = requirejs . build_config [ "paths" ] || { }
53
54
54
55
# Generate digestified paths from the modules spec
55
56
paths = { }
56
- modules . each { |m | paths [ m ] = javascript_path ( m ) . sub /\. js$/ , '' }
57
57
58
- if run_config . has_key? 'paths'
58
+ modules . each do |m |
59
+ # Search for modules based on their user-defined paths before using the module name.
60
+ paths [ m ] = javascript_path ( user_paths [ m ] || m ) . gsub ( /\. js$/ , "" )
61
+ end
62
+
63
+ if run_config . has_key? "paths"
59
64
# Add paths for assets specified by full URL (on a CDN)
60
- run_config [ ' paths' ] . each do |k , v |
65
+ run_config [ " paths" ] . each do |k , v |
61
66
paths [ k ] = v if v . is_a? ( Array ) || v =~ /^(https?:)?\/ \/ /
62
-
63
67
end
64
68
end
65
69
66
70
# Override user paths, whose mappings are only relevant in dev mode
67
71
# and in the build_config.
68
- run_config [ ' paths' ] = paths
72
+ run_config [ " paths" ] = paths
69
73
end
70
74
71
- run_config [ ' baseUrl' ] = base_url ( name )
75
+ run_config [ " baseUrl" ] = base_url ( name )
72
76
73
77
html . concat ( content_tag ( :script ) do
74
78
script = "require.config(#{ run_config . to_json } );"
0 commit comments