diff --git a/package.json b/package.json index 9536ec3..6989aa5 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "Console for Mobile Browsers", "main": "eruda.js", "scripts": { - "ci": "npm run format && npm run lint && npm run test && npm run build", + "ci": "npm run lint && npm run test && npm run build", "build": "webpack --config script/webpack.dev.js && webpack --config script/webpack.release.js", "cov": "npm run test && remap-istanbul -i coverage/coverage-final.json -o coverage/coverage-remapped.json -t json && node script/coverage", "dev": "webpack-dev-server --config script/webpack.dev.js --host 0.0.0.0", diff --git a/src/Console/Console.js b/src/Console/Console.js index d341ee2..54ed1b2 100644 --- a/src/Console/Console.js +++ b/src/Console/Console.js @@ -39,8 +39,9 @@ export default class Console extends Tool { CONSOLE_METHOD.forEach(name => { let origin = (origConsole[name] = noop) - if (winConsole[name]) + if (winConsole[name]) { origin = origConsole[name] = winConsole[name].bind(winConsole) + } winConsole[name] = (...args) => { this[name](...args) diff --git a/src/Console/Log.js b/src/Console/Log.js index 955b7f1..b8d808d 100644 --- a/src/Console/Log.js +++ b/src/Console/Log.js @@ -166,7 +166,7 @@ export default class Log { } this.formattedMsg = msg } - static click(type, log, $el) { + static click(type, log, $el, logger) { switch (type) { case 'log': case 'warn': @@ -176,7 +176,9 @@ export default class Log { case 'table': case 'dir': if (log.src) { - if (Log.showSrcInSources) return 'viewSrc' + if (Log.showSrcInSources) { + return logger.emit('viewJson', log.src) + } let $json = $el.find('.eruda-json') if ($json.hasClass('eruda-hidden')) { if ($json.data('init') !== 'true') { @@ -189,7 +191,7 @@ export default class Log { } } else if (log.args) { log.extractObj(function() { - Log.click(type, log, $el) + Log.click(type, log, $el, logger) delete log.args }) } diff --git a/src/Console/Logger.js b/src/Console/Logger.js index 81bebd0..0d22c4c 100644 --- a/src/Console/Logger.js +++ b/src/Console/Logger.js @@ -311,13 +311,7 @@ export default class Logger extends Emitter { } if (!log) return - let action = Log.click(type, log, $el) - - switch (action) { - case 'viewSrc': - self.emit('viewJson', log.src) - break - } + Log.click(type, log, $el, self) }) } }