From da89e70d3db76cc49170888f89d8f1dd8694547c Mon Sep 17 00:00:00 2001 From: Pascal Hartig <phartig@rdrei.net> Date: Fri, 17 May 2013 22:53:09 +0200 Subject: [PATCH] fix(app): Use boolean prompts --- app/index.js | 20 ++++++++++---------- package.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/index.js b/app/index.js index f02bc85b5..347c9c6b5 100644 --- a/app/index.js +++ b/app/index.js @@ -75,14 +75,14 @@ Generator.prototype.askForBootstrap = function askForBootstrap() { this.prompt({ name: 'bootstrap', message: 'Would you like to include Twitter Bootstrap?', - default: 'Y/n', + default: true, warning: 'Yes: All Twitter Bootstrap files will be placed into the styles directory.' }, function (err, props) { if (err) { return this.emit('error', err); } - this.bootstrap = (/y/i).test(props.bootstrap); + this.bootstrap = props.bootstrap; cb(); }.bind(this)); @@ -98,14 +98,14 @@ Generator.prototype.askForCompass = function askForCompass() { this.prompt({ name: 'compassBootstrap', message: 'If so, would you like to use Twitter Bootstrap for Compass (as opposed to vanilla CSS)?', - default: 'Y/n', + default: true, warning: 'Yes: All Twitter Bootstrap files will be placed into the styles directory.' }, function (err, props) { if (err) { return this.emit('error', err); } - this.compassBootstrap = (/y/i).test(props.compassBootstrap); + this.compassBootstrap = props.compassBootstrap; cb(); }.bind(this)); @@ -117,17 +117,17 @@ Generator.prototype.askForModules = function askForModules() { var prompts = [{ name: 'resourceModule', message: 'Would you like to include angular-resource.js?', - default: 'Y/n', + default: true, warning: 'Yes: angular-resource added to bower.json' }, { name: 'cookiesModule', message: 'Would you like to include angular-cookies.js?', - default: 'Y/n', + default: true, warning: 'Yes: angular-cookies added to bower.json' }, { name: 'sanitizeModule', message: 'Would you like to include angular-sanitize.js?', - default: 'Y/n', + default: true, warning: 'Yes: angular-sanitize added to bower.json' }]; @@ -136,9 +136,9 @@ Generator.prototype.askForModules = function askForModules() { return this.emit('error', err); } - this.resourceModule = (/y/i).test(props.resourceModule); - this.cookiesModule = (/y/i).test(props.cookiesModule); - this.sanitizeModule = (/y/i).test(props.sanitizeModule); + this.resourceModule = props.resourceModule; + this.cookiesModule = props.cookiesModule; + this.sanitizeModule = props.sanitizeModule; cb(); }.bind(this)); diff --git a/package.json b/package.json index 8a1a1713d..486f17063 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "test": "mocha" }, "dependencies": { - "yeoman-generator": "~0.10.5" + "yeoman-generator": "~0.11.0" }, "peerDependencies": { "generator-karma": "~0.2.0"