Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: avoid ES6+ syntax in client scripts #3629

Merged
merged 3 commits into from
Jan 25, 2021
Merged

fix: avoid ES6+ syntax in client scripts #3629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf33f40
fix: remove template literal that breaks old browsers
longlho Jan 22, 2021
b4cce5a
fix: also fix client/karma.js
longlho Jan 22, 2021
45ec35e
fix: convert more client files to ES5
longlho Jan 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions client/karma.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ function Karma (updater, socket, iframe, opener, navigator, location, document)
}

socket.emit('karma_error', message)
self.updater.updateTestStatus(`karma_error ${message}`)
self.updater.updateTestStatus('karma_error ' + message)
this.complete()
return false
}
Expand Down Expand Up @@ -240,8 +240,9 @@ function Karma (updater, socket, iframe, opener, navigator, location, document)

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

Expand Down
22 changes: 11 additions & 11 deletions client/updater.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function StatusUpdater (socket, titleElement, bannerElement, browsersElement) {
if (!titleElement || !bannerElement) {
return
}
titleElement.textContent = `Karma v ${VERSION} - ${connectionText}; test: ${testText}; ${pingText}`
titleElement.textContent = 'Karma v ' + VERSION + ' - ' + connectionText + '; test: ' + testText + '; ' + pingText
bannerElement.className = connectionText === 'connected' ? 'online' : 'offline'
}

Expand All @@ -46,32 +46,32 @@ function StatusUpdater (socket, titleElement, bannerElement, browsersElement) {
updateBanner()
}

socket.on('connect', () => {
socket.on('connect', function () {
updateConnectionStatus('connected')
})
socket.on('disconnect', () => {
socket.on('disconnect', function () {
updateConnectionStatus('disconnected')
})
socket.on('reconnecting', (sec) => {
updateConnectionStatus(`reconnecting in ${sec} seconds`)
socket.on('reconnecting', function (sec) {
updateConnectionStatus('reconnecting in ' + sec + ' seconds')
})
socket.on('reconnect', () => {
socket.on('reconnect', function () {
updateConnectionStatus('reconnected')
})
socket.on('reconnect_failed', () => {
socket.on('reconnect_failed', function () {
updateConnectionStatus('reconnect_failed')
})

socket.on('info', updateBrowsersInfo)
socket.on('disconnect', () => {
socket.on('disconnect', function () {
updateBrowsersInfo([])
})

socket.on('ping', () => {
socket.on('ping', function () {
updatePingStatus('ping...')
})
socket.on('pong', (latency) => {
updatePingStatus(`ping ${latency}ms`)
socket.on('pong', function (latency) {
updatePingStatus('ping ' + latency + 'ms')
})

return { updateTestStatus: updateTestStatus }
Expand Down
29 changes: 15 additions & 14 deletions static/karma.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ function Karma (updater, socket, iframe, opener, navigator, location, document)
}

socket.emit('karma_error', message)
self.updater.updateTestStatus(`karma_error ${message}`)
self.updater.updateTestStatus('karma_error ' + message)
this.complete()
return false
}
Expand Down Expand Up @@ -250,8 +250,9 @@ function Karma (updater, socket, iframe, opener, navigator, location, document)

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

Expand Down Expand Up @@ -384,7 +385,7 @@ function StatusUpdater (socket, titleElement, bannerElement, browsersElement) {
if (!titleElement || !bannerElement) {
return
}
titleElement.textContent = `Karma v ${VERSION} - ${connectionText}; test: ${testText}; ${pingText}`
titleElement.textContent = 'Karma v ' + VERSION + ' - ' + connectionText + '; test: ' + testText + '; ' + pingText
bannerElement.className = connectionText === 'connected' ? 'online' : 'offline'
}

Expand All @@ -401,32 +402,32 @@ function StatusUpdater (socket, titleElement, bannerElement, browsersElement) {
updateBanner()
}

socket.on('connect', () => {
socket.on('connect', function () {
updateConnectionStatus('connected')
})
socket.on('disconnect', () => {
socket.on('disconnect', function () {
updateConnectionStatus('disconnected')
})
socket.on('reconnecting', (sec) => {
updateConnectionStatus(`reconnecting in ${sec} seconds`)
socket.on('reconnecting', function (sec) {
updateConnectionStatus('reconnecting in ' + sec + ' seconds')
})
socket.on('reconnect', () => {
socket.on('reconnect', function () {
updateConnectionStatus('reconnected')
})
socket.on('reconnect_failed', () => {
socket.on('reconnect_failed', function () {
updateConnectionStatus('reconnect_failed')
})

socket.on('info', updateBrowsersInfo)
socket.on('disconnect', () => {
socket.on('disconnect', function () {
updateBrowsersInfo([])
})

socket.on('ping', () => {
socket.on('ping', function () {
updatePingStatus('ping...')
})
socket.on('pong', (latency) => {
updatePingStatus(`ping ${latency}ms`)
socket.on('pong', function (latency) {
updatePingStatus('ping ' + latency + 'ms')
})

return { updateTestStatus: updateTestStatus }
Expand Down