From 8c35e42b2bbbcfcc1e839d2fcdbbb1bdb743dce2 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 6 Aug 2015 12:03:51 +0200 Subject: [PATCH] Fix show more button by changing it into component --- app/{views => components}/show-more-button.coffee | 10 ++++------ app/controllers/builds.coffee | 4 ++++ app/templates/builds.hbs | 2 +- app/templates/components/show-more-button.hbs | 1 + app/templates/show-more-button.hbs | 1 - 5 files changed, 10 insertions(+), 8 deletions(-) rename app/{views => components}/show-more-button.coffee (65%) create mode 100644 app/templates/components/show-more-button.hbs delete mode 100644 app/templates/show-more-button.hbs diff --git a/app/views/show-more-button.coffee b/app/components/show-more-button.coffee similarity index 65% rename from app/views/show-more-button.coffee rename to app/components/show-more-button.coffee index 6c11fe6f..392824fe 100644 --- a/app/views/show-more-button.coffee +++ b/app/components/show-more-button.coffee @@ -1,21 +1,19 @@ `import Ember from 'ember'` -View = Ember.View.extend +ShowMoreButtonComponent = Ember.Component.extend tagName: 'button' classNames: ['button button--grey button--showmore'] classNameBindings: ['isLoading', 'showMore'] showMore: true attributeBindings: ['disabled'] - isLoadingBinding: 'controller.isLoading' - templateName: 'show-more-button' disabledBinding: 'isLoading' - label: (-> + buttonLabel: (-> if @get('isLoading') then 'Loading' else 'Show more' ).property('isLoading') click: -> - @get('controller').showMore() + this.attrs.showMore() -`export default View` +`export default ShowMoreButtonComponent` diff --git a/app/controllers/builds.coffee b/app/controllers/builds.coffee index 7bd25ad8..6e50de35 100644 --- a/app/controllers/builds.coffee +++ b/app/controllers/builds.coffee @@ -28,4 +28,8 @@ Controller = Ember.ArrayController.extend @store.find('build', options) + actions: + showMoreBuilds: -> + @showMore() + `export default Controller` diff --git a/app/templates/builds.hbs b/app/templates/builds.hbs index e9cd7322..8b1aaa74 100644 --- a/app/templates/builds.hbs +++ b/app/templates/builds.hbs @@ -7,7 +7,7 @@ {{/each}} {{#if displayShowMoreButton}}

- {{view 'show-more-button'}} + {{show-more-button isLoading=isLoading showMore=(action 'showMoreBuilds')}} {{#if isLoading}} {{loading-indicator}} {{/if}} diff --git a/app/templates/components/show-more-button.hbs b/app/templates/components/show-more-button.hbs new file mode 100644 index 00000000..0bb41de2 --- /dev/null +++ b/app/templates/components/show-more-button.hbs @@ -0,0 +1 @@ +{{buttonLabel}} diff --git a/app/templates/show-more-button.hbs b/app/templates/show-more-button.hbs deleted file mode 100644 index d387f91f..00000000 --- a/app/templates/show-more-button.hbs +++ /dev/null @@ -1 +0,0 @@ -{{view.label}}