diff options
| author | Robert Zorko <robertz@gurucue.com> | 2015-10-13 15:28:35 +0200 |
|---|---|---|
| committer | Robert Zorko <robertz@gurucue.com> | 2015-10-13 15:28:35 +0200 |
| commit | 81f79c04796ad2ba0d48fda0e0fcdc812c476817 (patch) | |
| tree | ab5183e10f9750e131be3a2b6d3aac481d708154 /js/codeq/robot.js | |
| parent | 0977874bac2a1ec5a7fee0c276b1da74ce2e1c90 (diff) | |
| parent | 21b841891f40abaac661d084fd368edfb0ec25da (diff) | |
Merge branch 'master' of ssh://212.235.189.51:22122/codeq-web
Diffstat (limited to 'js/codeq/robot.js')
| -rw-r--r-- | js/codeq/robot.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/js/codeq/robot.js b/js/codeq/robot.js index 1188c7f..a1b76f1 100644 --- a/js/codeq/robot.js +++ b/js/codeq/robot.js @@ -147,8 +147,7 @@ alert(error); }, reconnectTimer = null, - address = '192.168.1.174:8000', // TODO get this from settings - url = 'ws://' + address + '/', + url = 'ws://' + codeq.settings['robot_address'] + ':8000/', socket = eio(url); // set up the websocket events |