Skip to content

Commit b8ab4a9

Browse files
authored
Merge pull request #785 from Turbo87/eslint
Replace JSHint/JSCS with ESLint
2 parents a4cd012 + 0f7f785 commit b8ab4a9

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

+732
-709
lines changed

.eslintrc.js

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
module.exports = {
2+
root: true,
3+
parserOptions: {
4+
ecmaVersion: 2017,
5+
sourceType: 'module',
6+
ecmaFeatures: {
7+
'experimentalObjectRestSpread': true,
8+
},
9+
},
10+
extends: [
11+
'eslint:recommended',
12+
'plugin:ember-suave/recommended',
13+
],
14+
env: {
15+
browser: true,
16+
},
17+
rules: {
18+
'arrow-parens': 'off',
19+
'brace-style': 'off',
20+
'camelcase': 'off',
21+
'comma-dangle': 'off',
22+
'dot-notation': 'off',
23+
'indent': ['error', 4],
24+
'operator-linebreak': 'off',
25+
'quotes': ['error', 'single', {
26+
'allowTemplateLiterals': true,
27+
'avoidEscape': true,
28+
}],
29+
30+
'ember-suave/no-const-outside-module-scope': 'off',
31+
'ember-suave/no-direct-property-access': 'off',
32+
'ember-suave/require-access-in-comments': 'off',
33+
},
34+
};

.jscsrc

Lines changed: 0 additions & 12 deletions
This file was deleted.

.jshintrc

Lines changed: 0 additions & 33 deletions
This file was deleted.

app/adapters/category-slug.js

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

44
export default ApplicationAdapter.extend({
55
pathForType(modelName) {
6-
var decamelized = Ember.String.underscore(
6+
let decamelized = Ember.String.underscore(
77
Ember.String.decamelize(modelName)
88
);
99
return Ember.String.pluralize(decamelized);

app/adapters/dependency.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export default ApplicationAdapter.extend({
66
return this._super(...arguments);
77
}
88
delete query.reverse;
9-
var { crate } = query;
9+
let { crate } = query;
1010
delete query.crate;
1111
return this.ajax(`/${this.urlPrefix()}/crates/${crate.get('id')}/reverse_dependencies`,
1212
'GET', { data: query });

app/components/download-graph.js

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

3+
// Colors by http://colorbrewer2.org/#type=diverging&scheme=RdBu&n=10
4+
const COLORS = [
5+
'#67001f',
6+
'#b2182b',
7+
'#d6604d',
8+
'#f4a582',
9+
'#92c5de',
10+
'#4393c3',
11+
'#2166ac',
12+
'#053061'
13+
];
14+
315
export default Ember.Component.extend({
416
classNames: 'graph-data',
517

@@ -72,42 +84,39 @@ export default Ember.Component.extend({
7284
this.$().show();
7385
}
7486

75-
var myData = window.google.visualization.arrayToDataTable(data);
87+
let myData = window.google.visualization.arrayToDataTable(data);
7688

77-
var fmt = new window.google.visualization.DateFormat({
89+
let fmt = new window.google.visualization.DateFormat({
7890
pattern: 'LLL d, yyyy',
7991
});
8092
fmt.format(myData, 0);
8193

8294
// use a DataView to calculate an x-day moving average
83-
var days = 7;
84-
var view = new window.google.visualization.DataView(myData);
85-
var moving_avg_func_for_col = function(col) {
95+
let days = 7;
96+
let view = new window.google.visualization.DataView(myData);
97+
let moving_avg_func_for_col = function(col) {
8698
return function(dt, row) {
8799
// For the last rows (the *first* days, remember, the dataset is
88100
// backwards), we cannot calculate the avg. of previous days.
89101
if (row >= dt.getNumberOfRows() - days) {
90102
return null;
91103
}
92104

93-
var total = 0;
94-
for (var i = days; i > 0; i--) {
105+
let total = 0;
106+
for (let i = days; i > 0; i--) {
95107
total += dt.getValue(row + i, col);
96108
}
97-
var avg = total / days;
109+
let avg = total / days;
98110
return {
99111
v: avg,
100112
f: avg.toFixed(2)
101113
};
102114
};
103115
};
104116

105-
var columns = [0]; // 0 = datetime
106-
var seriesOption = {};
107-
// Colors by http://colorbrewer2.org/#type=diverging&scheme=RdBu&n=10
108-
var colors = ['#67001f', '#b2182b', '#d6604d', '#f4a582', '#92c5de',
109-
'#4393c3', '#2166ac', '#053061'];
110-
var [headers, ] = data;
117+
let columns = [0]; // 0 = datetime
118+
let seriesOption = {};
119+
let [headers] = data;
111120
// Walk over the headers/colums in reverse order, as the newest version
112121
// is at the end, but in the UI we want it at the top of the chart legend.
113122

@@ -122,21 +131,21 @@ export default Ember.Component.extend({
122131
// axis), the series configuration starts with index 0.
123132
seriesOption[i * 2] = {
124133
type: 'scatter',
125-
color: colors[i % colors.length],
134+
color: COLORS[i % COLORS.length],
126135
pointSize: 3,
127136
pointShape: 'square'
128137
};
129138
seriesOption[i * 2 + 1] = {
130139
type: 'line',
131-
color: colors[i % colors.length],
140+
color: COLORS[i % COLORS.length],
132141
lineWidth: 2,
133142
curveType: 'function',
134143
visibleInLegend: false
135144
};
136145
});
137146
view.setColumns(columns);
138147

139-
var chart = new window.google.visualization.ComboChart(this.get('element'));
148+
let chart = new window.google.visualization.ComboChart(this.get('element'));
140149
chart.draw(view, {
141150
chartArea: { 'left': 85, 'width': '77%', 'height': '80%' },
142151
hAxis: {

app/controllers/crate/version.js

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ export default Ember.Controller.extend({
4040
displayedAuthors: computed('currentVersion.authors.[]', function() {
4141
return DS.PromiseArray.create({
4242
promise: this.get('currentVersion.authors').then((authors) => {
43-
var ret = authors.slice();
44-
var others = authors.get('meta');
45-
for (var i = 0; i < others.names.length; i++) {
43+
let ret = authors.slice();
44+
let others = authors.get('meta');
45+
for (let i = 0; i < others.names.length; i++) {
4646
ret.push({ name: others.names[i] });
4747
}
4848
return ret;
@@ -54,17 +54,17 @@ export default Ember.Controller.extend({
5454
anyCategories: computed.gt('categories.length', 0),
5555

5656
currentDependencies: computed('currentVersion.dependencies', function() {
57-
var deps = this.get('currentVersion.dependencies');
57+
let deps = this.get('currentVersion.dependencies');
5858

5959
if (deps === null) {
6060
return [];
6161
}
6262

6363
return DS.PromiseArray.create({
6464
promise: deps.then((deps) => {
65-
var non_dev = deps.filter((dep) => dep.get('kind') !== 'dev');
66-
var map = {};
67-
var ret = [];
65+
let non_dev = deps.filter((dep) => dep.get('kind') !== 'dev');
66+
let map = {};
67+
let ret = [];
6868

6969
non_dev.forEach((dep) => {
7070
if (!(dep.get('crate_id') in map)) {
@@ -79,7 +79,7 @@ export default Ember.Controller.extend({
7979
}),
8080

8181
currentDevDependencies: computed('currentVersion.dependencies', function() {
82-
var deps = this.get('currentVersion.dependencies');
82+
let deps = this.get('currentVersion.dependencies');
8383
if (deps === null) {
8484
return [];
8585
}
@@ -120,26 +120,26 @@ export default Ember.Controller.extend({
120120

121121
let extra = this.get('extraDownloads') || [];
122122

123-
var dates = {};
124-
var versions = [];
125-
for (var i = 0; i < 90; i++) {
126-
var now = moment().subtract(i, 'days');
123+
let dates = {};
124+
let versions = [];
125+
for (let i = 0; i < 90; i++) {
126+
let now = moment().subtract(i, 'days');
127127
dates[now.format('MMM D')] = { date: now, cnt: {} };
128128
}
129129

130130
downloads.forEach((d) => {
131-
var version_id = d.get('version.id');
132-
var key = moment(d.get('date')).utc().format('MMM D');
131+
let version_id = d.get('version.id');
132+
let key = moment(d.get('date')).utc().format('MMM D');
133133
if (dates[key]) {
134-
var prev = dates[key].cnt[version_id] || 0;
134+
let prev = dates[key].cnt[version_id] || 0;
135135
dates[key].cnt[version_id] = prev + d.get('downloads');
136136
}
137137
});
138138

139139
extra.forEach((d) => {
140-
var key = moment(d.date).utc().format('MMM D');
140+
let key = moment(d.date).utc().format('MMM D');
141141
if (dates[key]) {
142-
var prev = dates[key].cnt[null] || 0;
142+
let prev = dates[key].cnt[null] || 0;
143143
dates[key].cnt[null] = prev + d.downloads;
144144
}
145145
});
@@ -157,15 +157,15 @@ export default Ember.Controller.extend({
157157
});
158158
}
159159

160-
var headers = ['Date'];
160+
let headers = ['Date'];
161161
versions.sort((b) => b.num).reverse();
162-
for (i = 0; i < versions.length; i++) {
162+
for (let i = 0; i < versions.length; i++) {
163163
headers.push(versions[i].num);
164164
}
165-
var data = [headers];
166-
for (var date in dates) {
167-
var row = [dates[date].date.toDate()];
168-
for (i = 0; i < versions.length; i++) {
165+
let data = [headers];
166+
for (let date in dates) {
167+
let row = [dates[date].date.toDate()];
168+
for (let i = 0; i < versions.length; i++) {
169169
row.push(dates[date].cnt[versions[i].id] || 0);
170170
}
171171
data.push(row);

app/controllers/dashboard.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ export default Ember.Controller.extend({
3535
actions: {
3636
loadMore() {
3737
this.set('loadingMore', true);
38-
var page = (this.get('myFeed').length / 10) + 1;
38+
let page = (this.get('myFeed').length / 10) + 1;
3939

4040
ajax(`/me/updates?page=${page}`).then((data) => {
41-
var versions = data.versions.map(version =>
41+
let versions = data.versions.map(version =>
4242
this.store.push(this.store.normalize('version', version)));
4343

4444
this.get('myFeed').pushObjects(versions);

app/controllers/me/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export default Ember.Controller.extend({
1515
}).then((d) => {
1616
this.get('model').set('api_token', d.api_token);
1717
}).catch((reason) => {
18-
var msg;
18+
let msg;
1919
if (reason.status === 403) {
2020
msg = 'A login is required to perform this action';
2121
} else {

app/helpers/format-email.js

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

3-
var escape = Ember.Handlebars.Utils.escapeExpression;
3+
const escape = Ember.Handlebars.Utils.escapeExpression;
44

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

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

app/helpers/format-num.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ export function formatNum(value) {
55
return '0';
66
}
77

8-
var ret = '';
9-
var cnt = 0;
8+
let ret = '';
9+
let cnt = 0;
1010
while (value > 0) {
1111
if (cnt > 0 && cnt % 3 === 0) {
1212
ret = `,${ret}`;

app/initializers/google.js

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

3-
export var initialize = function() {
3+
export function initialize() {
44
Ember.$.getScript('https://www.google.com/jsapi', function() {
55
window.google.load('visualization', '1.0', {
66
packages: ['corechart'],
@@ -10,7 +10,7 @@ export var initialize = function() {
1010
}
1111
});
1212
});
13-
};
13+
}
1414

1515
export default {
1616
name: 'google',

app/mixins/authenticated-route.js

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

33
export default Ember.Mixin.create({
44
beforeModel(transition) {
5-
var user = this.session.get('currentUser');
5+
let user = this.session.get('currentUser');
66
if (user !== null) {
77
return;
88
}

0 commit comments

Comments
 (0)