From e83e4ef11e602516df78213ffdba908a8d39b767 Mon Sep 17 00:00:00 2001 From: Fabio Heer Date: Mon, 14 Mar 2016 00:03:21 +0100 Subject: [PATCH] fix(app): Use lodash trim instead of str.trim --- class/component.js | 6 +++--- module/index.js | 4 ++-- package.json | 2 +- service/index.js | 6 +++--- target/index.js | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/class/component.js b/class/component.js index 41e0c1a..d9c45cc 100644 --- a/class/component.js +++ b/class/component.js @@ -85,7 +85,7 @@ var ComponentGenerator = Class.extend({ message: 'What is the name of your module ?', default: that.modulename || (choices && choices.length >= 1 ? choices[0].value : that.modulename), validate: function(value) { - value = _.str.trim(value); + value = _.trim(value); if (_.isEmpty(value) || value[0] === '/' || value[0] === '\\') { return 'Please enter a non empty name'; } @@ -102,7 +102,7 @@ var ComponentGenerator = Class.extend({ message: 'How would like to name your ' + _templateFolder + ' ?', validate: function(value) { - value = _.str.trim(value); + value = _.trim(value); if (_.isEmpty(value) || value[0] === '/' || value[0] === '\\') { that.prompt_errors = 'Please enter a non empty name'; return 'Please enter a non empty name'; @@ -146,4 +146,4 @@ module.exports = function(localFolder, templateFolder) { _localFolder = localFolder; _templateFolder = templateFolder; return ComponentGenerator; -}; \ No newline at end of file +}; diff --git a/module/index.js b/module/index.js index 431f250..2b2adae 100644 --- a/module/index.js +++ b/module/index.js @@ -68,7 +68,7 @@ var ModuleGenerator = Class.extend({ message: 'What is the name of your module ?', default: this.modulename, validate: function(value) { - value = _.str.trim(value); + value = _.trim(value); if (_.isEmpty(value) || value[0] === '/' || value[0] === '\\') { return 'Please enter a non empty name'; } @@ -125,4 +125,4 @@ var ModuleGenerator = Class.extend({ } }); -module.exports = ModuleGenerator; \ No newline at end of file +module.exports = ModuleGenerator; diff --git a/package.json b/package.json index f5023ee..01d9163 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "yosay": "1.1.0" }, "devDependencies": { - "babel-eslint": "4.1.5", + "babel-eslint": "4.1.8", "chai": "3.4.1", "codeclimate-test-reporter": "0.1.1", "conventional-changelog": "0.5.1", diff --git a/service/index.js b/service/index.js index 14baa67..5d6e766 100644 --- a/service/index.js +++ b/service/index.js @@ -101,7 +101,7 @@ var ServiceGenerator = Class.extend({ message: 'What is the name of your module ?', default: that.modulename || (choices && choices.length >= 1 ? choices[0].value : that.modulename), validate: function(value) { - value = _.str.trim(value); + value = _.trim(value); if (_.isEmpty(value) || value[0] === '/' || value[0] === '\\') { return 'Please enter a non empty name'; } @@ -117,7 +117,7 @@ var ServiceGenerator = Class.extend({ }, message: 'How would like to name your service ?', validate: function(value) { - value = _.str.trim(value); + value = _.trim(value); if (_.isEmpty(value) || value[0] === '/' || value[0] === '\\') { return 'Please enter a non empty name'; } @@ -165,4 +165,4 @@ var ServiceGenerator = Class.extend({ } }); -module.exports = ServiceGenerator; \ No newline at end of file +module.exports = ServiceGenerator; diff --git a/target/index.js b/target/index.js index 1ecdd56..4d3e5d7 100644 --- a/target/index.js +++ b/target/index.js @@ -63,7 +63,7 @@ var TargetGenerator = Class.extend({ message: 'What is the name of your target application?', default: this.targetname, validate: function(value) { - value = _.str.trim(value); + value = _.trim(value); if (_.isEmpty(value) || value[0] === '/' || value[0] === '\\') { return 'Please enter a non empty name'; }