diff --git a/src/Console/Console.es6 b/src/Console/Console.es6 index 1277a87..e3a49c3 100644 --- a/src/Console/Console.es6 +++ b/src/Console/Console.es6 @@ -139,6 +139,12 @@ export default class Console extends Tool { parent.get('sources').set('json', data); parent.showTool('sources'); + }).on('insert', (log) => + { + if (log.type === 'error' && this.config.get('displayIfErr')) + { + parent.show().showTool('console'); + } }); } _hideInput() @@ -165,7 +171,8 @@ export default class Console extends Tool cfg.set(util.defaults(cfg.get(), { catchGlobalErr: true, - overrideConsole: true + overrideConsole: true, + displayIfErr: false })); if (cfg.get('catchGlobalErr')) this.catchGlobalErr(); diff --git a/src/Console/Log.es6 b/src/Console/Log.es6 index 788da4a..ad94851 100644 --- a/src/Console/Log.es6 +++ b/src/Console/Log.es6 @@ -195,6 +195,8 @@ export default class Log extends util.Emitter this._lastLog = log; } + this.emit('insert', log); + this._isUpdated = true; return this.render(); } @@ -276,7 +278,7 @@ var evalJs = jsInput => eval.call(window, jsInput); function errToStr(err) { var lines = err.stack.split('\n'), - msg = `${lines[0]}
`, + msg = `${err.message || lines[0]}
`, stack = `
${lines.slice(1).join('
')}
`; return msg + stack.replace(regJsUrl, match => `${match}`); diff --git a/src/Elements/BottomBar.hbs b/src/Elements/BottomBar.hbs index 5718a53..c55d6f4 100644 --- a/src/Elements/BottomBar.hbs +++ b/src/Elements/BottomBar.hbs @@ -2,7 +2,7 @@
-
+
diff --git a/src/Elements/Elements.scss b/src/Elements/Elements.scss index 057cd7c..5aced6d 100644 --- a/src/Elements/Elements.scss +++ b/src/Elements/Elements.scss @@ -104,13 +104,14 @@ left: 0; bottom: 0; width: 100%; - display: flex; + font-size: 0; .btn { text-align: center; color: $gray; font-size: 14px; line-height: 40px; - flex-grow: 1; + width: 20%; + display: inline-block; &:active, &.active { color: $blue; } diff --git a/src/Network/Network.es6 b/src/Network/Network.es6 index e2ca9f9..72d4982 100644 --- a/src/Network/Network.es6 +++ b/src/Network/Network.es6 @@ -242,9 +242,7 @@ export default class Network extends Tool { var cfg = this.config = config.create('eruda-network'); - cfg.set(util.defaults(cfg.get(), { - overrideXhr: false - })); + cfg.set(util.defaults(cfg.get(), {overrideXhr: true})); if (cfg.get('overrideXhr')) this.overrideXhr(); diff --git a/src/index.es6 b/src/index.es6 index a6d56a9..2f2ca3b 100644 --- a/src/index.es6 +++ b/src/index.es6 @@ -57,6 +57,7 @@ settings.separator() .separator() .add(consoleTool.config, 'catchGlobalErr', 'Catch Global Errors') .add(consoleTool.config, 'overrideConsole', 'Override Console') + .add(consoleTool.config, 'displayIfErr', 'Auto Display If Error Occurs') .separator() .add(network.config, 'overrideXhr', 'Catch Ajax Requests');