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

Henry Castro hcastro at collabora.com
Mon Oct 10 20:14:11 UTC 2016


 loleaflet/src/core/Socket.js |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 3d87e724b999020851a5470b4267d450dbc03153
Author: Henry Castro <hcastro at collabora.com>
Date:   Mon Oct 10 16:03:30 2016 -0400

    loleaflet: do not show internal errors
    
    Internal error message, it was intended for debugging purposes,
    so it is not necessary to show them to final users
    
    Conflicts:
    	loleaflet/src/core/Socket.js

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 1b2d03f..688b9ca 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -308,12 +308,7 @@ L.Socket = L.Class.extend({
 		this._map.hideBusy();
 		this._map._active = false;
 
-		if (e.code && e.reason) {
-			this._map.fire('error', {msg: e.reason});
-		}
-		else {
-			this._map.fire('error', {msg: _('Well, this is embarrassing, we cannot connect to your document. Please try again.'), cmd: 'socket', kind: 'closed', id: 4});
-		}
+		this._map.fire('error', {msg: _('Well, this is embarrassing, we cannot connect to your document. Please try again.'), cmd: 'socket', kind: 'closed', id: 4});
 	},
 
 	parseServerCmd: function (msg) {


More information about the Libreoffice-commits mailing list