From cd0b6300d81c350d893eab557f1729a4c8567d16 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Fri, 23 Jan 2015 12:47:19 +1030 Subject: [PATCH] Clean up load more --- framework/core/ember/app/controllers/index.js | 1 - framework/core/ember/app/templates/index.hbs | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/framework/core/ember/app/controllers/index.js b/framework/core/ember/app/controllers/index.js index dbf0494c5..23c4e618b 100644 --- a/framework/core/ember/app/controllers/index.js +++ b/framework/core/ember/app/controllers/index.js @@ -18,7 +18,6 @@ export default Ember.ArrayController.extend(Ember.Evented, PaneableMixin, { filter: '', searchQuery: '', - loadingMore: false, sortOptions: [ {sort: 'recent', label: 'Recent'}, diff --git a/framework/core/ember/app/templates/index.hbs b/framework/core/ember/app/templates/index.hbs index 878c72e05..1074812f8 100644 --- a/framework/core/ember/app/templates/index.hbs +++ b/framework/core/ember/app/templates/index.hbs @@ -39,11 +39,11 @@ {{/if}} {{#if moreResults}} -
- {{#unless resultsLoading}} + {{#unless resultsLoading}} +
{{ui/controls/action-button class="control-loadMore btn btn-default" action="loadMore" label="Load More"}} - {{/unless}} -
+
+ {{/unless}} {{/if}}