loleaflet/src/core/Socket.js | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 67a9300514f40989d1da50f23a9199a264c7f43c
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Wed Jun 14 21:44:10 2017 -0400
Revert "loleaflet: Shorten the docuri in the websocket request."
No WOPI doc can be loaded with this patch as the URL is all wrong
and the access_token missing.
This reverts commit ad8b437360cd0b7a95fd587f7b17d4cf1f385ca1.
Change-Id: Icced96564e61eb137c1620a7fb7e66c5ef8e5a5b
Reviewed-on: https://gerrit.libreoffice.org/38810
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
(cherry picked from commit 2fc7d50607b14df8ad8055e6d74a9c7970db1ae0)
Reviewed-on: https://gerrit.libreoffice.org/38822
Tested-by: Jan Holesovsky <ke...@collabora.com>
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 8e68ec40..444abe62 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -19,12 +19,10 @@ L.Socket = L.Class.extend({
console.debug('socket.initialize:');
this._map = map;
try {
- var paramsForURI = '';
if (map.options.permission) {
map.options.docParams['permission'] =
map.options.permission;
- paramsForURI = '?' + 'permission=' +
map.options.permission;
}
- this.socket = new WebSocket(map.options.server +
'/lool/' + encodeURIComponent(map.options.doc + paramsForURI) + '/ws');
+ this.socket = new WebSocket(map.options.server +
'/lool/' + encodeURIComponent(map.options.doc + '?' +
$.param(map.options.docParams)) + '/ws');
this.socket.onerror = L.bind(this._onSocketError, this);
this.socket.onclose = L.bind(this._onSocketClose, this);
this.socket.onopen = L.bind(this._onSocketOpen, this);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
