From a28daf2715666c602f4ab1f80b7a1fb1c514c61c Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 4 Oct 2016 17:13:15 +0200
Subject: [PATCH] use websocket url configuration api

---
 www/code/main.js  | 5 ++---
 www/poll/main.js  | 2 +-
 www/slide/main.js | 5 ++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/www/code/main.js b/www/code/main.js
index aad7dc7bc..621095dcc 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -1,6 +1,5 @@
 require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
 define([
-    '/api/config?cb=' + Math.random().toString(16).substring(2),
     '/customize/messages.js?app=code',
     '/bower_components/chainpad-crypto/crypto.js',
     '/bower_components/chainpad-netflux/chainpad-netflux.js',
@@ -16,7 +15,7 @@ define([
     '/bower_components/file-saver/FileSaver.min.js',
     '/bower_components/jquery/dist/jquery.min.js',
     '/customize/pad.js'
-], function (Config, /*RTCode,*/ Messages, Crypto, Realtime, TextPatcher, Toolbar, JSONSortify, JsonOT, Cryptpad, Modes, Themes, Visible, Notify) {
+], function (Messages, Crypto, Realtime, TextPatcher, Toolbar, JSONSortify, JsonOT, Cryptpad, Modes, Themes, Visible, Notify) {
     var $ = window.jQuery;
     var saveAs = window.saveAs;
 
@@ -134,7 +133,7 @@ define([
             var config = {
                 //initialState: Messages.codeInitialState,
                 initialState: '{}',
-                websocketURL: Config.websocketURL,
+                websocketURL: Cryptpad.getWebsocketURL(),
                 channel: secret.channel,
                 // our public key
                 validateKey: secret.keys.validateKey || undefined,
diff --git a/www/poll/main.js b/www/poll/main.js
index 349ebc9fa..a586fc502 100644
--- a/www/poll/main.js
+++ b/www/poll/main.js
@@ -865,7 +865,7 @@ define([
     };
 
     var config = {
-        websocketURL: Config.websocketURL,
+        websocketURL: Cryptpad.getWebsocketURL(),
         channel: secret.channel,
         data: {},
         // our public key
diff --git a/www/slide/main.js b/www/slide/main.js
index de3c55f31..e30d9f6bb 100644
--- a/www/slide/main.js
+++ b/www/slide/main.js
@@ -1,6 +1,5 @@
 require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
 define([
-    '/api/config?cb=' + Math.random().toString(16).substring(2),
     '/customize/messages.js?app=code',
     '/bower_components/chainpad-crypto/crypto.js',
     '/bower_components/chainpad-netflux/chainpad-netflux.js',
@@ -17,7 +16,7 @@ define([
     '/bower_components/file-saver/FileSaver.min.js',
     '/bower_components/jquery/dist/jquery.min.js',
     '/customize/pad.js'
-], function (Config, /*RTCode,*/ Messages, Crypto, Realtime, TextPatcher, Toolbar, JSONSortify, JsonOT, Cryptpad, Modes, Themes, Visible, Notify, Slide) {
+], function (Messages, Crypto, Realtime, TextPatcher, Toolbar, JSONSortify, JsonOT, Cryptpad, Modes, Themes, Visible, Notify, Slide) {
     var $ = window.jQuery;
     var saveAs = window.saveAs;
 
@@ -169,7 +168,7 @@ define([
             var config = {
                 //initialState: Messages.codeInitialState,
                 initialState: '{}',
-                websocketURL: Config.websocketURL,
+                websocketURL: Cryptpad.getWebsocketURL(),
                 channel: secret.channel,
                 // our public key
                 validateKey: secret.keys.validateKey || undefined,