From a5474c68cb6bf5cc7195e692e4d17dafc70c0da3 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 24 Apr 2018 22:55:52 +0200 Subject: [PATCH] Fix defalt value --- Config/Options.js | 4 +--- Event/EventManager.js | 5 +---- Log/Logger.js | 40 +++++++++------------------------- UI/Input/Voice/ReadManager.js | 4 ++-- UI/Input/Voice/VoiceManager.js | 6 ++--- Uri/Http.js | 4 +--- Utils/StringUtils.js | 12 +++------- Utils/oLib.js | 12 +++------- 8 files changed, 24 insertions(+), 63 deletions(-) diff --git a/Config/Options.js b/Config/Options.js index 7d6ff88..56eb7f7 100644 --- a/Config/Options.js +++ b/Config/Options.js @@ -39,10 +39,8 @@ * * @since 1.0.0 */ - jsOMS.Config.Options.prototype.set = function (key, value, overwrite) + jsOMS.Config.Options.prototype.set = function (key, value, overwrite = false) { - overwrite = typeof overwrite === 'undefined' ? overwrite : false; - if (overwrite || typeof this.options[key] === 'undefined') { this.options[key] = value; diff --git a/Event/EventManager.js b/Event/EventManager.js index ca26767..b856cc2 100644 --- a/Event/EventManager.js +++ b/Event/EventManager.js @@ -165,15 +165,12 @@ * * @since 1.0.0 */ - jsOMS.Event.EventManager.prototype.attach = function (group, callback, remove, reset) + jsOMS.Event.EventManager.prototype.attach = function (group, callback, remove = false, reset = false) { if (this.callbacks.hasOwnProperty(group)) { return false; } - remove = typeof remove === 'undefined' ? false : remove; - reset = typeof reset === 'undefined' ? false : reset; - this.callbacks[group] = {remove: remove, reset: reset, func: callback}; return true; diff --git a/Log/Logger.js b/Log/Logger.js index ea8b09f..a87e220 100644 --- a/Log/Logger.js +++ b/Log/Logger.js @@ -180,10 +180,8 @@ * * @since 1.0.0 */ - jsOMS.Log.Logger.prototype.emergency = function (message, context) + jsOMS.Log.Logger.prototype.emergency = function (message, context = {}) { - context = typeof context === 'undefined' ? {} : context; - this.write(message, context, jsOMS.Log.LogLevel.EMERGENCY); }; @@ -199,10 +197,8 @@ * * @since 1.0.0 */ - jsOMS.Log.Logger.prototype.alert = function (message, context) + jsOMS.Log.Logger.prototype.alert = function (message, context = {}) { - context = typeof context === 'undefined' ? {} : context; - this.write(message, context, jsOMS.Log.LogLevel.ALERT); }; @@ -218,10 +214,8 @@ * * @since 1.0.0 */ - jsOMS.Log.Logger.prototype.critical = function (message, context) + jsOMS.Log.Logger.prototype.critical = function (message, context = {}) { - context = typeof context === 'undefined' ? {} : context; - this.write(message, context, jsOMS.Log.LogLevel.CRITICAL); }; @@ -237,10 +231,8 @@ * * @since 1.0.0 */ - jsOMS.Log.Logger.prototype.error = function (message, context) + jsOMS.Log.Logger.prototype.error = function (message, context = {}) { - context = typeof context === 'undefined' ? {} : context; - this.write(message, context, jsOMS.Log.LogLevel.ERROR); }; @@ -256,10 +248,8 @@ * * @since 1.0.0 */ - jsOMS.Log.Logger.prototype.warning = function (message, context) + jsOMS.Log.Logger.prototype.warning = function (message, context = {}) { - context = typeof context === 'undefined' ? {} : context; - this.write(message, context, jsOMS.Log.LogLevel.WARNING); }; @@ -275,10 +265,8 @@ * * @since 1.0.0 */ - jsOMS.Log.Logger.prototype.notice = function (message, context) + jsOMS.Log.Logger.prototype.notice = function (message, context = {}) { - context = typeof context === 'undefined' ? {} : context; - this.write(message, context, jsOMS.Log.LogLevel.NOTICE); }; @@ -294,10 +282,8 @@ * * @since 1.0.0 */ - jsOMS.Log.Logger.prototype.info = function (message, context) + jsOMS.Log.Logger.prototype.info = function (message, context = {}) { - context = typeof context === 'undefined' ? {} : context; - this.write(message, context, jsOMS.Log.LogLevel.INFO); }; @@ -313,10 +299,8 @@ * * @since 1.0.0 */ - jsOMS.Log.Logger.prototype.debug = function (message, context) + jsOMS.Log.Logger.prototype.debug = function (message, context = {}) { - context = typeof context === 'undefined' ? {} : context; - this.write(message, context, jsOMS.Log.LogLevel.DEBUG); }; @@ -333,10 +317,8 @@ * * @since 1.0.0 */ - jsOMS.Log.Logger.prototype.log = function (level, message, context) + jsOMS.Log.Logger.prototype.log = function (level, message, context = {}) { - context = typeof context === 'undefined' ? {} : context; - this.write(message, context, level); }; @@ -353,10 +335,8 @@ * * @since 1.0.0 */ - jsOMS.Log.Logger.prototype.console = function (level, message, context) + jsOMS.Log.Logger.prototype.console = function (level, message, context = {}) { - context = typeof context === 'undefined' ? {} : context; - this.write(message, context, jsOMS.Log.LogLevel.INFO); }; }(window.jsOMS = window.jsOMS || {})); diff --git a/UI/Input/Voice/ReadManager.js b/UI/Input/Voice/ReadManager.js index 71c156b..2ba1613 100644 --- a/UI/Input/Voice/ReadManager.js +++ b/UI/Input/Voice/ReadManager.js @@ -31,11 +31,11 @@ * * @since 1.0.0 */ - jsOMS.UI.Input.Voice.ReadManager = function (lang) + jsOMS.UI.Input.Voice.ReadManager = function (lang = 'en-US') { this.pitch = 1; this.rate = 1; - this.lang = typeof lang === 'undefined' ? 'en-US' : lang; + this.lang = lang; this.voices = []; this.voice = null; diff --git a/UI/Input/Voice/VoiceManager.js b/UI/Input/Voice/VoiceManager.js index 9b246e8..2266c0b 100644 --- a/UI/Input/Voice/VoiceManager.js +++ b/UI/Input/Voice/VoiceManager.js @@ -31,11 +31,11 @@ * * @since 1.0.0 */ - jsOMS.UI.Input.Voice.VoiceManager = function (app, commands, lang) + jsOMS.UI.Input.Voice.VoiceManager = function (app, commands = {}, lang = 'en-US') { this.app = app; - this.commands = typeof commands === 'undefined' ? {} : commands; - this.lang = typeof lang === 'undefined' ? 'en-US' : lang; + this.commands = commands; + this.lang = lang; this.recognition = null; this.speechRecognitionList = null; diff --git a/Uri/Http.js b/Uri/Http.js index 00a1e0a..3e3803c 100644 --- a/Uri/Http.js +++ b/Uri/Http.js @@ -51,10 +51,8 @@ * * @since 1.0.0 */ - jsOMS.Uri.Http.parseUrl = function (str, mode) + jsOMS.Uri.Http.parseUrl = function (str, mode = 'php') { - mode = typeof mode === 'undefined' ? 'php' : mode; - const key = ['source', 'scheme', 'authority', 'userInfo', 'user', 'pass', 'host', 'port', 'relative', 'path', 'directory', 'file', 'query', 'fragment' ], diff --git a/Utils/StringUtils.js b/Utils/StringUtils.js index 02d6735..b44e995 100644 --- a/Utils/StringUtils.js +++ b/Utils/StringUtils.js @@ -24,10 +24,8 @@ * * @since 1.0.0 */ - jsOMS.trim = function(str, char) + jsOMS.trim = function(str, char = ' ') { - char = typeof char === 'undefined' ? ' ' : char; - return jsOMS.ltrim(jsOMS.rtrim(str, char), char); }; @@ -43,10 +41,8 @@ * * @since 1.0.0 */ - jsOMS.rtrim = function(str, char) + jsOMS.rtrim = function(str, char = ' ') { - char = typeof char === 'undefined' ? ' ' : char; - return str.replace(new RegExp("[" + char + "]*$"), ''); }; @@ -62,10 +58,8 @@ * * @since 1.0.0 */ - jsOMS.ltrim = function(str, char) + jsOMS.ltrim = function(str, char = ' ') { - char = typeof char === 'undefined' ? ' ' : char; - return str.replace(new RegExp("^[" + char + "]*"), ''); }; diff --git a/Utils/oLib.js b/Utils/oLib.js index 7e622ff..b2b3b42 100644 --- a/Utils/oLib.js +++ b/Utils/oLib.js @@ -57,10 +57,8 @@ * * @since 1.0.0 */ - jsOMS.trim = function(str, char) + jsOMS.trim = function(str, char = ' ') { - char = typeof char === 'undefined' ? ' ' : char; - return jsOMS.ltrim(jsOMS.rtrim(str, char), char); }; @@ -76,10 +74,8 @@ * * @since 1.0.0 */ - jsOMS.rtrim = function(str, char) + jsOMS.rtrim = function(str, char = ' ') { - char = typeof char === 'undefined' ? ' ' : char; - return str.replace(new RegExp("[" + char + "]*$"), ''); }; @@ -95,10 +91,8 @@ * * @since 1.0.0 */ - jsOMS.ltrim = function(str, char) + jsOMS.ltrim = function(str, char = ' ') { - char = typeof char === 'undefined' ? ' ' : char; - return str.replace(new RegExp("^[" + char + "]*"), ''); };