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

Ashod Nakashian ashod.nakashian at collabora.co.uk
Sun Apr 24 22:22:45 UTC 2016


 loleaflet/src/core/Socket.js |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5aa2499f8cc4dff3bf1f81b9f526ecd3a1d7e250
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sun Apr 24 16:49:39 2016 -0400

    loleaflet: no need to show error twice
    
    Socket._onSocketClose is always called on error, and
    it displays an error message already.
    
    Change-Id: Ib8d740bbbf45d0d705abe8e2cb3b600b133c2979
    Reviewed-on: https://gerrit.libreoffice.org/24351
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 457ff75..35a8017 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -264,7 +264,7 @@ L.Socket = L.Class.extend({
 
 	_onSocketError: function () {
 		this.hideBusy();
-		this.fire('error', {msg: _('Oops, there is a problem connecting to LibreOffice Online. Please contact your webmaster.'), cmd: 'socket', kind: 'failed', id: 3});
+		// Let onclose (_onSocketClose) report errors.
 	},
 
 	_onSocketClose: function () {


More information about the Libreoffice-commits mailing list