diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2017-01-28 02:45:32 +0300 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2017-01-28 02:45:32 +0300 |
commit | b78d06b78143b16dccc5d5afaa8796473b68bea1 (patch) | |
tree | 81a95fe43903c408171da25bec85a333e38145ff /app/assets/javascripts | |
parent | 39a33eecd4bb4fed880850fe867b8434272e5346 (diff) | |
parent | cccd647311c47ee3ecd9a28c4260730cf6ab7c6b (diff) |
Merge branch 'relative-url-assets' into 'master'
Remove hard-coded absolute URLs from all frontend assets
See merge request !8831
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/lib/ace.js | 3 | ||||
-rw-r--r-- | app/assets/javascripts/lib/ace/ace_config_paths.js.erb | 25 |
2 files changed, 27 insertions, 1 deletions
diff --git a/app/assets/javascripts/lib/ace.js b/app/assets/javascripts/lib/ace.js index 4cdf99cae72..9cdc0309503 100644 --- a/app/assets/javascripts/lib/ace.js +++ b/app/assets/javascripts/lib/ace.js @@ -1,2 +1,3 @@ -/*= require ace-rails-ap */ +/*= require ace/ace */ /*= require ace/ext-searchbox */ +/*= require ./ace/ace_config_paths */ diff --git a/app/assets/javascripts/lib/ace/ace_config_paths.js.erb b/app/assets/javascripts/lib/ace/ace_config_paths.js.erb new file mode 100644 index 00000000000..25e623f0fdc --- /dev/null +++ b/app/assets/javascripts/lib/ace/ace_config_paths.js.erb @@ -0,0 +1,25 @@ +<% +ace_gem_path = Bundler.rubygems.find_name('ace-rails-ap').first.full_gem_path +ace_workers = Dir[ace_gem_path + '/vendor/assets/javascripts/ace/worker-*.js'].sort.map do |file| + File.basename(file, '.js').sub(/^worker-/, '') +end +ace_modes = Dir[ace_gem_path + '/vendor/assets/javascripts/ace/mode-*.js'].sort.map do |file| + File.basename(file, '.js').sub(/^mode-/, '') +end +%> + +(function() { + window.gon = window.gon || {}; + var basePath = (window.gon.relative_url_root || '').replace(/\/$/, '') + '/assets/ace'; + ace.config.set('basePath', basePath); + + // configure paths for all worker modules +<% ace_workers.each do |worker| %> + ace.config.setModuleUrl('ace/mode/<%= worker %>_worker', basePath + '/worker-<%= worker %>.js'); +<% end %> + + // configure paths for all mode modules +<% ace_modes.each do |mode| %> + ace.config.setModuleUrl('ace/mode/<%= mode %>', basePath + '/mode-<%= mode %>.js'); +<% end %> +})(); |