Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-12-26 04:39:12 +01:00
commit 4f38c64e8a

View File

@ -4,14 +4,23 @@ Promise.longStackTraces()
OmegaTargetCurrent.Log = Object.create(OmegaTargetCurrent.Log) OmegaTargetCurrent.Log = Object.create(OmegaTargetCurrent.Log)
Log = OmegaTargetCurrent.Log Log = OmegaTargetCurrent.Log
_writeLogToLocalStorage = (content) ->
try
localStorage['log'] += content
catch
# Maybe we have reached our limit here. See #1288. Try trimming it.
localStorage['log'] = content
Log.log = (args...) -> Log.log = (args...) ->
console.log(args...) console.log(args...)
localStorage['log'] += args.map(Log.str.bind(Log)).join(' ') + '\n' content = args.map(Log.str.bind(Log)).join(' ') + '\n'
_writeLogToLocalStorage(content)
Log.error = (args...) -> Log.error = (args...) ->
console.error(args...) console.error(args...)
content = args.map(Log.str.bind(Log)).join(' ') content = args.map(Log.str.bind(Log)).join(' ')
localStorage['logLastError'] = content localStorage['logLastError'] = content
localStorage['log'] += 'ERROR: ' + content + '\n' _writeLogToLocalStorage('ERROR: ' + content + '\n')
unhandledPromises = [] unhandledPromises = []
unhandledPromisesId = [] unhandledPromisesId = []