projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '8400-additional-gitignore' of https://github.com/wtsi-hgi/arvados close...
[arvados.git]
/
apps
/
workbench
/
app
/
views
/
websocket
/
index.html.erb
diff --git
a/apps/workbench/app/views/websocket/index.html.erb
b/apps/workbench/app/views/websocket/index.html.erb
index e1fca7849f1d9023fdea0d25dd3297275b03bcb0..d8053718772fbcd0f8140aa3d85887186983dd70 100644
(file)
--- a/
apps/workbench/app/views/websocket/index.html.erb
+++ b/
apps/workbench/app/views/websocket/index.html.erb
@@
-15,12
+15,13
@@
<script>
$(function() {
putStuffThere = function (content) {
<script>
$(function() {
putStuffThere = function (content) {
- $("#PutStuffHere").append(content
["message"]
+ "<br>");
+ $("#PutStuffHere").append(content + "<br>");
};
};
-var dispatcher = new WebSocket('
ws://localhost:3001/websocket
?api_token=<%= Thread.current[:arvados_api_token] %>');
+var dispatcher = new WebSocket('
<%= arvados_api_client.discovery[:websocketUrl] %>
?api_token=<%= Thread.current[:arvados_api_token] %>');
dispatcher.onmessage = function(event) {
dispatcher.onmessage = function(event) {
- putStuffThere(JSON.parse(event.data));
+ //putStuffThere(JSON.parse(event.data));
+ putStuffThere(event.data);
};
sendStuff = function () {
};
sendStuff = function () {