Fix: Log error stack style

This commit is contained in:
surunzi
2017-01-15 13:54:40 +08:00
parent ae3504e1fa
commit f7fc6d7bad
2 changed files with 7 additions and 6 deletions

View File

@@ -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]}<br/>`;
lines = lines.filter(val => !regErudaJs.test(val));
lines = lines.map(val => util.trim(val));
var stack = `<div class="eruda-stack eruda-hidden">${lines.slice(1).join('<br/>')}</div>`;
return msg + stack;
return msg + stack.replace(regJsUrl, match => `<a href="${match}" target="_blank">${match}</a>`);
}
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 => `<a href="${match}" target="_blank">${match}</a>`);
var recognizeUrl = str => str.replace(regUrl, match => `<a href="${match}" target="_blank">${match}</a>`);
function getFrom()
{

View File

@@ -91,6 +91,7 @@
.stack {
color: $gray-dark;
padding-left: 1.2em;
white-space: normal;
}
.count {
background: $red;
@@ -112,4 +113,4 @@
}
}
}
} } }
} } }