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

Ashod Nakashian ashod.nakashian at collabora.co.uk
Wed Mar 9 02:32:36 UTC 2016


 loleaflet/dist/loleaflet.html |    2 +-
 loleaflet/src/core/Socket.js  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 83880c454fb1694ec4e00c4f7bd7f75ef8727c71
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Tue Mar 8 19:18:32 2016 -0500

    loleaflet: removed unnecessary token parameter sent to WSD
    
    Change-Id: Ibdef21665fcbf65c95870c8711321f63f7098596
    Reviewed-on: https://gerrit.libreoffice.org/23050
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html
index c001d1f..53045eb 100644
--- a/loleaflet/dist/loleaflet.html
+++ b/loleaflet/dist/loleaflet.html
@@ -280,7 +280,7 @@
     }
     document.title = fileName;
     var map = L.map('map', {
-            server: host,
+			server: host,
 			doc: filePath,
 			permission: permission,
 			timestamp: timestamp,
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index f3c7dd7..d1d5ad9 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -9,7 +9,7 @@ L.Socket = L.Class.extend({
 	initialize: function (map) {
 		this._map = map;
 		try {
-			this.socket = new WebSocket(map.options.server + '/?token=' + map.options.token);
+			this.socket = new WebSocket(map.options.server);
 		} catch (e) {
 			this.fire('error', {msg: _('Socket connection error'), cmd: 'socket', kind: 'failed', id: 3});
 			return null;


More information about the Libreoffice-commits mailing list