Skip to content

Commit f94a74d

Browse files
authored
Merge pull request #838 from sivakumar-kailasam/remove-ic-ajax
Remove ic-ajax in favor of ember-ajax
2 parents 65fd997 + 5311a74 commit f94a74d

File tree

10 files changed

+55
-29
lines changed

10 files changed

+55
-29
lines changed

app/controllers/dashboard.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import Ember from 'ember';
2-
import ajax from 'ic-ajax';
32

43
const TO_SHOW = 5;
5-
const { computed } = Ember;
4+
const { computed, inject: { service } } = Ember;
65

76
export default Ember.Controller.extend({
7+
8+
ajax: service(),
9+
810
init() {
911
this._super(...arguments);
1012

@@ -37,7 +39,7 @@ export default Ember.Controller.extend({
3739
this.set('loadingMore', true);
3840
let page = (this.get('myFeed').length / 10) + 1;
3941

40-
ajax(`/me/updates?page=${page}`).then((data) => {
42+
this.get('ajax').request(`/me/updates?page=${page}`).then((data) => {
4143
let versions = data.versions.map(version =>
4244
this.store.push(this.store.normalize('version', version)));
4345

app/controllers/me/index.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
import Ember from 'ember';
2-
import ajax from 'ic-ajax';
2+
3+
const { inject: { service } } = Ember;
34

45
export default Ember.Controller.extend({
5-
flashMessages: Ember.inject.service(),
6+
7+
ajax: service(),
8+
9+
flashMessages: service(),
610

711
isResetting: false,
812

913
actions: {
1014
resetToken() {
1115
this.set('isResetting', true);
1216

13-
ajax({
14-
dataType: 'json',
15-
url: '/me/reset_token',
16-
method: 'put',
17-
}).then((d) => {
17+
this.get('ajax').put('/me/reset_token').then((d) => {
1818
this.get('model').set('api_token', d.api_token);
1919
}).catch((reason) => {
2020
let msg;
@@ -25,7 +25,7 @@ export default Ember.Controller.extend({
2525
}
2626
this.get('flashMessages').queue(msg);
2727
// TODO: this should be an action, the route state machine
28-
// should recieve signals not external transitions
28+
// should receive signals not external transitions
2929
this.transitionToRoute('index');
3030
}).finally(() => {
3131
this.set('isResetting', false);

app/routes/application.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
import Ember from 'ember';
2-
import ajax from 'ic-ajax';
2+
3+
const { inject: { service } } = Ember;
34

45
export default Ember.Route.extend({
5-
flashMessages: Ember.inject.service(),
6+
7+
ajax: service(),
8+
9+
flashMessages: service(),
610

711
beforeModel() {
812
if (this.session.get('isLoggedIn') &&
913
this.session.get('currentUser') === null) {
10-
ajax('/me').then((response) => {
14+
this.get('ajax').request('/me').then((response) => {
1115
let user = this.store.push(this.store.normalize('user', response.user));
1216
user.set('api_token', response.api_token);
1317
this.session.set('currentUser', user);

app/routes/crate/version.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
import Ember from 'ember';
2-
import ajax from 'ic-ajax';
2+
3+
const { inject: { service } } = Ember;
34

45
export default Ember.Route.extend({
5-
flashMessages: Ember.inject.service(),
6+
7+
ajax: service(),
8+
9+
flashMessages: service(),
610

711
refreshAfterLogin: Ember.observer('session.isLoggedIn', function() {
812
this.refresh();
@@ -41,7 +45,7 @@ export default Ember.Route.extend({
4145
crate.get('documentation').substr(0, 16) === 'https://docs.rs/') {
4246
let crateName = crate.get('name');
4347
let crateVersion = params.version_num;
44-
ajax(`https://docs.rs/crate/${crateName}/${crateVersion}/builds.json`)
48+
this.get('ajax').request(`https://docs.rs/crate/${crateName}/${crateVersion}/builds.json`)
4549
.then((r) => {
4650
if (r.length > 0 && r[0].build_status === true) {
4751
crate.set('documentation', `https://docs.rs/${crateName}/${crateVersion}/`);
@@ -81,7 +85,7 @@ export default Ember.Route.extend({
8185
controller.set('fetchingFollowing', true);
8286

8387
if (this.session.get('currentUser')) {
84-
ajax(`/api/v1/crates/${crate.get('name')}/following`)
88+
this.get('ajax').request(`/api/v1/crates/${crate.get('name')}/following`)
8589
.then((d) => controller.set('following', d.following))
8690
.finally(() => controller.set('fetchingFollowing', false));
8791
}

app/routes/github-authorize.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import Ember from 'ember';
2-
import ajax from 'ic-ajax';
2+
3+
const { inject: { service } } = Ember;
34

45
/**
56
* This route will be called from the GitHub OAuth flow once the user has
@@ -15,8 +16,11 @@ import ajax from 'ic-ajax';
1516
* @see `/login` route
1617
*/
1718
export default Ember.Route.extend({
19+
20+
ajax: service(),
21+
1822
beforeModel(transition) {
19-
return ajax('/authorize', { data: transition.queryParams }).then((d) => {
23+
return this.get('ajax').request(`/authorize`, { data: transition.queryParams }).then((d) => {
2024
let item = JSON.stringify({ ok: true, data: d });
2125
if (window.opener) {
2226
window.opener.github_response = item;

app/routes/github-login.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import Ember from 'ember';
2-
import ajax from 'ic-ajax';
2+
3+
const { inject: { service } } = Ember;
34

45
/**
56
* Calling this route will query the `/authorize_url` API endpoint
@@ -15,8 +16,11 @@ import ajax from 'ic-ajax';
1516
* @see `/github_authorize` route
1617
*/
1718
export default Ember.Route.extend({
19+
20+
ajax: service(),
21+
1822
beforeModel() {
19-
return ajax('/authorize_url').then((url) => {
23+
return this.get('ajax').request(`/authorize_url`).then((url) => {
2024
window.location = url.url;
2125
});
2226
},

app/routes/index.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
import Ember from 'ember';
2-
import ajax from 'ic-ajax';
2+
3+
const { inject: { service } } = Ember;
34

45
export default Ember.Route.extend({
6+
7+
ajax: service(),
8+
59
headTags: [{
610
type: 'meta',
711
attrs: {
@@ -17,7 +21,7 @@ export default Ember.Route.extend({
1721
}
1822
}
1923

20-
return ajax('/summary').then((data) => {
24+
return this.get('ajax').request('/summary').then((data) => {
2125
addCrates(this.store, data.new_crates);
2226
addCrates(this.store, data.most_downloaded);
2327
addCrates(this.store, data.just_updated);

app/routes/keyword.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import Ember from 'ember';
33
export default Ember.Route.extend({
44
flashMessages: Ember.inject.service(),
55

6-
model(params) {
7-
return this.store.find('keyword', params.keyword_id).catch(e => {
6+
model({ keyword_id }) {
7+
return this.store.find('keyword', keyword_id).catch(e => {
88
if (e.errors.any(e => e.detail === 'Not Found')) {
9-
this.get('flashMessages').show(`Keyword '${params.keyword_id}' does not exist`);
9+
this.get('flashMessages').show(`Keyword '${keyword_id}' does not exist`);
1010
}
1111
});
1212
}

app/routes/logout.js

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

3+
const { inject: { service } } = Ember;
4+
35
export default Ember.Route.extend({
6+
7+
ajax: service(),
8+
49
activate() {
5-
Ember.$.getJSON('/logout', () => {
10+
this.get('ajax').request(`/logout`).then(() => {
611
Ember.run(() => {
712
this.session.logoutUser();
813
this.transitionTo('index');

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
"ember-cli-eslint": "^4.0.0",
3737
"ember-cli-htmlbars": "^2.0.2",
3838
"ember-cli-htmlbars-inline-precompile": "^0.4.3",
39-
"ember-cli-ic-ajax": "1.0.0",
4039
"ember-cli-inject-live-reload": "1.6.1",
4140
"ember-cli-meta-tags": "^4.0.0",
4241
"ember-cli-mirage": "^0.3.3",

0 commit comments

Comments
 (0)