Merge pull request #2769 from overleaf/jpa-fix-socket-io-v2-ie11

[frontend] ConnectionManager: ie11 fix for socket.io v2 and wsUrl

GitOrigin-RevId: 9692a1b7c6b0278e8069013a68990b69694ba549
This commit is contained in:
Simon Detheridge 2020-04-24 10:17:57 +01:00 committed by Copybot
parent dd59d8c242
commit f84ef4e999

View file

@ -111,9 +111,17 @@ define(['./SocketIoShim'], function(SocketIoShim) {
parsedURL = new URL(this.wsUrl || '/socket.io', window.location) parsedURL = new URL(this.wsUrl || '/socket.io', window.location)
} catch (e) { } catch (e) {
// hello IE11 // hello IE11
if (
this.wsUrl &&
this.wsUrl.indexOf('/') !== 0 &&
!window.location.href.match(/ws=fallback/)
) {
// do not even try parsing the wsUrl, use the fallback
window.location = window.location.href + '?ws=fallback'
}
parsedURL = { parsedURL = {
origin: null, origin: null,
pathname: '/socket.io' pathname: this.wsUrl || '/socket.io'
} }
} }
this.ide.socket = SocketIoShim.connect( this.ide.socket = SocketIoShim.connect(