loleaflet/src/core/Socket.js | 3 ---
1 file changed, 3 deletions(-)
New commits:
commit 6ed4185b33012056dc8985476ce6d3bbd457d6a2
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Wed Apr 19 01:01:16 2017 -0400
loleaflet: no need to tell the user when doc is unloading
This is rare and should take a few short seconds
to save and then we can load as normal.
Since the client auto-reconnects anyway, no
need to tell the user to try again.
Change-Id: I51a7ad207edec3203933a1808288870e69699952
Reviewed-on: https://gerrit.libreoffice.org/36655
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
(cherry picked from commit 175f4d995f6d9f54766bd89336ff3255f982ae1c)
Reviewed-on: https://gerrit.libreoffice.org/36657
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jan Holesovsky <ke...@collabora.com>
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 8870f8cb..e165ee71 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -362,9 +362,6 @@ L.Socket = L.Class.extend({
} else if (errorKind.startsWith('docunloading')) {
// The document is unloading. Have to wait a
bit.
this._map._active = false;
- if (vex.dialogID <= 0 && this.ReconnectCount >
0) {
- this._map.fire('error', {msg: _('The
document is currently unloading. Please try again.'), cmd: 'socket', kind:
'closed', id: 4});
- }
if (this.ReconnectCount++ >= 10) {
clearTimeout(vex.timer);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
