diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-01-26 13:35:46 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-01-27 15:21:30 -0600 |
| commit | 75663d101dd2bf367d6d8e0048f53afadbe1b5b4 (patch) | |
| tree | 0fb53e7a4d27bf74005b39359d8b479f40f5a874 | |
| parent | 763d7ad2d99770873a76869987726bff2d703869 (diff) | |
| download | gitlab-ce-75663d101dd2bf367d6d8e0048f53afadbe1b5b4.tar.gz | |
remove hard-coded assets path for ace editor modules
| -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 %> +})(); |