Skip to content

Commit 39413fd

Browse files
alexcrichtonalexcrichton
committed
Merge pull request #229 from Turbo87/jscs
Ember: Use JSCS for code style checking
2 parents 433d768 + 42319ef commit 39413fd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+210
-180
lines changed

‎.jscsrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"preset": "ember-suave",
3+
"disallowTrailingComma": null,
4+
"disallowVar": null,
5+
"requireCamelCaseOrUpperCaseIdentifiers": null,
6+
"requireCommentsToIncludeAccess": null,
7+
"requireParenthesesAroundArrowParam": null,
8+
"validateIndentation": 4
9+
}

‎app/adapters/dependency.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@ export default ApplicationAdapter.extend({
66
return this._super(...arguments);
77
}
88
delete query.reverse;
9-
var crate = query.crate;
9+
var { crate } = query;
1010
delete query.crate;
11-
return this.ajax(this.urlPrefix() + '/crates/' + crate.get('id') +
12-
'/reverse_dependencies',
13-
'GET', { data: query });
11+
return this.ajax(`${this.urlPrefix()}/crates/${crate.get('id')}/reverse_dependencies`,
12+
'GET', { data: query });
1413
},
1514
});

‎app/app.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ let App;
88
Ember.MODEL_FACTORY_INJECTIONS = true;
99

1010
App = Ember.Application.extend({
11-
modulePrefix: config.modulePrefix,
12-
podModulePrefix: config.podModulePrefix,
13-
Resolver
11+
modulePrefix: config.modulePrefix,
12+
podModulePrefix: config.podModulePrefix,
13+
Resolver
1414
});
1515

1616
loadInitializers(App, config.modulePrefix);
1717
Ember.$.ajaxSetup({
18-
cache: false
18+
cache: false
1919
});
2020

2121
export default App;

‎app/components/user-avatar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ export default Ember.Component.extend({
2121
height: computed.readOnly('width'),
2222

2323
src: computed('size', 'user', function() {
24-
return this.get('user.avatar') + '&s=' + this.get('width');
24+
return `${this.get('user.avatar')}&s=${this.get('width')}`;
2525
})
2626
});

‎app/components/user-link.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import Ember from 'ember';
33
const { computed } = Ember;
44

55
export default Ember.Component.extend({
6-
user: null,
7-
attributeBindings: ['title', 'href'],
8-
tagName: 'a',
6+
user: null,
7+
attributeBindings: ['title', 'href'],
8+
tagName: 'a',
99

10-
title: computed.readOnly('user.login'),
10+
title: computed.readOnly('user.login'),
1111

12-
// TODO replace this with a link to a native crates.io profile
13-
// page when they exist.
14-
href: computed.readOnly('user.url'),
12+
// TODO replace this with a link to a native crates.io profile
13+
// page when they exist.
14+
href: computed.readOnly('user.url'),
1515
});

‎app/controllers/application.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ export default Ember.Controller.extend({
1919
},
2020

2121
// TODO: remove observer & DOM mutation in controller..
22-
currentPathChanged: observer('currentPath', function () {
23-
Ember.run.scheduleOnce('afterRender', this, this._scrollToTop);
22+
currentPathChanged: observer('currentPath', function() {
23+
Ember.run.scheduleOnce('afterRender', this, this._scrollToTop);
2424
}),
2525

2626
actions: {
2727
search() {
2828
this.transitionToRoute('search', {
29-
queryParams: {
30-
q: this.get('search'),
31-
page: 1
32-
}
29+
queryParams: {
30+
q: this.get('search'),
31+
page: 1
32+
}
3333
});
3434
},
3535
},

‎app/controllers/catch-all.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Ember from 'ember';
33
export default Ember.Controller.extend({
44
actions: {
55
search(query) {
6-
return this.transitionToRoute('search', {queryParams: {q: query}});
6+
return this.transitionToRoute('search', { queryParams: { q: query } });
77
},
88
},
99
});

‎app/controllers/crate/version.js

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export default Ember.Controller.extend({
3636
var ret = authors.slice();
3737
var others = authors.get('meta');
3838
for (var i = 0; i < others.names.length; i++) {
39-
ret.push({name: others.names[i]});
39+
ret.push({ name: others.names[i] });
4040
}
4141
return ret;
4242
})
@@ -48,11 +48,13 @@ export default Ember.Controller.extend({
4848
currentDependencies: computed('currentVersion.dependencies', function() {
4949
var deps = this.get('currentVersion.dependencies');
5050

51-
if (deps === null) { return []; }
51+
if (deps === null) {
52+
return [];
53+
}
5254

5355
return DS.PromiseArray.create({
5456
promise: deps.then((deps) => {
55-
var non_dev = deps.filter((dep) => dep.get('kind') !== 'dev' );
57+
var non_dev = deps.filter((dep) => dep.get('kind') !== 'dev');
5658
var map = {};
5759
var ret = [];
5860

@@ -70,7 +72,9 @@ export default Ember.Controller.extend({
7072

7173
currentDevDependencies: computed('currentVersion.dependencies', function() {
7274
var deps = this.get('currentVersion.dependencies');
73-
if (deps === null) { return []; }
75+
if (deps === null) {
76+
return [];
77+
}
7478
return DS.PromiseArray.create({
7579
promise: deps.then((deps) => {
7680
return deps.filterBy('kind', 'dev');
@@ -89,13 +93,13 @@ export default Ember.Controller.extend({
8993
this.incrementProperty('crate.downloads');
9094
this.incrementProperty('currentVersion.downloads');
9195
Ember.$('#download-frame').attr('src', data.url);
92-
}).finally(() => this.set('isDownloading', false) );
96+
}).finally(() => this.set('isDownloading', false));
9397
},
9498

9599
toggleFollow() {
96100
this.set('fetchingFollowing', true);
97101
this.set('following', !this.get('following'));
98-
var url = '/api/v1/crates/' + this.get('crate.name') + '/follow';
102+
var url = `/api/v1/crates/${this.get('crate.name')}/follow`;
99103
var method;
100104
if (this.get('following')) {
101105
method = 'put';
@@ -114,7 +118,7 @@ export default Ember.Controller.extend({
114118
var versions = [];
115119
for (var i = 0; i < 90; i++) {
116120
var now = moment().subtract(i, 'days');
117-
dates[now.format('MMM D')] = {date: now, cnt: {}};
121+
dates[now.format('MMM D')] = { date: now, cnt: {} };
118122
}
119123

120124
downloads.forEach((d) => {
@@ -142,8 +146,8 @@ export default Ember.Controller.extend({
142146
var tmp = this.get('smallSortedVersions');
143147
for (i = 0; i < tmp.length; i++) {
144148
versions.push({
145-
id: tmp[i].get('id'),
146-
num: tmp[i].get('num')
149+
id: tmp[i].get('id'),
150+
num: tmp[i].get('num')
147151
});
148152
}
149153
}
@@ -188,7 +192,7 @@ export default Ember.Controller.extend({
188192
}
189193
var chart = new window.google.visualization.AreaChart(el);
190194
chart.draw(myData, {
191-
chartArea: {'left': 85, 'width': '77%', 'height': '80%'},
195+
chartArea: { 'left': 85, 'width': '77%', 'height': '80%' },
192196
hAxis: {
193197
minorGridlines: { count: 8 },
194198
},

‎app/controllers/crates.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export default Ember.Controller.extend(PaginationMixin, {
99
page: '1',
1010
per_page: 10,
1111
sort: 'alpha',
12-
alphabet: 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(""),
12+
alphabet: 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''),
1313

1414
totalItems: computed.readOnly('model.meta.total'),
1515

‎app/controllers/dashboard.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ const { computed } = Ember;
66

77
export default Ember.Controller.extend({
88
init() {
9-
this._super(...arguments);
10-
11-
this.fetchingFeed = true;
12-
this.loadingMore = false;
13-
this.hasMore = false;
14-
this.myCrates = [];
15-
this.myFollowing = [];
16-
this.myFeed = [];
9+
this._super(...arguments);
10+
11+
this.fetchingFeed = true;
12+
this.loadingMore = false;
13+
this.hasMore = false;
14+
this.myCrates = [];
15+
this.myFollowing = [];
16+
this.myFeed = [];
1717
},
1818

1919
visibleCrates: computed('myCreates', function() {
@@ -37,7 +37,7 @@ export default Ember.Controller.extend({
3737
this.set('loadingMore', true);
3838
var page = (this.get('myFeed').length / 10) + 1;
3939

40-
ajax('/me/updates?page=' + page).then((data) => {
40+
ajax(`/me/updates?page=${page}`).then((data) => {
4141
data.crates.forEach(crate =>
4242
this.store.push(this.store.normalize('crate', crate)));
4343

‎app/controllers/install.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Ember from 'ember';
22

33
function link(target) {
4-
return `https://static.rust-lang.org/cargo-dist/cargo-nightly-${target}.tar.gz`;
4+
return `https://static.rust-lang.org/cargo-dist/cargo-nightly-${target}.tar.gz`;
55
}
66

77
export default Ember.Controller.extend({

‎app/controllers/me/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ export default Ember.Controller.extend({
99
this.set('isResetting', true);
1010

1111
ajax({
12-
dataType: "json",
12+
dataType: 'json',
1313
url: '/me/reset_token',
1414
method: 'put',
1515
}).then((d) => {
1616
this.get('model').set('api_token', d.api_token);
1717
}).catch((reason) => {
1818
var msg;
1919
if (reason.status === 403) {
20-
msg = "A login is required to perform this action";
20+
msg = 'A login is required to perform this action';
2121
} else {
22-
msg = "An unknown error occurred";
22+
msg = 'An unknown error occurred';
2323
}
2424
this.controllerFor('application').set('nextFlashError', msg);
2525
// TODO: this should be an action, the route state machine

‎app/helpers/format-email.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
import Ember from "ember";
1+
import Ember from 'ember';
22

33
var escape = Ember.Handlebars.Utils.escapeExpression;
44

55
export function formatEmail(email) {
6-
var formatted = email.match(/^(.*?)\s*(?:<(.*)>)?$/);
7-
var ret = "";
6+
var formatted = email.match(/^(.*?)\s*(?:<(.*)>)?$/);
7+
var ret = '';
88

9-
ret += escape(formatted[1]);
9+
ret += escape(formatted[1]);
1010

11-
if (formatted[2]) {
12-
ret = "<a href='mailto:" + escape(formatted[2]) + "'>" + ret + "</a>";
13-
}
11+
if (formatted[2]) {
12+
ret = `<a href='mailto:${escape(formatted[2])}'>${ret}</a>`;
13+
}
1414

15-
return ret.htmlSafe();
15+
return ret.htmlSafe();
1616
}
1717

1818
export default Ember.Helper.helper(params => formatEmail(params[0]));

‎app/helpers/format-num.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
import Ember from 'ember';
22

33
export function formatNum(value) {
4-
if (value === 0) { return "0"; }
4+
if (value === 0) {
5+
return '0';
6+
}
57

6-
var ret = "";
8+
var ret = '';
79
var cnt = 0;
810
while (value > 0) {
911
if (cnt > 0 && cnt % 3 === 0) {
10-
ret = "," + ret;
12+
ret = `,${ret}`;
1113
cnt = 0;
1214
}
1315
ret = (value % 10) + ret;

‎app/helpers/format-req.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import Ember from "ember";
1+
import Ember from 'ember';
22

33
export default Ember.Helper.helper(function(params) {
4-
let req = params[0];
5-
return req === "*" ? "" : req;
4+
let [req] = params;
5+
return req === '*' ? '' : req;
66
});

‎app/helpers/truncate-text.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import Ember from 'ember';
22

33
export default Ember.Helper.helper(function(params) {
4-
let value = params[0];
5-
if (!value) { return value; }
4+
let [value] = params;
5+
if (!value) {
6+
return value;
7+
}
68
if (value.length > 200) {
7-
return value.slice(0, 200) + ' ...';
9+
return `${value.slice(0, 200)} ...`;
810
}
911
return value;
1012
});

‎app/initializers/google.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,5 @@ export var initialize = function() {
1414

1515
export default {
1616
name: 'google',
17-
18-
initialize: initialize
17+
initialize
1918
};

‎app/initializers/session.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
export default {
2-
name: 'app.session',
2+
name: 'app.session',
33

4-
initialize(container, application) {
5-
application.inject('controller', 'session', 'service:session');
6-
application.inject('route', 'session', 'service:session');
7-
}
4+
initialize(container, application) {
5+
application.inject('controller', 'session', 'service:session');
6+
application.inject('route', 'session', 'service:session');
7+
}
88
};

‎app/mixins/authenticated-route.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ import Ember from 'ember';
33
export default Ember.Mixin.create({
44
beforeModel(transition) {
55
var user = this.session.get('currentUser');
6-
if (user !== null) { return; }
6+
if (user !== null) {
7+
return;
8+
}
79

810
// The current user is loaded asynchronously, so if we haven't actually
911
// loaded the current user yet then we need to wait for it to be loaded.

‎app/mixins/google-pageview.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ import Ember from 'ember';
22

33
export default Ember.Mixin.create({
44
notifyGoogleAnalytics: Ember.on('didTransition', function() {
5-
if (!window.ga) { return; }
5+
if (!window.ga) {
6+
return;
7+
}
68
return window.ga('send', 'pageview', {
79
page: this.get('url'),
810
title: this.get('url')

‎app/mixins/pagination.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ export default Ember.Mixin.create({
3939
'itemsPerPage',
4040
'totalItems',
4141
function() {
42-
if (this.get('totalItems') === 0) { return 0; }
42+
if (this.get('totalItems') === 0) {
43+
return 0;
44+
}
4345
return (this.get('currentPage') - 1) * this.get('itemsPerPage') + 1;
4446
}),
4547

‎app/models/dependency.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const { computed } = Ember;
77

88
export default DS.Model.extend({
99
version: DS.belongsTo('version', {
10-
async: false
10+
async: false
1111
}),
1212
crate_id: DS.attr('string'),
1313
req: DS.attr('string'),

0 commit comments

Comments
 (0)