From aafae6f846f533cedc4eab1857aab97395a0be31 Mon Sep 17 00:00:00 2001 From: Alon Levy Date: Sat, 25 Apr 2015 16:57:10 +0300 Subject: client: drop rz_server_{host,port}, use document.location Since the client can be hidden from the server via multiple layers, be they load balancers, proxies or iptable rules, it is simpler to not have the server aware of those layers and have to inform the client of them, instead use information the client already has. --- src/client/rz_api_backend.js | 5 +---- src/client/rz_mesh.js | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'src/client') diff --git a/src/client/rz_api_backend.js b/src/client/rz_api_backend.js index 416e9708..9401e6f1 100644 --- a/src/client/rz_api_backend.js +++ b/src/client/rz_api_backend.js @@ -7,10 +7,7 @@ define(['util', 'model/core'], function(util, model_core) { function RZ_API_Backend() { - var rz_server_url = 'http://%h:%p'; - rz_server_url = rz_server_url.replace('%h', rz_config.rz_server_host); - rz_server_url = rz_server_url.replace('%p', rz_config.rz_server_port); - + var rz_server_url = document.location.origin; var common_req_ctx = function() { var common_ctx = { rzdoc_name: rz_config.rzdoc_cur__name }; // FIXME: call rz_core.rzdoc_get_current + avoid requirejs circular dep diff --git a/src/client/rz_mesh.js b/src/client/rz_mesh.js index e2156c7a..82ddc3b3 100644 --- a/src/client/rz_mesh.js +++ b/src/client/rz_mesh.js @@ -5,9 +5,7 @@ */ define([ 'util', 'model/diff', 'model/util', 'socketio'], function(util, model_diff, model_util, io) { - var ws_server_url = 'http://%h:%p/graph'; // socketio namespace - ws_server_url = ws_server_url.replace('%h', rz_config.rz_server_host); - ws_server_url = ws_server_url.replace('%p', rz_config.rz_server_port); + var ws_server_url = document.location.origin + '/graph'; // socketio namespace var socket; var rz_mesh_graph_ref; -- cgit v1.3.1