[Libreoffice-commits] online.git: loleaflet/src
Ashod Nakashian (via logerrit)
logerrit at kemper.freedesktop.org
Tue Aug 11 18:05:35 UTC 2020
loleaflet/src/core/Socket.js | 5 +++++
1 file changed, 5 insertions(+)
New commits:
commit b8fd4328afb4e0ed1dc93ecb6a4f8917455ccb5b
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Thu Jul 2 14:21:35 2020 -0400
Commit: Ashod Nakashian <ash at collabora.com>
CommitDate: Tue Aug 11 20:05:17 2020 +0200
leaflet: copy the reuse_cookies param from URI to map.options
Change-Id: I1eee6d2cda3809aeeb2de015c7e18b2c14291bf9
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97783
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Ashod Nakashian <ash at collabora.com>
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 310dbbd22..fa78bf1a3 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -768,6 +768,11 @@ L.Socket = L.Class.extend({
this._map.options.docParams = {};
}
+ var reuseCookies = this._getParameterByName(url, 'reuse_cookies');
+ if (reuseCookies !== '') {
+ this._map.options.docParams['reuse_cookies'] = reuseCookies;
+ }
+
// setup for loading the new document, and trigger the load
var docUrl = url.split('?')[0];
this._map.options.doc = docUrl;
More information about the Libreoffice-commits
mailing list