Skip to content

Commit

Permalink
Merge ae90668 into e246461
Browse files Browse the repository at this point in the history
  • Loading branch information
johnjbarton authored Jan 25, 2021
2 parents e246461 + ae90668 commit 1365264
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion client/karma.js
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
6 changes: 3 additions & 3 deletions client/updater.js
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 @@ -53,7 +53,7 @@ function StatusUpdater (socket, titleElement, bannerElement, browsersElement) {
updateConnectionStatus('disconnected')
})
socket.on('reconnecting', (sec) => {
updateConnectionStatus(`reconnecting in ${sec} seconds`)
updateConnectionStatus('reconnecting in ' + sec + ' seconds')
})
socket.on('reconnect', () => {
updateConnectionStatus('reconnected')
Expand All @@ -71,7 +71,7 @@ function StatusUpdater (socket, titleElement, bannerElement, browsersElement) {
updatePingStatus('ping...')
})
socket.on('pong', (latency) => {
updatePingStatus(`ping ${latency}ms`)
updatePingStatus('ping ' + latency + 'ms')
})

return { updateTestStatus: updateTestStatus }
Expand Down
8 changes: 4 additions & 4 deletions static/karma.js
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 @@ -384,7 +384,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 @@ -408,7 +408,7 @@ function StatusUpdater (socket, titleElement, bannerElement, browsersElement) {
updateConnectionStatus('disconnected')
})
socket.on('reconnecting', (sec) => {
updateConnectionStatus(`reconnecting in ${sec} seconds`)
updateConnectionStatus('reconnecting in ' + sec + ' seconds')
})
socket.on('reconnect', () => {
updateConnectionStatus('reconnected')
Expand All @@ -426,7 +426,7 @@ function StatusUpdater (socket, titleElement, bannerElement, browsersElement) {
updatePingStatus('ping...')
})
socket.on('pong', (latency) => {
updatePingStatus(`ping ${latency}ms`)
updatePingStatus('ping ' + latency + 'ms')
})

return { updateTestStatus: updateTestStatus }
Expand Down

0 comments on commit 1365264

Please sign in to comment.