From 22158e2af648728426834aad3b1f94489fa024be Mon Sep 17 00:00:00 2001 From: markusfluer Date: Tue, 6 Feb 2018 13:45:54 +0100 Subject: [PATCH] Fixed issue #13306: console.ls.error() doesn't log --- assets/packages/lslog/build/lslog.js | 12 +++++------- assets/packages/lslog/build/lslog.min.js | 2 +- assets/packages/lslog/src/lslog.js | 10 +++++----- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/assets/packages/lslog/build/lslog.js b/assets/packages/lslog/build/lslog.js index d9624e9e305..a5e953193d9 100644 --- a/assets/packages/lslog/build/lslog.js +++ b/assets/packages/lslog/build/lslog.js @@ -71,9 +71,9 @@ var ConsoleShim = function () { } }, { key: '_insertParamToArguments', - value: function _insertParamToArguments() { + value: function _insertParamToArguments(rawArgs) { if (this.param !== '') { - var args = Array.from(arguments); + var args = [].concat(_toConsumableArray(rawArgs)); args.unshift(this.param); return args; } @@ -131,9 +131,7 @@ var ConsoleShim = function () { } var args = this._insertParamToArguments(arguments); if (typeof console.group === 'function') { - var _console$log; - - (_console$log = console.log).call.apply(_console$log, [console].concat(_toConsumableArray(args))); + console.log.apply(console, args); return; } args.shift(); @@ -199,7 +197,7 @@ var ConsoleShim = function () { value: function error() { var args = this._insertParamToArguments(arguments); if (typeof console.error === 'function') { - console.error.apply(args); + console.error.apply(console, args); return; } @@ -211,7 +209,7 @@ var ConsoleShim = function () { value: function warn() { var args = this._insertParamToArguments(arguments); if (typeof console.warn === 'function') { - console.warn.apply(args); + console.warn.apply(console, args); return; } diff --git a/assets/packages/lslog/build/lslog.min.js b/assets/packages/lslog/build/lslog.min.js index 27e1f66a220..a73ce1e38e0 100644 --- a/assets/packages/lslog/build/lslog.min.js +++ b/assets/packages/lslog/build/lslog.min.js @@ -1 +1 @@ -"use strict";function _toConsumableArray(e){if(Array.isArray(e)){for(var o=0,n=Array(e.length);o0&&void 0!==arguments[0]?arguments[0]:"",n=arguments.length>1&&void 0!==arguments[1]&&arguments[1];_classCallCheck(this,e),this.param=o,this.silencer=n,this.collector=[],this.currentGroupDescription="",this.activeGroups=0,this.timeHolder=null,this.methods=["group","groupEnd","log","trace","time","timeEnd","error","warn"],this.silent={group:function(){},groupEnd:function(){},log:function(){},trace:function(){},time:function(){},timeEnd:function(){},error:function(){},err:function(){},debug:function(){},warn:function(){}}}return _createClass(e,[{key:"_generateError",value:function(){try{throw new Error}catch(e){return e}}},{key:"_insertParamToArguments",value:function(){if(""!==this.param){var e=Array.from(arguments);return e.unshift(this.param),e}return Array.from(arguments)}},{key:"setSilent",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:null;this.silencer=e||!this.silencer}},{key:"group",value:function(){if(!this.silencer){var e=this._insertParamToArguments(arguments);if("function"!=typeof console.group){var o=e[0]||"GROUP";this.currentGroupDescription=o,this.activeGroups++}else console.group.apply(console,e)}}},{key:"groupEnd",value:function(){if(!this.silencer){var e=this._insertParamToArguments(arguments);"function"!=typeof console.groupEnd?(this.currentGroupDescription="",this.activeGroups--,this.activeGroups=0===this.activeGroups?0:this.activeGroups--):console.groupEnd.apply(console,e)}}},{key:"log",value:function(){if(!this.silencer){var e=this._insertParamToArguments(arguments);if("function"!=typeof console.group)e.shift(),e.unshift(" ".repeat(2*this.activeGroups)),this.log.apply(this,e);else{var o;(o=console.log).call.apply(o,[console].concat(_toConsumableArray(e)))}}}},{key:"trace",value:function(){if(!this.silencer){var e=this._insertParamToArguments(arguments);if("function"!=typeof console.trace){var o=this._generateError();o.stack?this.log.apply(console,o.stack):(this.log(e),void 0!=arguments.callee&&this.trace.apply(console,arguments.callee))}else console.trace.apply(console,e)}}},{key:"time",value:function(){if(!this.silencer){var e=this._insertParamToArguments(arguments);"function"!=typeof console.time?this.timeHolder=new Date:console.time.apply(console,e)}}},{key:"timeEnd",value:function(){if(!this.silencer){var e=this._insertParamToArguments(arguments);if("function"!=typeof console.timeEnd){var o=new Date-this.timeHolder;this.log("Took "+Math.floor(o/36e5)+" hours, "+Math.floor(o/6e4)+" minutes and "+Math.floor(o/1e3)+" seconds ( "+o+" ms)"),this.time=new Date}else console.timeEnd.apply(console,e)}}},{key:"error",value:function(){var e=this._insertParamToArguments(arguments);"function"!=typeof console.error?(this.log("--- ERROR ---"),this.log(e)):console.error.apply(e)}},{key:"warn",value:function(){var e=this._insertParamToArguments(arguments);"function"!=typeof console.warn?(this.log("--- WARN ---"),this.log(e)):console.warn.apply(e)}}]),e}();if(window.debugState.backend||window.debugState.frontend){var globalLSConsole=new ConsoleShim("LSLOG");window.console.ls=globalLSConsole}else{globalLSConsole=new ConsoleShim("LSLOG",!0);window.console.ls=globalLSConsole} \ No newline at end of file +"use strict";function _toConsumableArray(e){if(Array.isArray(e)){for(var o=0,n=Array(e.length);o0&&void 0!==arguments[0]?arguments[0]:"",n=arguments.length>1&&void 0!==arguments[1]&&arguments[1];_classCallCheck(this,e),this.param=o,this.silencer=n,this.collector=[],this.currentGroupDescription="",this.activeGroups=0,this.timeHolder=null,this.methods=["group","groupEnd","log","trace","time","timeEnd","error","warn"],this.silent={group:function(){},groupEnd:function(){},log:function(){},trace:function(){},time:function(){},timeEnd:function(){},error:function(){},err:function(){},debug:function(){},warn:function(){}}}return _createClass(e,[{key:"_generateError",value:function(){try{throw new Error}catch(e){return e}}},{key:"_insertParamToArguments",value:function(e){if(""!==this.param){var o=[].concat(_toConsumableArray(e));return o.unshift(this.param),o}return Array.from(arguments)}},{key:"setSilent",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:null;this.silencer=e||!this.silencer}},{key:"group",value:function(){if(!this.silencer){var e=this._insertParamToArguments(arguments);if("function"!=typeof console.group){var o=e[0]||"GROUP";this.currentGroupDescription=o,this.activeGroups++}else console.group.apply(console,e)}}},{key:"groupEnd",value:function(){if(!this.silencer){var e=this._insertParamToArguments(arguments);"function"!=typeof console.groupEnd?(this.currentGroupDescription="",this.activeGroups--,this.activeGroups=0===this.activeGroups?0:this.activeGroups--):console.groupEnd.apply(console,e)}}},{key:"log",value:function(){if(!this.silencer){var e=this._insertParamToArguments(arguments);"function"!=typeof console.group?(e.shift(),e.unshift(" ".repeat(2*this.activeGroups)),this.log.apply(this,e)):console.log.apply(console,e)}}},{key:"trace",value:function(){if(!this.silencer){var e=this._insertParamToArguments(arguments);if("function"!=typeof console.trace){var o=this._generateError();o.stack?this.log.apply(console,o.stack):(this.log(e),void 0!=arguments.callee&&this.trace.apply(console,arguments.callee))}else console.trace.apply(console,e)}}},{key:"time",value:function(){if(!this.silencer){var e=this._insertParamToArguments(arguments);"function"!=typeof console.time?this.timeHolder=new Date:console.time.apply(console,e)}}},{key:"timeEnd",value:function(){if(!this.silencer){var e=this._insertParamToArguments(arguments);if("function"!=typeof console.timeEnd){var o=new Date-this.timeHolder;this.log("Took "+Math.floor(o/36e5)+" hours, "+Math.floor(o/6e4)+" minutes and "+Math.floor(o/1e3)+" seconds ( "+o+" ms)"),this.time=new Date}else console.timeEnd.apply(console,e)}}},{key:"error",value:function(){var e=this._insertParamToArguments(arguments);"function"!=typeof console.error?(this.log("--- ERROR ---"),this.log(e)):console.error.apply(console,e)}},{key:"warn",value:function(){var e=this._insertParamToArguments(arguments);"function"!=typeof console.warn?(this.log("--- WARN ---"),this.log(e)):console.warn.apply(console,e)}}]),e}();if(window.debugState.backend||window.debugState.frontend){var globalLSConsole=new ConsoleShim("LSLOG");window.console.ls=globalLSConsole}else{globalLSConsole=new ConsoleShim("LSLOG",!0);window.console.ls=globalLSConsole} \ No newline at end of file diff --git a/assets/packages/lslog/src/lslog.js b/assets/packages/lslog/src/lslog.js index b27c1b93573..aa39ed41759 100644 --- a/assets/packages/lslog/src/lslog.js +++ b/assets/packages/lslog/src/lslog.js @@ -38,9 +38,9 @@ class ConsoleShim { return err; } } - _insertParamToArguments(){ + _insertParamToArguments(rawArgs){ if(this.param !== ''){ - let args = Array.from(arguments); + let args = [...rawArgs]; args.unshift(this.param); return args; } @@ -79,7 +79,7 @@ class ConsoleShim { if(this.silencer) { return; } const args = this._insertParamToArguments(arguments); if (typeof console.group === 'function') { - console.log.call(console, ...args); + console.log.apply(console, args); return; } args.shift(); @@ -133,7 +133,7 @@ class ConsoleShim { error() { const args = this._insertParamToArguments(arguments); if (typeof console.error === 'function') { - console.error.apply(args); + console.error.apply(console,args); return; } @@ -145,7 +145,7 @@ class ConsoleShim { warn() { const args = this._insertParamToArguments(arguments); if (typeof console.warn === 'function') { - console.warn.apply(args); + console.warn.apply(console,args); return; }