loleaflet/src/core/Socket.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 55180606f856189a39cd448c0476c11417f06193
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Sun Apr 9 19:21:16 2017 -0400
loleaflet: reconnect transparently the first time
Don't show the "This is embarrassing" popup before
first trying to reconnect at least once.
In most cases reconnection is successful transparently.
However, if necessary, we could add some delay to
reconnecting to give the server time to recover,
but without good reason for this complication it's
unwarranted. Server-recycling reconnections have
such a delay.
Change-Id: Ic8e32c451429a24f8362431672057145a492a23f
Reviewed-on: https://gerrit.libreoffice.org/36328
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 787a487e..c2ef985b 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -537,7 +537,8 @@ L.Socket = L.Class.extend({
this._map._docLayer.removeAllViews();
}
- if (isActive) {
+ if (isActive && this._reconnecting) {
+ // Don't show this before first transparently trying to
reconnect.
this._map.fire('error', {msg: _('Well, this is
embarrassing, we cannot connect to your document. Please try again.'), cmd:
'socket', kind: 'closed', id: 4});
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
