diff --git a/src/Console/Log.es6 b/src/Console/Log.es6 index 09e11f0..45f945b 100644 --- a/src/Console/Log.es6 +++ b/src/Console/Log.es6 @@ -127,7 +127,7 @@ export default class Log break; } - msg = recognizeUrl(msg); + if (type !== 'error') msg = recognizeUrl(msg); this.value = msg; msg = render({msg, type, icon, id, displayHeader, time, from}); @@ -224,7 +224,8 @@ function formatTable(args) return ret; } -var regErudaJs = /eruda(\.min)?\.js/; +var regJsUrl = /https?:\/\/([0-9.\-A-Za-z]+)(?::(\d+))?\/[A-Z.a-z0-9/]*\.js/g, + regErudaJs = /eruda(\.min)?\.js/; function formatErr(err) { @@ -232,11 +233,10 @@ function formatErr(err) msg = `${err.message || lines[0]}
`; lines = lines.filter(val => !regErudaJs.test(val)); - lines = lines.map(val => util.trim(val)); var stack = `
${lines.slice(1).join('
')}
`; - return msg + stack; + return msg + stack.replace(regJsUrl, match => `${match}`); } function formatJs(code) @@ -364,7 +364,7 @@ function formatEl(val) var regUrl = /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/g; -var recognizeUrl = (str) => str.replace(regUrl, match => `${match}`); +var recognizeUrl = str => str.replace(regUrl, match => `${match}`); function getFrom() { diff --git a/src/Console/Logger.scss b/src/Console/Logger.scss index 2c2ed2f..fdd1751 100644 --- a/src/Console/Logger.scss +++ b/src/Console/Logger.scss @@ -91,6 +91,7 @@ .stack { color: $gray-dark; padding-left: 1.2em; + white-space: normal; } .count { background: $red; @@ -112,4 +113,4 @@ } } } -} } } \ No newline at end of file +} } }