fix(app): Merge PR

mcfly-io · Mar 21, 2016 · 635bb1d · 635bb1d
2 parents 8829f14 + e83e4ef
commit 635bb1d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git 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;
-};
+};
diff --git 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;
+module.exports = ModuleGenerator;
diff --git 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;
+module.exports = ServiceGenerator;
diff --git 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';
                 }