[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loleaflet/src

[Ashod Nakashian]

 loleaflet/src/control/Control.Dialog.js |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit bf60b8419daca93e38370fda5479afd5753f9722
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sun May 28 22:46:25 2017 -0400

    loleaflet: suppress docunloading error
    
    This is a soft-error and reconnection
    is done transparently, so no need to
    show the user unhelpful message.
    
    Change-Id: Ie240897fec1ecdc29a9fc1c1482a416a89ca5323
    Reviewed-on: https://gerrit.libreoffice.org/38122
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>
    (cherry picked from commit d76ce9169c61cdd6482597d18f1d844253280076)
    Reviewed-on: https://gerrit.libreoffice.org/38140
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/src/control/Control.Dialog.js b/loleaflet/src/control/Control.Dialog.js
index 733c5cdf..daad5e6e 100644
--- a/loleaflet/src/control/Control.Dialog.js
+++ b/loleaflet/src/control/Control.Dialog.js
@@ -21,7 +21,10 @@ L.Control.Dialog = L.Control.extend({
 		if (e.msg) {
 			vex.dialog.alert(e.msg);
 		}
-		else if (e.cmd && e.kind) {
+		else if (e.cmd == 'load' && e.kind == 'docunloading') {
+			// Handled by transparently retrying.
+			return;
+		} else if (e.cmd && e.kind) {
 			var msg = 'The server encountered a \'' + e.kind + '\' error while' +
 						' parsing the \'' + e.cmd + '\' command.';
 			vex.dialog.alert(msg);