Skip to content

Commit 6629e96

Browse files
authoredJan 25, 2021
fix: avoid ES6+ syntax in client scripts (#3629)
* remove template literals and arrow functions that break in IE11 Fixes #3630
1 parent e246461 commit 6629e96

File tree

3 files changed

+30
-28
lines changed

3 files changed

+30
-28
lines changed
 

‎client/karma.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ function Karma (updater, socket, iframe, opener, navigator, location, document)
191191
}
192192

193193
socket.emit('karma_error', message)
194-
self.updater.updateTestStatus(`karma_error ${message}`)
194+
self.updater.updateTestStatus('karma_error ' + message)
195195
this.complete()
196196
return false
197197
}
@@ -240,8 +240,9 @@ function Karma (updater, socket, iframe, opener, navigator, location, document)
240240

241241
// A test could have incorrectly issued a navigate. Wait one turn
242242
// to ensure the error from an incorrect navigate is processed.
243-
setTimeout(() => {
244-
if (this.config.clearContext) {
243+
var config = this.config
244+
setTimeout(function () {
245+
if (config.clearContext) {
245246
navigateContextTo('about:blank')
246247
}
247248

‎client/updater.js

+11-11
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function StatusUpdater (socket, titleElement, bannerElement, browsersElement) {
2929
if (!titleElement || !bannerElement) {
3030
return
3131
}
32-
titleElement.textContent = `Karma v ${VERSION} - ${connectionText}; test: ${testText}; ${pingText}`
32+
titleElement.textContent = 'Karma v ' + VERSION + ' - ' + connectionText + '; test: ' + testText + '; ' + pingText
3333
bannerElement.className = connectionText === 'connected' ? 'online' : 'offline'
3434
}
3535

@@ -46,32 +46,32 @@ function StatusUpdater (socket, titleElement, bannerElement, browsersElement) {
4646
updateBanner()
4747
}
4848

49-
socket.on('connect', () => {
49+
socket.on('connect', function () {
5050
updateConnectionStatus('connected')
5151
})
52-
socket.on('disconnect', () => {
52+
socket.on('disconnect', function () {
5353
updateConnectionStatus('disconnected')
5454
})
55-
socket.on('reconnecting', (sec) => {
56-
updateConnectionStatus(`reconnecting in ${sec} seconds`)
55+
socket.on('reconnecting', function (sec) {
56+
updateConnectionStatus('reconnecting in ' + sec + ' seconds')
5757
})
58-
socket.on('reconnect', () => {
58+
socket.on('reconnect', function () {
5959
updateConnectionStatus('reconnected')
6060
})
61-
socket.on('reconnect_failed', () => {
61+
socket.on('reconnect_failed', function () {
6262
updateConnectionStatus('reconnect_failed')
6363
})
6464

6565
socket.on('info', updateBrowsersInfo)
66-
socket.on('disconnect', () => {
66+
socket.on('disconnect', function () {
6767
updateBrowsersInfo([])
6868
})
6969

70-
socket.on('ping', () => {
70+
socket.on('ping', function () {
7171
updatePingStatus('ping...')
7272
})
73-
socket.on('pong', (latency) => {
74-
updatePingStatus(`ping ${latency}ms`)
73+
socket.on('pong', function (latency) {
74+
updatePingStatus('ping ' + latency + 'ms')
7575
})
7676

7777
return { updateTestStatus: updateTestStatus }

‎static/karma.js

+15-14
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ function Karma (updater, socket, iframe, opener, navigator, location, document)
201201
}
202202

203203
socket.emit('karma_error', message)
204-
self.updater.updateTestStatus(`karma_error ${message}`)
204+
self.updater.updateTestStatus('karma_error ' + message)
205205
this.complete()
206206
return false
207207
}
@@ -250,8 +250,9 @@ function Karma (updater, socket, iframe, opener, navigator, location, document)
250250

251251
// A test could have incorrectly issued a navigate. Wait one turn
252252
// to ensure the error from an incorrect navigate is processed.
253-
setTimeout(() => {
254-
if (this.config.clearContext) {
253+
var config = this.config
254+
setTimeout(function () {
255+
if (config.clearContext) {
255256
navigateContextTo('about:blank')
256257
}
257258

@@ -384,7 +385,7 @@ function StatusUpdater (socket, titleElement, bannerElement, browsersElement) {
384385
if (!titleElement || !bannerElement) {
385386
return
386387
}
387-
titleElement.textContent = `Karma v ${VERSION} - ${connectionText}; test: ${testText}; ${pingText}`
388+
titleElement.textContent = 'Karma v ' + VERSION + ' - ' + connectionText + '; test: ' + testText + '; ' + pingText
388389
bannerElement.className = connectionText === 'connected' ? 'online' : 'offline'
389390
}
390391

@@ -401,32 +402,32 @@ function StatusUpdater (socket, titleElement, bannerElement, browsersElement) {
401402
updateBanner()
402403
}
403404

404-
socket.on('connect', () => {
405+
socket.on('connect', function () {
405406
updateConnectionStatus('connected')
406407
})
407-
socket.on('disconnect', () => {
408+
socket.on('disconnect', function () {
408409
updateConnectionStatus('disconnected')
409410
})
410-
socket.on('reconnecting', (sec) => {
411-
updateConnectionStatus(`reconnecting in ${sec} seconds`)
411+
socket.on('reconnecting', function (sec) {
412+
updateConnectionStatus('reconnecting in ' + sec + ' seconds')
412413
})
413-
socket.on('reconnect', () => {
414+
socket.on('reconnect', function () {
414415
updateConnectionStatus('reconnected')
415416
})
416-
socket.on('reconnect_failed', () => {
417+
socket.on('reconnect_failed', function () {
417418
updateConnectionStatus('reconnect_failed')
418419
})
419420

420421
socket.on('info', updateBrowsersInfo)
421-
socket.on('disconnect', () => {
422+
socket.on('disconnect', function () {
422423
updateBrowsersInfo([])
423424
})
424425

425-
socket.on('ping', () => {
426+
socket.on('ping', function () {
426427
updatePingStatus('ping...')
427428
})
428-
socket.on('pong', (latency) => {
429-
updatePingStatus(`ping ${latency}ms`)
429+
socket.on('pong', function (latency) {
430+
updatePingStatus('ping ' + latency + 'ms')
430431
})
431432

432433
return { updateTestStatus: updateTestStatus }

0 commit comments

Comments
 (0)
Please sign in to comment.