From 58dac37d77f777952e289d77e7e844d3f29df6cd Mon Sep 17 00:00:00 2001 From: Ralf Teusner Date: Thu, 6 Oct 2016 16:14:51 +0200 Subject: [PATCH] added relative_url_root to URL for websocket call, needed for staging server --- app/assets/javascripts/editor/execution.js.erb | 3 ++- app/assets/javascripts/{exercises.js => exercises.js.erb} | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename app/assets/javascripts/{exercises.js => exercises.js.erb} (100%) diff --git a/app/assets/javascripts/editor/execution.js.erb b/app/assets/javascripts/editor/execution.js.erb index acc7eb55..3cc9b262 100644 --- a/app/assets/javascripts/editor/execution.js.erb +++ b/app/assets/javascripts/editor/execution.js.erb @@ -2,7 +2,8 @@ CodeOceanEditorWebsocket = { websocket: null, createSocketUrl: function(url) { - return '<%= DockerClient.config['ws_client_protocol'] %>' + window.location.hostname + ':' + window.location.port + url; + var rel_url_root = '<%= (defined? config.relative_url_root) && config.relative_url_root != nil && config.relative_url_root != "" ? config.relative_url_root : "" %>'; + return '<%= DockerClient.config['ws_client_protocol'] %>' + window.location.hostname + ':' + rel_url_root + window.location.port + url; }, initializeSocket: function(url) { diff --git a/app/assets/javascripts/exercises.js b/app/assets/javascripts/exercises.js.erb similarity index 100% rename from app/assets/javascripts/exercises.js rename to app/assets/javascripts/exercises.js.erb