[Libreoffice-commits] online.git: 3 commits - loleaflet/src
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Aug 23 08:02:20 UTC 2018
loleaflet/src/core/Socket.js | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 948e2fa44a024a77d6a75a3ef13600cce7ad7efe
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Aug 20 11:29:08 2018 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Aug 23 10:01:27 2018 +0200
leaflet: enable l10n of IE11 connection limit message
Change-Id: I4799c448fd7c843a5cae5eef2eac0bb096f1395f
(cherry picked from commit 259db2527721caa4df8d6084e902136493e4e7dc)
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 39f6bebbd..cbeebb435 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -39,12 +39,12 @@ L.Socket = L.Class.extend({
}
this.socket = new WebSocket(websocketURI);
} catch (e) {
- // On IE 11 there is a limiation on the number of WebSockets open to a single domain (6 by default and can go to 128).
+ // On IE 11 there is a limitation on the number of WebSockets open to a single domain (6 by default and can go to 128).
// Detect this and hint the user.
var msgHint = '';
var isIE11 = !!window.MSInputMethodContext && !!document.documentMode; // https://stackoverflow.com/questions/21825157/internet-explorer-11-detection
if (isIE11)
- msgHint = 'IE11 has reached its maximum number of connections. Please see this document to increase this limit if needed: https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections';
+ msgHint = _('IE11 has reached its maximum number of connections. Please see this document to increase this limit if needed: https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections');
this._map.fire('error', {msg: _('Oops, there is a problem connecting to LibreOffice Online : ').replace('LibreOffice Online', (typeof brandProductName !== 'undefined' ? brandProductName : 'LibreOffice Online')) + e + msgHint, cmd: 'socket', kind: 'failed', id: 3});
return;
commit d42fbcbe9159f843de373f92fc134f6f06c3229e
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Thu Jul 19 01:27:46 2018 -0400
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Aug 23 10:01:20 2018 +0200
leaflet: update IE11 connection limit message
Change-Id: I7299867873fb00cf2a500f17a559106f52c8ba6f
Reviewed-on: https://gerrit.libreoffice.org/57709
Reviewed-by: Jan Holesovsky <kendy at collabora.com>
Tested-by: Jan Holesovsky <kendy at collabora.com>
(cherry picked from commit 6ee2f90d4a448717bf73c4e4e4186b74b3ce6558)
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index eb9e942e7..39f6bebbd 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -44,7 +44,7 @@ L.Socket = L.Class.extend({
var msgHint = '';
var isIE11 = !!window.MSInputMethodContext && !!document.documentMode; // https://stackoverflow.com/questions/21825157/internet-explorer-11-detection
if (isIE11)
- msgHint = 'IE11 has limitation on the maximum number of WebSockets open to a single domain. Please consult this page on how to change this limit: https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections';
+ msgHint = 'IE11 has reached its maximum number of connections. Please see this document to increase this limit if needed: https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections';
this._map.fire('error', {msg: _('Oops, there is a problem connecting to LibreOffice Online : ').replace('LibreOffice Online', (typeof brandProductName !== 'undefined' ? brandProductName : 'LibreOffice Online')) + e + msgHint, cmd: 'socket', kind: 'failed', id: 3});
return;
commit b95bf8dc66ce2582c501a0d1017691e8ec9562c9
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Thu Jul 19 01:27:46 2018 -0400
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Aug 23 10:01:13 2018 +0200
leaflet: update IE11 connection limit message
Change-Id: I7299867873fb00cf2a500f17a559106f52c8ba6f
Reviewed-on: https://gerrit.libreoffice.org/57709
Reviewed-by: Jan Holesovsky <kendy at collabora.com>
Tested-by: Jan Holesovsky <kendy at collabora.com>
(cherry picked from commit e17f6b9e7aabf66db43874a7852fa5d23a0b9100)
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 43a1ac752..eb9e942e7 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -39,9 +39,14 @@ L.Socket = L.Class.extend({
}
this.socket = new WebSocket(websocketURI);
} catch (e) {
- this._map.fire('error', {msg: _('Oops, there is a problem connecting to LibreOffice Online : ').replace('LibreOffice Online', (typeof brandProductName !== 'undefined' ? brandProductName : 'LibreOffice Online')) + _('Cannot create websocket, please restart your browser.'), cmd: 'socket', kind: 'failed', id: 3});
- console.log('Failed to create websocket: ' + websocketURI);
- console.log('Due to an exception: ' + e);
+ // On IE 11 there is a limiation on the number of WebSockets open to a single domain (6 by default and can go to 128).
+ // Detect this and hint the user.
+ var msgHint = '';
+ var isIE11 = !!window.MSInputMethodContext && !!document.documentMode; // https://stackoverflow.com/questions/21825157/internet-explorer-11-detection
+ if (isIE11)
+ msgHint = 'IE11 has limitation on the maximum number of WebSockets open to a single domain. Please consult this page on how to change this limit: https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections';
+
+ this._map.fire('error', {msg: _('Oops, there is a problem connecting to LibreOffice Online : ').replace('LibreOffice Online', (typeof brandProductName !== 'undefined' ? brandProductName : 'LibreOffice Online')) + e + msgHint, cmd: 'socket', kind: 'failed', id: 3});
return;
}
More information about the Libreoffice-commits
mailing list