Skip to content

Commit d25f6b2

Browse files
committed
Run codemods
1 parent 65d0c42 commit d25f6b2

Some content is hidden

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

77 files changed

+788
-773
lines changed

app/adapters/application.js

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
import JSONAPIAdapter from '@ember-data/adapter/json-api';
21
import { inject as service } from '@ember/service';
2+
import JSONAPIAdapter from '@ember-data/adapter/json-api';
33
import fetch from 'fetch';
44
import ENV from 'ember-api-docs/config/environment';
55
import { pluralize } from 'ember-inflector';
66
import { isBlank } from '@ember/utils';
77

8-
export default JSONAPIAdapter.extend({
9-
host: ENV.API_HOST,
10-
11-
currentProject: '',
8+
export default class Application extends JSONAPIAdapter {
9+
host = ENV.API_HOST;
10+
currentProject = '';
11+
currentProjectVersion = '';
1212

13-
currentProjectVersion: '',
13+
@service
14+
metaStore;
1415

15-
metaStore: service(),
16-
projectService: service('project'),
16+
@service('project')
17+
projectService;
1718

18-
ids: null,
19+
ids = null;
1920

2021
shouldReloadRecord(store, { modelName, id }) {
2122
if (modelName === 'project') {
@@ -24,23 +25,25 @@ export default JSONAPIAdapter.extend({
2425
this.currentProjectVersion = id;
2526
}
2627
return; // return undefined so auto determinated
27-
},
28+
}
29+
2830
shouldBackgroundReloadAll() {
2931
return false;
30-
},
32+
}
33+
3134
shouldBackgroundReloadRecord(store, { modelName, id }) {
3235
let key = `${modelName}-${id}`;
3336
let hasId = this.ids[key];
3437
if (!hasId) {
3538
this.ids[key] = true;
3639
}
3740
return !hasId;
38-
},
41+
}
3942

4043
init() {
41-
this._super(...arguments);
44+
super.init(...arguments);
4245
this.ids = {};
43-
},
46+
}
4447

4548
async findRecord(store, { modelName }, id) {
4649
let url;
@@ -87,5 +90,5 @@ export default JSONAPIAdapter.extend({
8790
let response = await fetch(url);
8891
let json = await response.json();
8992
return json;
90-
},
91-
});
93+
}
94+
}

app/components/api-index-filter.js

Lines changed: 28 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,27 @@
1+
import { classNames } from '@ember-decorators/component';
12
import { computed } from '@ember/object';
23
import Component from '@ember/component';
34
import sortBy from 'lodash.sortby';
45

56
const filterDataComputedParams =
67
'filterData.{showInherited,showProtected,showPrivate,showDeprecated}';
78

8-
export default Component.extend({
9-
classNames: ['api-index-filter'],
9+
@classNames('api-index-filter')
10+
export default class ApiIndexFilter extends Component {
11+
@computed('model.methods.[]', filterDataComputedParams)
12+
get filteredMethods() {
13+
return this.filterItems('methods');
14+
}
1015

11-
filteredMethods: computed(
12-
'model.methods.[]',
13-
filterDataComputedParams,
14-
function () {
15-
return this.filterItems('methods');
16-
}
17-
),
18-
19-
filteredEvents: computed(
20-
'model.events.[]',
21-
filterDataComputedParams,
22-
function () {
23-
return this.filterItems('events');
24-
}
25-
),
16+
@computed('model.events.[]', filterDataComputedParams)
17+
get filteredEvents() {
18+
return this.filterItems('events');
19+
}
2620

27-
filteredProperties: computed(
28-
'model.properties.[]',
29-
filterDataComputedParams,
30-
function () {
31-
return this.filterItems('properties');
32-
}
33-
),
21+
@computed('model.properties.[]', filterDataComputedParams)
22+
get filteredProperties() {
23+
return this.filterItems('properties');
24+
}
3425

3526
filterItems(itemType) {
3627
let items =
@@ -52,20 +43,16 @@ export default Component.extend({
5243

5344
let sortedItems = sortBy(items, (item) => item.name);
5445
return this.filterMultipleInheritance(sortedItems);
55-
},
46+
}
5647

57-
filteredData: computed(
58-
'filteredMethods',
59-
'filteredProperties',
60-
'filteredEvents',
61-
function () {
62-
return {
63-
methods: this.filteredMethods,
64-
properties: this.filteredProperties,
65-
events: this.filteredEvents,
66-
};
67-
}
68-
),
48+
@computed('filteredMethods', 'filteredProperties', 'filteredEvents')
49+
get filteredData() {
50+
return {
51+
methods: this.filteredMethods,
52+
properties: this.filteredProperties,
53+
events: this.filteredEvents,
54+
};
55+
}
6956

7057
/**
7158
* Returns an array where duplicate methods (by name) are removed.
@@ -94,7 +81,8 @@ export default Component.extend({
9481
}
9582
}
9683
return dedupedArray;
97-
},
84+
}
85+
9886
/**
9987
* Returns whichever item is most local.
10088
* What is "most local" is determined by looking at the file path for the
@@ -114,5 +102,5 @@ export default Component.extend({
114102
// otherwise, the next item must be "more local"
115103
return nextItem;
116104
}
117-
},
118-
});
105+
}
106+
}

app/components/api-index.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import { computed } from '@ember/object';
22
import Component from '@ember/component';
33

4-
export default Component.extend({
5-
sections: computed('itemData.{methods,properties,events}', function () {
4+
export default class ApiIndex extends Component {
5+
@computed('itemData.{methods,properties,events}')
6+
get sections() {
67
return [
78
{
89
title: 'Methods',
@@ -26,5 +27,5 @@ export default Component.extend({
2627
routeSuffix: '.events.event',
2728
},
2829
];
29-
}),
30-
});
30+
}
31+
}
Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
1-
import Component from '@ember/component';
2-
import { inject as service } from '@ember/service';
31
import { computed } from '@ember/object';
2+
import { inject as service } from '@ember/service';
3+
import Component from '@ember/component';
44

5-
export default Component.extend({
6-
legacyModuleMappings: service(),
5+
export default class ClassFieldDescription extends Component {
6+
@service
7+
legacyModuleMappings;
78

8-
hasImportExample: computed('field.{name,class}', function () {
9+
@computed('field.{name,class}')
10+
get hasImportExample() {
911
return this.legacyModuleMappings.hasFunctionMapping(
1012
this.get('field.name'),
1113
this.get('field.class')
1214
);
13-
}),
15+
}
1416

1517
/**
1618
* Callback for updating the anchor with the field name that was clicked by a user.
1719
*
1820
* @method updateAnchor
1921
* @method fieldName String The name representing the field that was clicked.
2022
*/
21-
updateAnchor() {},
22-
});
23+
updateAnchor() {}
24+
}

app/components/ember-anchor.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import AnchorComponent from 'ember-anchor/components/ember-anchor';
33
import config from 'ember-api-docs/config/environment';
44
import getOffset from 'ember-api-docs/utils/get-offset';
55

6-
export default AnchorComponent.extend({
6+
export default class EmberAnchor extends AnchorComponent {
77
// This overrides Ember Anchor to support scrolling within a fixed position element
88
_scrollToElemPosition() {
99
let qp = this.anchorQueryParam;
@@ -25,5 +25,5 @@ export default AnchorComponent.extend({
2525
scrollContainer.scrollTop = offsetToScroll;
2626
}
2727
}
28-
},
29-
});
28+
}
29+
}

app/components/import-example.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
import { action } from '@ember/object';
12
import Component from '@ember/component';
23
import { later } from '@ember/runloop';
34

4-
export default Component.extend({
5-
actions: {
6-
showSuccess() {
7-
this.toggleProperty('showClipboardSuccessIcon');
8-
later(this, () => this.toggleProperty('showClipboardSuccessIcon'), 950);
9-
},
10-
},
11-
});
5+
export default class ImportExample extends Component {
6+
@action
7+
showSuccess() {
8+
this.toggleProperty('showClipboardSuccessIcon');
9+
later(this, () => this.toggleProperty('showClipboardSuccessIcon'), 950);
10+
}
11+
}

app/components/loading-spinner.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import { classNames } from '@ember-decorators/component';
12
import Component from '@ember/component';
23

3-
export default Component.extend({
4-
classNames: ['loading-spinner'],
5-
});
4+
@classNames('loading-spinner')
5+
export default class LoadingSpinner extends Component {}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import { classNames } from '@ember-decorators/component';
12
import Component from '@ember/component';
23

3-
export default Component.extend({
4-
classNames: ['ds-suggestion'],
5-
});
4+
@classNames('ds-suggestion')
5+
export default class DropdownHeader extends Component {}

app/components/search-input/dropdown.js

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
1-
import { set } from '@ember/object';
1+
import {
2+
classNames,
3+
attributeBindings,
4+
tagName,
5+
} from '@ember-decorators/component';
6+
import { set, get, computed } from '@ember/object';
27
import Component from '@ember/component';
3-
import { get, computed } from '@ember/object';
48
import { A } from '@ember/array';
59

6-
export default Component.extend({
10+
@tagName('span')
11+
@classNames('ds-dropdown-menu', 'ds-with-1')
12+
@attributeBindings('role')
13+
export default class Dropdown extends Component {
714
// Public API
8-
role: 'listbox',
9-
isVisible: false,
15+
role = 'listbox';
1016

11-
// Private API
12-
tagName: 'span',
13-
classNames: ['ds-dropdown-menu', 'ds-with-1'],
14-
attributeBindings: ['role'],
17+
isVisible = false;
1518

1619
init() {
17-
this._super(...arguments);
20+
super.init(...arguments);
1821
set(this, 'results', A());
19-
},
22+
}
2023

2124
// show
2225
// Massage data to make it easier for displaying on the template
@@ -28,7 +31,8 @@ export default Component.extend({
2831
* }
2932
* }
3033
*/
31-
_groupedResults: computed('results.[]', function () {
34+
@computed('results.[]')
35+
get _groupedResults() {
3236
if (!get(this, 'results.length')) {
3337
return {};
3438
}
@@ -72,5 +76,5 @@ export default Component.extend({
7276

7377
return lvl0Result;
7478
}, {});
75-
}),
76-
});
79+
}
80+
}

app/components/table-of-contents.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
import { action } from '@ember/object';
12
import Component from '@ember/component';
23

3-
export default Component.extend({
4-
actions: {
5-
toggle(type) {
6-
const tableElement = document.querySelector(`ol.toc-level-1.${type}`);
7-
tableElement.classList.toggle('selected');
8-
},
9-
},
10-
});
4+
export default class TableOfContents extends Component {
5+
@action
6+
toggle(type) {
7+
const tableElement = document.querySelector(`ol.toc-level-1.${type}`);
8+
tableElement.classList.toggle('selected');
9+
}
10+
}

app/controllers/application.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,6 @@ const links = [
169169
},
170170
];
171171

172-
export default Controller.extend({
173-
links,
174-
});
172+
export default class ApplicationController extends Controller {
173+
links = links;
174+
}

app/controllers/class.js

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

3-
export default Controller.extend({
4-
queryParams: ['anchor', 'type'],
5-
});
3+
export default class ClassController extends Controller {
4+
queryParams = ['anchor', 'type'];
5+
}

app/controllers/events.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@ import { inject as service } from '@ember/service';
22
import Controller from '@ember/controller';
33
import AnchorControllerSupport from 'ember-anchor/mixins/controller-support';
44

5-
export default Controller.extend(AnchorControllerSupport, {
6-
filterData: service(),
7-
queryParams: ['anchor'],
8-
});
5+
export default class EventsController extends Controller.extend(
6+
AnchorControllerSupport
7+
) {
8+
@service
9+
filterData;
10+
11+
queryParams = ['anchor'];
12+
}

0 commit comments

Comments
 (0)