Skip to content

Commit 42319ef

Browse files
Turbo87Turbo87
committed
Ember: Fix JSCS issues
1 parent 45ec39e commit 42319ef

22 files changed

+77
-57
lines changed

‎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/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/controllers/application.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export default Ember.Controller.extend({
1919
},
2020

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

‎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: 12 additions & 8 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) => {
@@ -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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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/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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
import Ember from "ember";
1+
import Ember from 'ember';
22

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

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

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

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

1515
return ret.htmlSafe();

‎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/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/routes/application.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,15 @@ import ajax from 'ic-ajax';
44
export default Ember.Route.extend({
55
beforeModel() {
66
if (this.session.get('isLoggedIn') &&
7-
this.session.get('currentUser') === null)
8-
{
7+
this.session.get('currentUser') === null) {
98
ajax('/me').then((response) => {
109
var user = this.store.push(this.store.normalize('user', response.user));
1110
user.set('api_token', response.api_token);
1211
this.session.set('currentUser', user);
13-
}).catch(() => this.session.logoutUser()).
14-
finally(() => {
15-
window.currentUserDetected = true;
16-
Ember.$(window).trigger('currentUserDetected');
17-
});
12+
}).catch(() => this.session.logoutUser()).finally(() => {
13+
window.currentUserDetected = true;
14+
Ember.$(window).trigger('currentUserDetected');
15+
});
1816
} else {
1917
window.currentUserDetected = true;
2018
}

‎app/routes/crate/index.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
export default Ember.Route.extend({
4-
redirect: function() {
4+
redirect() {
55
this.transitionTo('crate.version', '');
66
}
77
});

‎app/routes/crate/version.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export default Ember.Route.extend({
2424
.then((keywords) => controller.set('keywords', keywords));
2525

2626
if (this.session.get('currentUser')) {
27-
ajax('/api/v1/crates/' + crate.get('name') + '/following')
27+
ajax(`/api/v1/crates/${crate.get('name')}/following`)
2828
.then((d) => controller.set('following', d.following))
2929
.finally(() => controller.set('fetchingFollowing', false));
3030
}
@@ -62,9 +62,9 @@ export default Ember.Route.extend({
6262

6363
serialize(model) {
6464
if (!model) {
65-
return {version_num: ''};
65+
return { version_num: '' };
6666
} else {
67-
return {version_num: model.get('num')};
67+
return { version_num: model.get('num') };
6868
}
6969
},
7070
});

‎app/routes/dashboard.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ export default Ember.Route.extend(AuthenticatedRoute, {
3333
return Ember.RSVP.hash({
3434
myCrates,
3535
myFollowing
36-
}).then((hash) => this.set('data', hash) );
36+
}).then((hash) => this.set('data', hash));
3737
}
3838
});

‎app/routes/github-authorize.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import ajax from 'ic-ajax';
1616
*/
1717
export default Ember.Route.extend({
1818
beforeModel(transition) {
19-
return ajax('/authorize', {data: transition.queryParams}).then((d) => {
19+
return ajax('/authorize', { data: transition.queryParams }).then((d) => {
2020
var item = JSON.stringify({ ok: true, data: d });
2121
if (window.opener) {
2222
window.opener.github_response = item;

‎app/routes/login.js

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,34 +9,44 @@ import Ember from 'ember';
99
*/
1010
export default Ember.Route.extend({
1111
beforeModel(transition) {
12-
try { localStorage.removeItem('github_response'); } catch (e) {}
12+
try {
13+
localStorage.removeItem('github_response');
14+
} catch (e) {}
1315

1416
delete window.github_response;
1517
var win = window.open('/github_login', 'Authorization',
1618
'width=1000,height=450,' +
1719
'toolbar=0,scrollbars=1,status=1,resizable=1,' +
1820
'location=1,menuBar=0');
19-
if (!win) { return; }
21+
if (!win) {
22+
return;
23+
}
2024

2125
// For the life of me I cannot figure out how to do this other than
2226
// polling
2327
var oauthInterval = window.setInterval(() => {
24-
if (!win.closed) { return; }
28+
if (!win.closed) {
29+
return;
30+
}
2531
window.clearInterval(oauthInterval);
2632
var json = window.github_response;
2733
delete window.github_response;
28-
if (!json) { return; }
34+
if (!json) {
35+
return;
36+
}
2937

3038
var response = JSON.parse(json);
31-
if (!response) { return; }
39+
if (!response) {
40+
return;
41+
}
3242
if (!response.ok) {
3343
this.controllerFor('application').set('flashError',
3444
'Failed to log in');
3545
return;
3646
}
37-
var data = response.data;
47+
var { data } = response;
3848
if (data.errors) {
39-
var error = "Failed to log in: " + data.errors[0].detail;
49+
var error = `Failed to log in: ${data.errors[0].detail}`;
4050
this.controllerFor('application').set('flashError', error);
4151
return;
4252
}

0 commit comments

Comments
 (0)