From 97a8ff937aeaba6f5b7a409cb3d96d33a1a4c43a Mon Sep 17 00:00:00 2001
From: Alon Levy <alon@pobox.com>
Date: Mon, 9 Feb 2015 16:38:24 +0200
Subject: rz_config: embed in index, remove as module

Still missing:
remove host/port, let client use same as url it was served on.
remove other flags no longer relevant.
better mapping of server config to avoid double work?
---
 res/templates/index.html   | 10 ++++++++++
 res/templates/rz_config.js | 11 -----------
 2 files changed, 10 insertions(+), 11 deletions(-)
 delete mode 100644 res/templates/rz_config.js

(limited to 'res')

diff --git a/res/templates/index.html b/res/templates/index.html
index 058bb576..d02a6f09 100644
--- a/res/templates/index.html
+++ b/res/templates/index.html
@@ -3,6 +3,16 @@
 {% block head %}
 {{ super() }}
 <link href="/static/css/feedback.css" rel="stylesheet" type="text/css">
+<script>
+var rz_config = {
+    'rand_id_generator' : 'hash',
+    'rz_server_host': '{{ hostname }}',
+    'rz_server_port': '{{ port }}',
+    'backend_enabled': true,
+    'backend__maintain_ws_connection': true,
+    'feedback_url': '/feedback',
+};
+</script>
 <script data-main='/static/app.js' src="/static/lib/require.js"></script>
 <script src="/static/local_config.js"></script>
 {% endblock %}
diff --git a/res/templates/rz_config.js b/res/templates/rz_config.js
deleted file mode 100644
index 1df57133..00000000
--- a/res/templates/rz_config.js
+++ /dev/null
@@ -1,11 +0,0 @@
-define(function() {
-
-    return {
-        'rand_id_generator' : 'hash',
-        'rz_server_host': '{{ hostname }}',
-        'rz_server_port': '{{ port }}',
-        'backend_enabled': true,
-        'backend__maintain_ws_connection': true,
-        'feedback_url': '/feedback',
-    };
-});
-- 
cgit v1.3.1