From 59119e43d5420bb1b794743d02fe8a2ccd9ea1be Mon Sep 17 00:00:00 2001 From: Ralf Teusner Date: Thu, 6 Oct 2016 16:32:20 +0200 Subject: [PATCH] added relative_url_root to some more javascript calls (ace file path, file template path). --- app/assets/javascripts/editor/editor.js.erb | 3 ++- app/assets/javascripts/exercises.js.erb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/editor/editor.js.erb b/app/assets/javascripts/editor/editor.js.erb index a9dc6a98..7d6f4556 100644 --- a/app/assets/javascripts/editor/editor.js.erb +++ b/app/assets/javascripts/editor/editor.js.erb @@ -1,6 +1,7 @@ var CodeOceanEditor = { //ACE-Editor-Path - ACE_FILES_PATH: '/assets/ace/', + // ruby part adds the relative_url_root, if it is set. + ACE_FILES_PATH: '<%= (defined? config.relative_url_root) && config.relative_url_root != nil && config.relative_url_root != "" ? config.relative_url_root : "" %>' + '/assets/ace/', THEME: 'ace/theme/textmate', //Color-Encoding for Percentages in Progress Bars (For submissions) diff --git a/app/assets/javascripts/exercises.js.erb b/app/assets/javascripts/exercises.js.erb index 9d85b4f1..26e76218 100644 --- a/app/assets/javascripts/exercises.js.erb +++ b/app/assets/javascripts/exercises.js.erb @@ -152,8 +152,9 @@ $(function() { }; var updateFileTemplates = function(fileType) { + var rel_url_root = '<%= (defined? config.relative_url_root) && config.relative_url_root != nil && config.relative_url_root != "" ? config.relative_url_root : "" %>'; var jqxhr = $.ajax({ - url: '/file_templates/by_file_type/' + fileType + '.json', + url: rel_url_root + '/file_templates/by_file_type/' + fileType + '.json', dataType: 'json' }); jqxhr.done(function(response) {