summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorAlon Levy <alon@pobox.com>2015-02-09 16:38:24 +0200
committerAlon Levy <alon@pobox.com>2015-02-09 17:07:51 +0200
commit97a8ff937aeaba6f5b7a409cb3d96d33a1a4c43a (patch)
tree3f7467efadf01c140f5408fbb4f5b6c2a0a1cbe2 /res
parentd2d5e0aec0b929b43bbaccd835be3ba3c8915b16 (diff)
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?
Diffstat (limited to 'res')
-rw-r--r--res/templates/index.html10
-rw-r--r--res/templates/rz_config.js11
2 files changed, 10 insertions, 11 deletions
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',
- };
-});