summaryrefslogtreecommitdiff
path: root/js/codeq/robot.js
diff options
context:
space:
mode:
authorMarko Pušnik <marko.pusnik@guru.si>2015-10-13 15:43:10 +0200
committerMarko Pušnik <marko.pusnik@guru.si>2015-10-13 15:43:10 +0200
commit6aabe80831ead5390aff3ae8e73691f0600ca880 (patch)
treef506261cf064c6a518410c63e36b1bbbdbbe5544 /js/codeq/robot.js
parent8855c93594c4eca1d0c5d3e2f9f2b35cc7d420a1 (diff)
parent81f79c04796ad2ba0d48fda0e0fcdc812c476817 (diff)
Merge branch 'master' of ssh://212.235.189.51:22122/codeq-web
Conflicts: index.html
Diffstat (limited to 'js/codeq/robot.js')
-rw-r--r--js/codeq/robot.js3
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