[Libreoffice-commits] online.git: Branch 'libreoffice-6-3' - loleaflet/js

[Jan Holesovsky (via logerrit)]

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

New commits:
commit 340b76e2a696275353b6d8a358b021e28a68fe8e
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Wed Jun 19 09:48:54 2019 +0200
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Tue Mar 3 13:51:26 2020 +0100

    Avoid a TypeError.
    
    I've been getting this on Android, but suspect it can be a general
    problem:
    
    loleaflet.html?file_path=/storage/emulated/0/Documents/untitled.odt&closebutton=1&permission=edit:165 Uncaught TypeError: Right-hand side of 'instanceof' is not an object
        at global.FakeWebSocket.global.socket.onmessage (loleaflet.html?file_path=/storage/emulated/0/Documents/untitled.odt&closebutton=1&permission=edit:165)
        at <anonymous>:1:25
    
    Change-Id: Ifa6a6b15843e0c8235b920cea07324db59282074
    (cherry picked from commit 22720ee7d12b2d4567567f59a367251ba5f1f721)
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89885
    Reviewed-by: Alexandru Vlăduţu <alexandru.vladutu at 1and1.ro>
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/loleaflet/js/global.js b/loleaflet/js/global.js
index 344ada470..c1d6b9f9e 100644
--- a/loleaflet/js/global.js
+++ b/loleaflet/js/global.js
@@ -127,7 +127,7 @@
 		}
 
 		global.socket.onmessage = function (event) {
-			if (global.L && global.socket instanceof global.L.Socket) {
+			if (typeof global.socket._onMessage === 'function') {
 				global.socket._onMessage(event);
 			} else {
 				global.queueMsg.push(event.data);