@@ -90,12 +90,13 @@ var AngularFullstackGenerator = yeoman.generators.Base.extend({
9090 this . prompt ( [ {
9191 type : 'list' ,
9292 name : 'script' ,
93+ default : 1 ,
9394 message : 'What would you like to write scripts with?' ,
94- choices : [ 'JavaScript ', 'CoffeeScript ' ] ,
95+ choices : [ 'CoffeeScript ', 'JavaScript ' ] ,
9596 filter : function ( val ) {
9697 var filterMap = {
97- 'JavaScript ' : 'js ' ,
98- 'CoffeeScript ' : 'coffee '
98+ 'CoffeeScript ' : 'coffee ' ,
99+ 'JavaScript ' : 'js '
99100 } ;
100101
101102 return filterMap [ val ] ;
@@ -116,16 +117,16 @@ var AngularFullstackGenerator = yeoman.generators.Base.extend({
116117 } , {
117118 type : 'list' ,
118119 name : 'stylesheet' ,
119- default : 1 ,
120+ default : 2 ,
120121 message : 'What would you like to write stylesheets with?' ,
121- choices : [ 'CSS' , 'Sass ' , 'Stylus ' , 'Less ' ] ,
122+ choices : [ 'CSS' , 'Less ' , 'Sass ' , 'Stylus ' ] ,
122123 filter : function ( val ) { return val . toLowerCase ( ) ; }
123124 } , {
124125 type : 'list' ,
125126 name : 'router' ,
126127 default : 1 ,
127128 message : 'What Angular router would you like to use?' ,
128- choices : [ 'ngRoute' , 'uiRouter' ] ,
129+ choices : [ 'ngRoute' , 'uiRouter' ] ,
129130 filter : function ( val ) { return val . toLowerCase ( ) ; }
130131 } , {
131132 type : 'confirm' ,
@@ -163,23 +164,20 @@ var AngularFullstackGenerator = yeoman.generators.Base.extend({
163164 type : 'checkbox' ,
164165 name : 'odms' ,
165166 message : 'What would you like to use for data modeling?' ,
166- choices : [
167- {
168- value : 'mongoose' ,
169- name : 'Mongoose (MongoDB)' ,
170- checked : true
171- } ,
172- {
173- value : 'sequelize' ,
174- name : 'Sequelize (MySQL, SQLite, MariaDB, PostgreSQL)' ,
175- checked : false
176- }
177- ]
167+ choices : [ {
168+ value : 'mongoose' ,
169+ name : 'Mongoose (MongoDB)' ,
170+ checked : true
171+ } , {
172+ value : 'sequelize' ,
173+ name : 'Sequelize (MySQL, SQLite, MariaDB, PostgreSQL)' ,
174+ checked : false
175+ } ]
178176 } , {
179177 type : 'list' ,
180178 name : 'models' ,
181179 message : 'What would you like to use for the default models?' ,
182- choices : [ 'Mongoose' , 'Sequelize' ] ,
180+ choices : [ 'Mongoose' , 'Sequelize' ] ,
183181 filter : function ( val ) {
184182 return val . toLowerCase ( ) ;
185183 } ,
@@ -200,23 +198,19 @@ var AngularFullstackGenerator = yeoman.generators.Base.extend({
200198 when : function ( answers ) {
201199 return answers . auth ;
202200 } ,
203- choices : [
204- {
205- value : 'googleAuth' ,
206- name : 'Google' ,
207- checked : false
208- } ,
209- {
210- value : 'facebookAuth' ,
211- name : 'Facebook' ,
212- checked : false
213- } ,
214- {
215- value : 'twitterAuth' ,
216- name : 'Twitter' ,
217- checked : false
218- }
219- ]
201+ choices : [ {
202+ value : 'facebookAuth' ,
203+ name : 'Facebook' ,
204+ checked : false
205+ } , {
206+ value : 'googleAuth' ,
207+ name : 'Google' ,
208+ checked : false
209+ } , {
210+ value : 'twitterAuth' ,
211+ name : 'Twitter' ,
212+ checked : false
213+ } ]
220214 } , {
221215 type : 'confirm' ,
222216 name : 'socketio' ,
0 commit comments