Skip to content

Commit 7943dba

Browse files
lockslocks
authored
Merge pull request #308 from ember-learn/modules-refactor
Modules refactor
2 parents e12dfad + 1d655ab commit 7943dba

File tree

75 files changed

+264
-266
lines changed

Some content is hidden

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

75 files changed

+264
-266
lines changed

‎app/adapters/application.js

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1+
import { inject as service } from '@ember/service';
12
import DS from 'ember-data';
2-
import Ember from 'ember';
33
import fetch from 'fetch';
44
import ENV from 'ember-api-docs/config/environment';
5-
6-
const {
7-
Inflector: { inflector },
8-
inject: { service }
9-
} = Ember;
5+
import { pluralize } from 'ember-inflector';
106

117
const { JSONAPIAdapter } = DS;
128

@@ -29,11 +25,11 @@ export default JSONAPIAdapter.extend({
2925
if (['namespace', 'class', 'module'].includes(modelName)) {
3026
let [version] = id.replace(`${projectName}-`, '').split('-');
3127
let revId = this.get('metaStore').getRevId(projectName, version, modelName, id);
32-
url = `json-docs/${projectName}/${version}/${inflector.pluralize(modelName)}/${revId}`;
28+
url = `json-docs/${projectName}/${version}/${pluralize(modelName)}/${revId}`;
3329
} else if (modelName === 'missing') {
3430
let version = this.get('projectService.version');
3531
let revId = this.get('metaStore').getRevId(projectName, version, modelName, id);
36-
url = `json-docs/${projectName}/${version}/${inflector.pluralize(modelName)}/${revId}`;
32+
url = `json-docs/${projectName}/${version}/${pluralize(modelName)}/${revId}`;
3733
} else if (modelName === 'project') {
3834
this.set('currentProject', id);
3935
url = `rev-index/${id}`;

‎app/app.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import Ember from 'ember';
1+
import Application from '@ember/application';
22
import Resolver from './resolver';
33
import loadInitializers from 'ember-load-initializers';
44
import config from './config/environment';
55

6-
const App = Ember.Application.extend({
6+
const App = Application.extend({
77
modulePrefix: config.modulePrefix,
88
podModulePrefix: config.podModulePrefix,
99
Resolver

‎app/components/api-index-filter.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import Ember from 'ember';
1+
import { computed } from '@ember/object';
2+
import Component from '@ember/component';
23
import uniq from 'npm:lodash.uniq';
34
import sortBy from 'npm:lodash.sortby';
45

5-
const { computed, Component } = Ember;
66

77
export default Component.extend({
88
classNames: ['api-index-filter'],

‎app/components/api-index.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import Ember from 'ember';
1+
import { computed } from '@ember/object';
2+
import Component from '@ember/component';
23

3-
export default Ember.Component.extend({
4+
export default Component.extend({
45

5-
sections: Ember.computed('itemData.methods', 'itemData.properties', 'itemData.events', function () {
6+
sections: computed('itemData.methods', 'itemData.properties', 'itemData.events', function () {
67
return [
78
{
89
title: 'Methods',

‎app/components/class-field-description.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
import Ember from 'ember';
2-
3-
const { Component } = Ember;
1+
import Component from '@ember/component';
42

53
export default Component.extend({
64

‎app/components/ember-anchor.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1+
import $ from 'jquery';
2+
import { get } from '@ember/object';
13
import AnchorComponent from 'ember-anchor/components/ember-anchor';
2-
import Ember from 'ember';
34
import config from 'ember-api-docs/config/environment';
45

5-
const { $, get } = Ember;
6-
76
export default AnchorComponent.extend({
87

98
// This overrides Ember Anchor to support scrolling within a fixed position element

‎app/components/loading-spinner.js

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

3-
export default Ember.Component.extend({
3+
export default Component.extend({
44
classNames: ['loading-spinner']
55
});

‎app/components/main-footer.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
import Ember from 'ember';
1+
import { computed } from '@ember/object';
2+
import Component from '@ember/component';
23

3-
export default Ember.Component.extend({
4+
export default Component.extend({
45

56
tagName: '',
67

7-
currentYear: Ember.computed(function() {
8+
currentYear: computed(function() {
89
return new Date().getUTCFullYear();
910
})
1011

‎app/components/search-input.js

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,26 @@
1-
import Ember from 'ember';
1+
import { later } from '@ember/runloop';
2+
import { denodeify } from 'rsvp';
3+
import { A } from '@ember/array';
4+
import { alias } from '@ember/object/computed';
5+
import { inject as service } from '@ember/service';
6+
import Component from '@ember/component';
27
import get from 'ember-metal/get';
38
import set from 'ember-metal/set';
4-
import {task, timeout} from 'ember-concurrency';
9+
import { task, timeout } from 'ember-concurrency';
510

611
const SEARCH_DEBOUNCE_PERIOD = 300;
712

8-
export default Ember.Component.extend({
13+
export default Component.extend({
914
// Public API
1015
value: '',
1116

12-
_searchClient: Ember.inject.service('algolia'),
17+
_searchClient: service('algolia'),
1318

1419
// Private API
1520
classNames: ['search-input'],
16-
_projectService: Ember.inject.service('project'),
17-
_projectVersion: Ember.computed.alias('_projectService.standardisedVersion'),
18-
_results: Ember.A(),
21+
_projectService: service('project'),
22+
_projectVersion: alias('_projectService.standardisedVersion'),
23+
_results: A(),
1924
_focused: false,
2025
_resultTetherConstraints: [
2126
{
@@ -47,7 +52,7 @@ export default Ember.Component.extend({
4752
query
4853
};
4954

50-
let searchFn = Ember.RSVP.denodeify(client.search.bind(client));
55+
let searchFn = denodeify(client.search.bind(client));
5156
let res = yield searchFn(searchObj, params);
5257

5358
const results = get(res, 'hits');
@@ -63,7 +68,7 @@ export default Ember.Component.extend({
6368
},
6469

6570
onblur() {
66-
Ember.run.later(this, function () {
71+
later(this, function () {
6772
set(this, '_focused', false);
6873
}, 200);
6974
}

‎app/components/search-input/dropdown-header.js

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

3-
export default Ember.Component.extend({
3+
export default Component.extend({
44
classNames: ['ds-suggestion']
55
});

‎app/components/search-input/dropdown-result.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
import Ember from 'ember';
1+
import { gt } from '@ember/object/computed';
2+
import { computed } from '@ember/object';
3+
import Component from '@ember/component';
24

3-
export default Ember.Component.extend({
5+
export default Component.extend({
46
// Public API
57
result: {},
68
role: 'option',
@@ -12,9 +14,9 @@ export default Ember.Component.extend({
1214
attributeBindings: ['role'],
1315

1416
// Left sidebar should only be displayed for the first result in the group
15-
_primaryColumn: Ember.computed('groupPosition,groupName', function () {
17+
_primaryColumn: computed('groupPosition,groupName', function () {
1618
const { groupName, groupPosition } = this.getProperties('groupName', 'groupPosition');
1719
return groupPosition === 0? groupName : '';
1820
}),
19-
isSecondary: Ember.computed.gt('groupPosition', 0)
21+
isSecondary: gt('groupPosition', 0)
2022
});

‎app/components/search-input/dropdown.js

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import Ember from 'ember';
1+
import { capitalize } from '@ember/string';
2+
import Component from '@ember/component';
3+
import { get, computed } from '@ember/object';
4+
import { A } from '@ember/array';
25

3-
const { get, A } = Ember;
4-
5-
export default Ember.Component.extend({
6+
export default Component.extend({
67
// Public API
78
role: 'listbox',
89
results: A(),
@@ -23,17 +24,17 @@ export default Ember.Component.extend({
2324
* }
2425
* }
2526
*/
26-
_groupedResults: Ember.computed('results.[]', function () {
27+
_groupedResults: computed('results.[]', function () {
2728
if (!get(this, 'results.length')) {
2829
return {};
2930
}
3031

3132
const lvl0Group = get(this, 'results').reduce((previous, current) => {
3233
// Remap all lowercase usages of 'guides' to 'Guides'
33-
let lvl0 = Ember.String.capitalize(get(current, 'hierarchy.lvl0'));
34+
let lvl0 = capitalize(get(current, 'hierarchy.lvl0'));
3435
// If lvl0 doesn't exist in the resulting object, create the array
3536
if (!previous[lvl0]) {
36-
previous[lvl0] = Ember.A();
37+
previous[lvl0] = A();
3738
}
3839
// Insert the current item into the resulting object.
3940
previous[lvl0].addObject(current);
@@ -55,7 +56,7 @@ export default Ember.Component.extend({
5556
const lvl1Key = lvl1Value? lvl1Value : lvl0Key;
5657

5758
if (!lvl1Result[lvl1Key]) {
58-
lvl1Result[lvl1Key] = Ember.A();
59+
lvl1Result[lvl1Key] = A();
5960
}
6061

6162
lvl1Result[lvl1Key].addObject(lvl1Item);

‎app/components/table-of-contents.js

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

3-
export default Ember.Component.extend({
3+
export default Component.extend({
44
actions: {
55
toggle(type) {
66
this.$('ol.toc-level-1.' + type).slideToggle(200);

‎app/controllers/events.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import Ember from "ember";
1+
import { inject as service } from '@ember/service';
2+
import Controller from '@ember/controller';
23
import AnchorControllerSupport from "ember-anchor/mixins/controller-support";
34

4-
export default Ember.Controller.extend(AnchorControllerSupport, {
5-
filterData: Ember.inject.service(),
5+
export default Controller.extend(AnchorControllerSupport, {
6+
filterData: service(),
67
queryParams: ['anchor']
78
});

‎app/controllers/methods.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import Ember from "ember";
1+
import { inject as service } from '@ember/service';
2+
import Controller from '@ember/controller';
23
import AnchorControllerSupport from "ember-anchor/mixins/controller-support";
34

4-
export default Ember.Controller.extend(AnchorControllerSupport, {
5-
filterData: Ember.inject.service(),
5+
export default Controller.extend(AnchorControllerSupport, {
6+
filterData: service(),
67
queryParams: ['anchor']
78
});

‎app/controllers/project-version.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
import Ember from 'ember';
1+
import Controller from '@ember/controller';
2+
import { computed } from '@ember/object';
3+
import { A } from '@ember/array';
4+
import { inject as service } from '@ember/service';
25
import values from 'npm:lodash.values';
36
import groupBy from 'npm:lodash.groupby';
47
import semverCompare from 'npm:semver-compare';
58
import FilterParams from '../mixins/filter-params';
69

7-
const { Controller, computed, A, inject: {service} } = Ember;
8-
910
export default Controller.extend(FilterParams, {
1011

1112
filterData: service(),

‎app/controllers/project-version/classes/class.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
import Ember from 'ember';
1+
import { inject as service } from '@ember/service';
2+
import Controller from '@ember/controller';
23
import ParentNameMixin from 'ember-api-docs/mixins/parent-name';
34

4-
const { Controller } = Ember;
5-
65
export default Controller.extend(ParentNameMixin, {
7-
filterData: Ember.inject.service(),
6+
filterData: service(),
87

98
actions: {
109
updateFilter(filter) {

‎app/controllers/project-version/classes/class/index.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import Ember from 'ember';
1+
import { inject as service } from '@ember/service';
2+
import Controller from '@ember/controller';
23
import ParentNameMixin from 'ember-api-docs/mixins/parent-name';
34

4-
const { Controller } = Ember;
5-
65
export default Controller.extend(ParentNameMixin, {
7-
filterData: Ember.inject.service()
6+
filterData: service()
87
});

‎app/controllers/project-version/modules/module.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
import Ember from 'ember';
1+
import { computed } from '@ember/object';
2+
import { inject as service } from '@ember/service';
23
import ClassController from '../classes/class';
34
import uniq from 'npm:lodash.uniq';
45
import union from 'npm:lodash.union';
56

6-
const { computed, inject } = Ember;
7-
87
export default ClassController.extend({
9-
filterData: inject.service(),
8+
filterData: service(),
109
showPrivateClasses: computed.alias('filterData.sideNav.showPrivate'),
1110

1211
submodules: computed('model', function() {

‎app/controllers/properties.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import Ember from "ember";
1+
import { inject as service } from '@ember/service';
2+
import Controller from '@ember/controller';
23
import AnchorControllerSupport from "ember-anchor/mixins/controller-support";
34

4-
export default Ember.Controller.extend(AnchorControllerSupport, {
5-
filterData: Ember.inject.service(),
5+
export default Controller.extend(AnchorControllerSupport, {
6+
filterData: service(),
67
queryParams: ['anchor']
78
});

‎app/helpers/eq.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import Ember from 'ember';
1+
import { helper } from '@ember/component/helper';
22

33
export function eq(params) {
44
return params[0] === params[1];
55
}
66

7-
export default Ember.Helper.helper(eq);
7+
export default helper(eq);

‎app/helpers/github-link.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import Ember from 'ember';
1+
import { helper } from '@ember/component/helper';
22
import githubMap from '../utils/github-map';
33

44
export function githubLink([project, version, file, line]) {
55
return `https://github.com/${githubMap[project]}/tree/v${version}/${file}#L${line}`;
66
}
77

8-
export default Ember.Helper.helper(githubLink);
8+
export default helper(githubLink);

‎app/helpers/html-safe.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import Ember from 'ember';
1+
import { helper } from '@ember/component/helper';
2+
import { htmlSafe as emberHtmlSafe } from '@ember/string';
23

34
export function htmlSafe([content]) {
4-
return Ember.String.htmlSafe(content);
5+
return emberHtmlSafe(content);
56
}
67

7-
export default Ember.Helper.helper(htmlSafe);
8+
export default helper(htmlSafe);

0 commit comments

Comments
 (0)