Skip to content

Commit 58cb3f3

Browse files
committed
style(gen): add jshint and fix code styling issue
1 parent 8170796 commit 58cb3f3

File tree

5 files changed

+32
-25
lines changed

5 files changed

+32
-25
lines changed

Diff for: Gruntfile.js

+7
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@ module.exports = function (grunt) {
2525
options: {
2626
files: ['CHANGELOG.md']
2727
}
28+
},
29+
jshint: {
30+
options: {
31+
curly: false,
32+
node: true
33+
},
34+
all: ['Gruntfile.js', '*/index.js']
2835
}
2936
});
3037

Diff for: app/index.js

+19-19
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ var AngularFullstackGenerator = yeoman.generators.Base.extend({
104104
this.filters[answers.markup] = true;
105105
this.filters[answers.stylesheet] = true;
106106
this.filters[answers.router] = true;
107-
this.filters['bootstrap'] = answers.bootstrap;
108-
this.filters['uibootstrap'] = answers.uibootstrap;
107+
this.filters.bootstrap = answers.bootstrap;
108+
this.filters.uibootstrap = answers.uibootstrap;
109109
cb();
110110
}.bind(this));
111111
},
@@ -162,9 +162,9 @@ var AngularFullstackGenerator = yeoman.generators.Base.extend({
162162
},
163163
default: true
164164
}], function (answers) {
165-
if(answers.socketio) this.filters['socketio'] = true;
166-
if(answers.mongoose) this.filters['mongoose'] = true;
167-
if(answers.auth) this.filters['auth'] = true;
165+
if(answers.socketio) this.filters.socketio = true;
166+
if(answers.mongoose) this.filters.mongoose = true;
167+
if(answers.auth) this.filters.auth = true;
168168
if(answers.oauth) {
169169
answers.oauth.forEach(function(oauthStrategy) {
170170
this.filters[oauthStrategy] = true;
@@ -198,16 +198,16 @@ var AngularFullstackGenerator = yeoman.generators.Base.extend({
198198
var extensions = [];
199199
var filters = [];
200200

201-
if(this.filters['ngroute']) filters.push('ngroute');
202-
if(this.filters['uirouter']) filters.push('uirouter');
203-
if(this.filters['coffee']) extensions.push('coffee');
204-
if(this.filters['js']) extensions.push('js');
205-
if(this.filters['html']) extensions.push('html');
206-
if(this.filters['jade']) extensions.push('jade');
207-
if(this.filters['css']) extensions.push('css');
208-
if(this.filters['stylus']) extensions.push('styl');
209-
if(this.filters['sass']) extensions.push('scss');
210-
if(this.filters['less']) extensions.push('less');
201+
if(this.filters.ngroute) filters.push('ngroute');
202+
if(this.filters.uirouter) filters.push('uirouter');
203+
if(this.filters.coffee) extensions.push('coffee');
204+
if(this.filters.js) extensions.push('js');
205+
if(this.filters.html) extensions.push('html');
206+
if(this.filters.jade) extensions.push('jade');
207+
if(this.filters.css) extensions.push('css');
208+
if(this.filters.stylus) extensions.push('styl');
209+
if(this.filters.sass) extensions.push('scss');
210+
if(this.filters.less) extensions.push('less');
211211

212212
this.composeWith('ng-component', {
213213
options: {
@@ -233,10 +233,10 @@ var AngularFullstackGenerator = yeoman.generators.Base.extend({
233233
"'ngResource'",
234234
"'ngSanitize'"
235235
];
236-
if(this.filters['ngroute']) angModules.push("'ngRoute'");
237-
if(this.filters['socketio']) angModules.push("'btford.socket-io'");
238-
if(this.filters['uirouter']) angModules.push("'ui.router'");
239-
if(this.filters['uibootstrap']) angModules.push("'ui.bootstrap'");
236+
if(this.filters.ngroute) angModules.push("'ngRoute'");
237+
if(this.filters.socketio) angModules.push("'btford.socket-io'");
238+
if(this.filters.uirouter) angModules.push("'ui.router'");
239+
if(this.filters.uibootstrap) angModules.push("'ui.bootstrap'");
240240

241241
this.angularModules = "\n " + angModules.join(",\n ") +"\n";
242242
},

Diff for: endpoint/index.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,26 +45,26 @@ Generator.prototype.askFor = function askFor() {
4545

4646
Generator.prototype.registerEndpoint = function registerEndpoint() {
4747
if(this.config.get('insertRoutes')) {
48-
var config = {
48+
var routeConfig = {
4949
file: this.config.get('registerRoutesFile'),
5050
needle: this.config.get('routesNeedle'),
5151
splicable: [
5252
"app.use(\'" + this.route +"\', require(\'./api/" + this.name + "\'));"
5353
]
5454
};
55-
ngUtil.rewriteFile(config);
55+
ngUtil.rewriteFile(routeConfig);
5656
}
5757

5858
if (this.filters.socketio) {
5959
if(this.config.get('insertSockets')) {
60-
var config = {
60+
var socketConfig = {
6161
file: this.config.get('registerSocketsFile'),
6262
needle: this.config.get('socketsNeedle'),
6363
splicable: [
6464
"require(\'../api/" + this.name + '/' + this.name + ".socket\').register(socket);"
6565
]
6666
};
67-
ngUtil.rewriteFile(config);
67+
ngUtil.rewriteFile(socketConfig);
6868
}
6969
}
7070
};

Diff for: openshift/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ Generator.prototype.rhcAppShow = function rhcAppShow() {
105105
this.abort = true;
106106
}
107107
// No remote found
108-
else if (!stdout.search('not found.') >= 0) {
108+
else if (stdout.search('not found.') < 0) {
109109
console.log('No existing app found.');
110110
}
111111
// Error

Diff for: package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"chai": "^1.9.1",
3939
"fs-extra": "^0.9.1",
4040
"grunt": "~0.4.1",
41-
"grunt-contrib-jshint": "~0.7.2",
41+
"grunt-contrib-jshint": "^0.10.0",
4242
"grunt-conventional-changelog": "~1.0.0",
4343
"grunt-release": "~0.6.0",
4444
"load-grunt-tasks": "~0.2.0",

0 commit comments

Comments
 (0)