summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2016-03-29 14:35:32 +0200
committerJan Holesovsky <kendy@collabora.com>2016-03-29 14:47:09 +0200
commit9b54337568632a1dbc41425496ac5dd01733210d (patch)
tree9037bfb891e991981f7781c90d47f0c6feb15573
parentMessageQueue: moving a local object in a return statement prevents copy elision (diff)
downloadonline-9b54337568632a1dbc41425496ac5dd01733210d.tar.gz
online-9b54337568632a1dbc41425496ac5dd01733210d.zip
loleaflet: Warn when somebody tries to use ws: for the websocket.
-rw-r--r--loleaflet/dist/loleaflet.html5
1 files changed, 4 insertions, 1 deletions
diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html
index 9f89fb67be..1bf51ff02f 100644
--- a/loleaflet/dist/loleaflet.html
+++ b/loleaflet/dist/loleaflet.html
@@ -277,7 +277,10 @@
vex.dialog.alert('Wrong WOPISrc, usage: WOPISrc=valid encoded URI, or file_path, usage: file_path=/path/to/doc/');
}
if (host === '') {
- vex.dialog.alert('Wrong host, usage: host=wss://localhost:9980');
+ vex.dialog.alert('The host URL is empty, usage: host=wss://localhost:9980');
+ }
+ if (host.startsWith('ws:')) {
+ vex.dialog.alert('Please use wss: instead of ws: in the host URL, usage: host=wss://localhost:9980');
}
var docURL = wopiSrc !== '' ? wopiSrc : filePath;