Skip to content

Commit 29e9fe2

Browse files
Turbo87Turbo87
committed
Use "New Module Imports"
see Ember.js RFC #176
1 parent bf3d3c9 commit 29e9fe2

Some content is hidden

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

80 files changed

+353
-289
lines changed

‎app/adapters/category-slug.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
import ApplicationAdapter from './application';
21
import Ember from 'ember';
2+
import { underscore, decamelize } from '@ember/string';
3+
4+
import ApplicationAdapter from './application';
35

46
export default ApplicationAdapter.extend({
57
pathForType(modelName) {
6-
let decamelized = Ember.String.underscore(
7-
Ember.String.decamelize(modelName)
8+
let decamelized = underscore(
9+
decamelize(modelName)
810
);
911
return Ember.String.pluralize(decamelized);
1012
}

‎app/app.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
import Ember from 'ember';
2-
import Resolver from './resolver';
1+
import Application from '@ember/application';
32
import loadInitializers from 'ember-load-initializers';
3+
4+
import Resolver from './resolver';
45
import config from './config/environment';
56

6-
let App = Ember.Application.extend({
7+
let App = Application.extend({
78
modulePrefix: config.modulePrefix,
89
podModulePrefix: config.podModulePrefix,
910
Resolver

‎app/components/api-token-row.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import Ember from 'ember';
1+
import Component from '@ember/component';
2+
import { empty, or } from '@ember/object/computed';
23

3-
export default Ember.Component.extend({
4-
emptyName: Ember.computed.empty('api_token.name'),
5-
disableCreate: Ember.computed.or('api_token.isSaving', 'emptyName'),
4+
export default Component.extend({
5+
emptyName: empty('api_token.name'),
6+
disableCreate: or('api_token.isSaving', 'emptyName'),
67
serverError: null,
78

89
didInsertElement() {

‎app/components/badge-appveyor.js

+12-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
1-
import Ember from 'ember';
1+
import Component from '@ember/component';
2+
import { computed } from '@ember/object';
3+
import { alias } from '@ember/object/computed';
24

3-
export default Ember.Component.extend({
5+
export default Component.extend({
46
tagName: 'span',
57
classNames: ['badge'],
6-
repository: Ember.computed.alias('badge.attributes.repository'),
7-
branch: Ember.computed('badge.attributes.branch', function() {
8+
9+
repository: alias('badge.attributes.repository'),
10+
11+
branch: computed('badge.attributes.branch', function() {
812
return this.get('badge.attributes.branch') || 'master';
913
}),
10-
service: Ember.computed('badge.attributes.service', function() {
14+
15+
service: computed('badge.attributes.service', function() {
1116
return this.get('badge.attributes.service') || 'github';
1217
}),
13-
text: Ember.computed('badge', function() {
18+
19+
text: computed('badge', function() {
1420
return `Appveyor build status for the ${ this.get('branch') } branch`;
1521
})
1622
});

‎app/components/badge-codecov.js

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1-
import Ember from 'ember';
1+
import Component from '@ember/component';
2+
import { computed } from '@ember/object';
3+
import { alias } from '@ember/object/computed';
24

3-
export default Ember.Component.extend({
5+
export default Component.extend({
46
tagName: 'span',
57
classNames: ['badge'],
6-
repository: Ember.computed.alias('badge.attributes.repository'),
7-
branch: Ember.computed('badge.attributes.branch', function() {
8+
repository: alias('badge.attributes.repository'),
9+
branch: computed('badge.attributes.branch', function() {
810
return this.get('badge.attributes.branch') || 'master';
911
}),
10-
service: Ember.computed('badge.attributes.service', function() {
12+
service: computed('badge.attributes.service', function() {
1113
return this.get('badge.attributes.service') || 'github';
1214
}),
13-
text: Ember.computed('branch', function() {
15+
text: computed('branch', function() {
1416
return `CodeCov coverage status for the ${ this.get('branch') } branch`;
1517
})
1618
});

‎app/components/badge-coveralls.js

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1-
import Ember from 'ember';
1+
import Component from '@ember/component';
2+
import { computed } from '@ember/object';
3+
import { alias } from '@ember/object/computed';
24

3-
export default Ember.Component.extend({
5+
export default Component.extend({
46
tagName: 'span',
57
classNames: ['badge'],
6-
repository: Ember.computed.alias('badge.attributes.repository'),
7-
branch: Ember.computed('badge.attributes.branch', function() {
8+
repository: alias('badge.attributes.repository'),
9+
branch: computed('badge.attributes.branch', function() {
810
return this.get('badge.attributes.branch') || 'master';
911
}),
10-
service: Ember.computed('badge.attributes.service', function() {
12+
service: computed('badge.attributes.service', function() {
1113
return this.get('badge.attributes.service') || 'github';
1214
}),
13-
text: Ember.computed('branch', function() {
15+
text: computed('branch', function() {
1416
return `Coveralls coverage status for the ${ this.get('branch') } branch`;
1517
})
1618
});

‎app/components/badge-gitlab.js

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
import Ember from 'ember';
1+
import Component from '@ember/component';
2+
import { computed } from '@ember/object';
3+
import { alias } from '@ember/object/computed';
24

3-
export default Ember.Component.extend({
5+
export default Component.extend({
46
tagName: 'span',
57
classNames: ['badge'],
6-
repository: Ember.computed.alias('badge.attributes.repository'),
7-
branch: Ember.computed('badge.attributes.branch', function() {
8+
repository: alias('badge.attributes.repository'),
9+
branch: computed('badge.attributes.branch', function() {
810
return this.get('badge.attributes.branch') || 'master';
911
}),
10-
text: Ember.computed('badge', function() {
12+
text: computed('badge', function() {
1113
return `GitLab build status for the ${ this.get('branch') } branch`;
1214
})
1315
});

‎app/components/badge-is-it-maintained-issue-resolution.js

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
import Ember from 'ember';
1+
import Component from '@ember/component';
2+
import { computed } from '@ember/object';
3+
import { alias } from '@ember/object/computed';
24

3-
export default Ember.Component.extend({
5+
export default Component.extend({
46
tagName: 'span',
57
classNames: ['badge'],
6-
repository: Ember.computed.alias('badge.attributes.repository'),
7-
text: Ember.computed('badge', function() {
8+
repository: alias('badge.attributes.repository'),
9+
text: computed('badge', function() {
810
return `Is It Maintained average time to resolve an issue`;
911
})
10-
});
12+
});

‎app/components/badge-is-it-maintained-open-issues.js

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
import Ember from 'ember';
1+
import Component from '@ember/component';
2+
import { computed } from '@ember/object';
3+
import { alias } from '@ember/object/computed';
24

3-
export default Ember.Component.extend({
5+
export default Component.extend({
46
tagName: 'span',
57
classNames: ['badge'],
6-
repository: Ember.computed.alias('badge.attributes.repository'),
7-
text: Ember.computed('badge', function() {
8+
repository: alias('badge.attributes.repository'),
9+
text: computed('badge', function() {
810
return `Is It Maintained percentage of issues still open`;
911
})
1012
});

‎app/components/badge-travis-ci.js

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
import Ember from 'ember';
1+
import Component from '@ember/component';
2+
import { computed } from '@ember/object';
3+
import { alias } from '@ember/object/computed';
24

3-
export default Ember.Component.extend({
5+
export default Component.extend({
46
tagName: 'span',
57
classNames: ['badge'],
6-
repository: Ember.computed.alias('badge.attributes.repository'),
7-
branch: Ember.computed('badge.attributes.branch', function() {
8+
repository: alias('badge.attributes.repository'),
9+
branch: computed('badge.attributes.branch', function() {
810
return this.get('badge.attributes.branch') || 'master';
911
}),
10-
text: Ember.computed('branch', function() {
12+
text: computed('branch', function() {
1113
return `Travis CI build status for the ${ this.get('branch') } branch`;
1214
})
1315
});

‎app/components/crate-row.js

+2-2
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: ['crate', 'row']
55
});

‎app/components/download-graph.js

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import Ember from 'ember';
1+
import Component from '@ember/component';
2+
import $ from 'jquery';
23

34
// Colors by http://colorbrewer2.org/#type=diverging&scheme=RdBu&n=10
45
const COLORS = [
@@ -12,19 +13,19 @@ const COLORS = [
1213
'#053061'
1314
];
1415

15-
export default Ember.Component.extend({
16+
export default Component.extend({
1617
classNames: 'graph-data',
1718

1819
didInsertElement() {
1920
this._super(...arguments);
2021

21-
Ember.$(window).on('resize.chart', () => this.rerender());
22-
Ember.$(document).on('googleChartsLoaded', () => this.rerender());
22+
$(window).on('resize.chart', () => this.rerender());
23+
$(document).on('googleChartsLoaded', () => this.rerender());
2324
},
2425

2526
willDestroyElement() {
26-
Ember.$(window).off('resize.chart');
27-
Ember.$(document).off('googleChartsLoaded');
27+
$(window).off('resize.chart');
28+
$(document).off('googleChartsLoaded');
2829
},
2930

3031
didRender() {

‎app/components/flash-message.js

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
import Ember from 'ember';
1+
import Component from '@ember/component';
2+
import { readOnly } from '@ember/object/computed';
3+
import { inject as service } from '@ember/service';
24

3-
export default Ember.Component.extend({
4-
flashMessages: Ember.inject.service(),
5-
message: Ember.computed.readOnly('flashMessages.message'),
5+
export default Component.extend({
6+
flashMessages: service(),
7+
message: readOnly('flashMessages.message'),
68

79
elementId: 'flash',
810
tagName: 'p',

‎app/components/google-jsapi.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
import Ember from 'ember';
1+
import Component from '@ember/component';
2+
import $ from 'jquery';
23

3-
export default Ember.Component.extend({
4+
export default Component.extend({
45
tagName: '',
56

67
didInsertElement() {
7-
Ember.$.getScript('https://www.google.com/jsapi', function() {
8+
$.getScript('https://www.google.com/jsapi', function() {
89
window.google.load('visualization', '1.0', {
910
packages: ['corechart'],
1011
callback() {
1112
window.googleChartsLoaded = true;
12-
Ember.$(document).trigger('googleChartsLoaded');
13+
$(document).trigger('googleChartsLoaded');
1314
}
1415
});
1516
});

‎app/components/rl-dropdown-container.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import Ember from 'ember';
1+
import Component from '@ember/component';
2+
23
import DropdownComponentMixin from '../mixins/rl-dropdown-component';
34

4-
export default Ember.Component.extend(DropdownComponentMixin, {
5+
export default Component.extend(DropdownComponentMixin, {
56
classNameBindings: ['dropdownExpanded']
67
});

‎app/components/rl-dropdown-toggle.js

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
1-
import Ember from 'ember';
1+
import Component from '@ember/component';
2+
import { computed } from '@ember/object';
3+
24
import RlDropdownContainer from './rl-dropdown-container';
35

4-
export default Ember.Component.extend({
6+
export default Component.extend({
57
classNames: ['rl-dropdown-toggle'],
68

79
tagName: 'button',
810

911
attributeBindings: ['type', 'role', 'disabled'],
1012

11-
type: Ember.computed('tagName', function() {
13+
type: computed('tagName', function() {
1214
return this.get('tagName') === 'button' ? 'button' : null;
1315
}),
1416

15-
role: Ember.computed('tagName', function() {
17+
role: computed('tagName', function() {
1618
return this.get('tagName') === 'a' ? 'button' : null;
1719
}),
1820

19-
dropdownContainer: Ember.computed(function() {
21+
dropdownContainer: computed(function() {
2022
return this.nearestOfType(RlDropdownContainer);
2123
}),
2224

‎app/components/rl-dropdown.js

+11-6
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
1-
import Ember from 'ember';
1+
import Component from '@ember/component';
2+
import { on } from '@ember/object/evented';
3+
import { alias } from '@ember/object/computed';
4+
import { computed, observer } from '@ember/object';
5+
import $ from 'jquery';
6+
27
import RlDropdownContainer from './rl-dropdown-container';
38

4-
export default Ember.Component.extend({
9+
export default Component.extend({
510
classNames: ['rl-dropdown'],
611

7-
dropdownContainer: Ember.computed(function() {
12+
dropdownContainer: computed(function() {
813
return this.nearestOfType(RlDropdownContainer);
914
}),
1015

11-
isExpanded: Ember.computed.alias('dropdownContainer.dropdownExpanded'),
16+
isExpanded: alias('dropdownContainer.dropdownExpanded'),
1217

1318
closeOnChildClick: false,
1419

1520
propagateClicks: true,
1621

17-
manageVisibility: Ember.on('didInsertElement', Ember.observer('isExpanded', function() {
22+
manageVisibility: on('didInsertElement', observer('isExpanded', function() {
1823
if (this.get('isExpanded')) {
1924
this.$().css('display', 'block');
2025
} else {
@@ -25,7 +30,7 @@ export default Ember.Component.extend({
2530
click(event) {
2631
let closeOnChildClick = this.get('closeOnChildClick');
2732
let propagateClicks = this.get('propagateClicks');
28-
let $target = Ember.$(event.target);
33+
let $target = $(event.target);
2934
let $c = this.$();
3035

3136
if ($target !== $c) {

‎app/components/user-avatar.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import Ember from 'ember';
1+
import Component from '@ember/component';
2+
import { computed } from '@ember/object';
23

3-
const { computed } = Ember;
4-
5-
export default Ember.Component.extend({
4+
export default Component.extend({
65
size: 'small',
76
user: null,
87
attributeBindings: ['src', 'width', 'height'],

‎app/components/user-link.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import Ember from 'ember';
1+
import Component from '@ember/component';
2+
import { computed } from '@ember/object';
23

3-
const { computed } = Ember;
4-
5-
export default Ember.Component.extend({
4+
export default Component.extend({
65
user: null,
76
attributeBindings: ['title', 'href'],
87
tagName: 'a',

0 commit comments

Comments
 (0)