[Libreoffice-commits] online.git: loleaflet/src

Ashod Nakashian ashod.nakashian at collabora.co.uk
Mon Mar 14 02:59:14 UTC 2016


 loleaflet/src/core/Socket.js |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ce702f72e83881448c1bb379ba369193bf5436c4
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Wed Mar 9 23:17:57 2016 -0500

    loleaflet: pass doc URI to WebSocket
    
    Change-Id: I782961ac52705ac0f677f5ee553d2e123b8707d0
    Reviewed-on: https://gerrit.libreoffice.org/23202
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index d1d5ad9..b3e0e02 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -9,9 +9,9 @@ L.Socket = L.Class.extend({
 	initialize: function (map) {
 		this._map = map;
 		try {
-			this.socket = new WebSocket(map.options.server);
+			this.socket = new WebSocket(map.options.server + '/' + map.options.doc);
 		} catch (e) {
-			this.fire('error', {msg: _('Socket connection error'), cmd: 'socket', kind: 'failed', id: 3});
+			this.fire('error', {msg: _('Socket connection error: ' + e), cmd: 'socket', kind: 'failed', id: 3});
 			return null;
 		}
 		this._msgQueue = [];


More information about the Libreoffice-commits mailing list