Skip to content

Commit eb03601

Browse files
committed
Fix Build Error; Prepare Travis CI
1 parent 37d2238 commit eb03601

File tree

23 files changed

+346
-371
lines changed

23 files changed

+346
-371
lines changed

app/adapters/application.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import ActiveModelAdapter from 'active-model-adapter';
33
export default ActiveModelAdapter.extend({
44
host: 'https://api.github.com',
55
queryUrl: 'https://api.github.com/search',
6-
buildURL(modelName, id, snapshot, requestType, query) {
6+
buildURL(modelName, id, snapshot, requestType) {
77
if(requestType === 'query') {
88
this.host = this.queryUrl
99
}

app/adapters/issue.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import Ember from 'ember';
12
import ApplicationAdapter from './application';
23

34
export default ApplicationAdapter.extend({
@@ -18,7 +19,4 @@ export default ApplicationAdapter.extend({
1819
Ember.assign({}, this.defaults, query)
1920
);
2021
},
21-
urlForFindBelongsTo() {
22-
debugger
23-
}
2422
});

app/components/search-card.js

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@ export default Ember.Component.extend({
66
this.get('onSearch')(query);
77
}
88
},
9-
10-
owner: Ember.computed(function() {
11-
return Ember.getOwner(this)
12-
}),
13-
14-
searchParams: Ember.computed('params.q', function() {
15-
return this.get('owner').lookup('router:main').router.state.queryParams['q'];
16-
})
9+
didRender() {
10+
this._super(...arguments)
11+
}
1712
});

app/controllers/application.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ export default Ember.Controller.extend({
44
toggleSidenav: true,
55
actions: {
66
searchIssues(query) {
7-
this.transitionToRoute('issues', { queryParams: { q: query} });
7+
this.transitionToRoute('issues', { queryParams: { q: query } });
88
},
99
toggleSidenav() {
10-
console.log("editing sidenav");
1110
return this.set('toggleSidenav', !this.get('toggleSidenav'));
1211
},
1312
searchByOrg(org) {

app/controllers/issues.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.Controller.extend({
44
actions: {
5-
groupByRepo(val) {
5+
groupByRepo() {
66
this.groupModelByRepo();
77
this.set('groupByRepoVal', !this.get('groupByRepoVal'));
88
}

app/initializers/showdown.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* global showdown */
12
export function initialize() {
23
showdown.setFlavor('github');
34
showdown.extension("issueWrap", function() {

app/models/issue.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ import Ember from 'ember';
44
export default DS.Model.extend({
55
url: DS.attr(),
66
repository_url: DS.attr(),
7-
repository: DS.belongsTo('repository'),
87
repository_id: Ember.computed('repository_url', function() {
98
const repoAry = this.get('repository_url').split('/');
10-
return repoAry[a.length - 1] + '/' + repoAry[a.length - 2];
9+
return repoAry[repoAry.length - 1] + '/' + repoAry[repoAry.length - 2];
1110
}),
1211
labels_url: DS.attr(),
1312
comments_url: DS.attr(),

app/routes/application.js

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

33
export default Ember.Route.extend({
4+
queryParams: {
5+
q: {
6+
refreshModel: true
7+
}
8+
},
49
actions: {
510
searchIssues(query) {
611
this.transitionTo('issues', { queryParams: { q: query} });
712
}
813
},
9-
14+
model(params) {
15+
return params;
16+
},
1017
setupController(controller, model) {
1118
controller.set('organizations', [{
1219
name: 'Discourse',
@@ -37,8 +44,9 @@ export default Ember.Route.extend({
3744
query: { q: 'is:open is:issue user:movingblocks' },
3845
}, {
3946
name: 'AboutCode',
40-
query: { q: 'is:open is:issue user:nexB' },
47+
query: { q: 'is:open is:issue user:nexB' },
4148
}]);
49+
controller.set('searchParams', model.q)
4250
this._super(controller, model);
4351
}
4452

app/routes/issues.js

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

33
export default Ember.Route.extend({
4-
queryParams: {
5-
q: {
6-
refreshModel: true
7-
}
8-
},
94
model(params) {
105
return this.issueOnly(this.store.query('issue', params, { include: 'repository' }));
116
},

app/routes/issues/issue.js

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

0 commit comments

Comments
 (0)