diff --git a/script/icomoon.js b/script/icomoon.js index b5412dd..a539469 100644 --- a/script/icomoon.js +++ b/script/icomoon.js @@ -1,4 +1,4 @@ -// Icons: info, blocked, terminal, bin, loop +// Icons(Font-awesome): times-circle, exclamation-triangle, chevron-left, chevron-right, repeat, trash, cog, ban, info-circle var fs = require('fs'), path = require('path'); diff --git a/src/Console/Console.hbs b/src/Console/Console.hbs index 11558df..55d6d4a 100644 --- a/src/Console/Console.hbs +++ b/src/Console/Console.hbs @@ -1,11 +1,11 @@
- + All Error Warning Info Log - +
diff --git a/src/Console/Console.scss b/src/Console/Console.scss index 0e8dd77..189ef87 100644 --- a/src/Console/Console.scss +++ b/src/Console/Console.scss @@ -11,7 +11,7 @@ height: 40px; line-height: 20px; width: 100%; - .icon-blocked, .icon-info { + .icon-ban, .icon-info-circle { display: inline-block; color: $gray; padding: 5px; @@ -22,10 +22,10 @@ color: $gray-light; } } - .icon-blocked { + .icon-ban { left: 10px; } - .icon-info { + .icon-info-circle { right: 10px; } .filter { @@ -66,9 +66,13 @@ width: 50%; display: inline-block; text-align: center; + border-right: 1px solid $gray-light; height: 40px; line-height: 40px; float: left; + &:last-child { + border-right: none; + } &:active { background: $blue; color: #fff; diff --git a/src/Console/Log.es6 b/src/Console/Log.es6 index deb731f..48be503 100644 --- a/src/Console/Log.es6 +++ b/src/Console/Log.es6 @@ -52,6 +52,7 @@ export default class Log extends util.Emitter type: 'input', ignoreFilter: true, isCode: true, + icon: 'chevron-right', src, val: jsCode }); @@ -73,6 +74,7 @@ export default class Log extends util.Emitter this._insert({ type: 'output', ignoreFilter: true, + icon: 'chevron-left', src, val: transMsg(val) }); @@ -120,25 +122,27 @@ export default class Log extends util.Emitter { if (util.isUndef(msg)) return; - var ignoreFilter = false, src; + var ignoreFilter = false; if (util.isErr(msg)) { - src = { - stack: msg.stack, - message: msg.message || '' - }; ignoreFilter = msg.ignoreFilter; - msg = errToStr(msg); } else { - msg = errToStr(new Error(), transMsg(msg)); + msg = new Error(msg); } + var src = { + message: msg.message || '', + stack: msg.stack + }; + msg = errToStr(msg); + this._insert({ type: 'error', ignoreFilter: ignoreFilter, src, + icon: 'times-circle', val: msg }); @@ -152,6 +156,7 @@ export default class Log extends util.Emitter this._insert({ type: 'info', src, + icon: 'info-circle', val: msg }); @@ -165,6 +170,7 @@ export default class Log extends util.Emitter this._insert({ type: 'warn', src, + icon: 'exclamation-triangle', val: msg }); @@ -328,11 +334,12 @@ function evalJs(jsInput) return eval.call(window, jsInput); } -function errToStr(err, msg) +function errToStr(err) { var lines = err.stack.split('\n'); - if (util.isUndef(msg)) msg = lines[0] + '
'; + var msg = `${lines[0]}
`; + var stack = `
${lines.slice(1).join('
')}
`; stack = stack.replace(regJsUrl, function (match) diff --git a/src/Console/Log.hbs b/src/Console/Log.hbs index 5a8b6b5..fd45736 100644 --- a/src/Console/Log.hbs +++ b/src/Console/Log.hbs @@ -1,6 +1,11 @@