Skip to content

Commit 829e519

Browse files
committed
dashboard: Replace loadingMore property with derived task state
1 parent 51b39c0 commit 829e519

File tree

3 files changed

+6
-12
lines changed

3 files changed

+6
-12
lines changed

app/controllers/dashboard.js

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ export default Controller.extend({
1313
init() {
1414
this._super(...arguments);
1515

16-
this.loadingMore = false;
1716
this.hasMore = false;
1817
this.myFeed = A();
1918
},
@@ -39,17 +38,12 @@ export default Controller.extend({
3938
}),
4039

4140
loadMoreTask: task(function* () {
42-
this.set('loadingMore', true);
4341
let page = this.myFeed.length / 10 + 1;
4442

45-
try {
46-
let data = yield ajax(`/api/v1/me/updates?page=${page}`);
47-
let versions = data.versions.map(version => this.store.push(this.store.normalize('version', version)));
43+
let data = yield ajax(`/api/v1/me/updates?page=${page}`);
44+
let versions = data.versions.map(version => this.store.push(this.store.normalize('version', version)));
4845

49-
this.myFeed.pushObjects(versions);
50-
this.set('hasMore', data.meta.more);
51-
} finally {
52-
this.set('loadingMore', false);
53-
}
46+
this.myFeed.pushObjects(versions);
47+
this.set('hasMore', data.meta.more);
5448
}),
5549
});

app/routes/dashboard.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export default Route.extend(AuthenticatedRoute, {
88
setupController(controller) {
99
this._super(...arguments);
1010

11-
if (!controller.loadingMore) {
11+
if (!controller.isRunning) {
1212
controller.set('myFeed', A());
1313
controller.loadMoreTask.perform();
1414
}

app/templates/dashboard.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
{{/each}}
6161
</ul>
6262

63-
{{#if this.loadingMore}}
63+
{{#if this.loadMoreTask.isRunning}}
6464
<span local-class='load-more'>
6565
<img src="/assets/ajax-loader.gif">
6666
</span>

0 commit comments

Comments
 (0)