pass in websocketURL from main

2016-06-03 17:27:01 +02:00
parent d9a4f2f22c
commit 85dbd5cb6e
2 changed files with 9 additions and 4 deletions
--- a/www/json/main.js
+++ b/www/json/main.js
@@ -1,14 +1,16 @@
 define([
+    '/api/config?cb=' + Math.random().toString(16).substring(2),
    '/common/chainpad-listmap.js',
    '/common/crypto.js',
    '/common/cryptpad-common.js',
    //'/customize/pad.js'
-], function (RtListMap, Crypto, Common) {
+], function (Config, RtListMap, Crypto, Common) {
    var $ = window.jQuery;

    var secret = Common.getSecrets();

    var config = {
+        websocketURL: Config.websocketURL,
        channel: secret.channel,
        cryptKey: secret.key,
        data: {},