From df4b715ce9e7ebf7b37cf845411f36039b188ac8 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 3 Sep 2015 11:22:07 +0200 Subject: [PATCH] Fix broadcasts For some reason using property.[] stopped working in flash controller, so I'm using length for now, which should work properly in case of broadcasts as they're loaded only once anyway. --- app/controllers/flash.coffee | 8 ++++---- app/templates/layouts/flash.hbs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/flash.coffee b/app/controllers/flash.coffee index 63db2451..5d22d884 100644 --- a/app/controllers/flash.coffee +++ b/app/controllers/flash.coffee @@ -2,7 +2,7 @@ `import LimitedArray from 'travis/utils/limited-array'` `import Broadcast from 'travis/models/broadcast'` -Controller = Ember.ArrayController.extend +Controller = Ember.Controller.extend needs: ['currentUser'] currentUserBinding: 'controllers.currentUser.model' @@ -10,19 +10,19 @@ Controller = Ember.ArrayController.extend @_super.apply this, arguments @set('flashes', LimitedArray.create(limit: 1, content: [])) - model: (-> + messages: (-> broadcasts = @get('unseenBroadcasts') flashes = @get('flashes') model = [] model.pushObjects(broadcasts) if broadcasts model.pushObjects(flashes.toArray().reverse()) if flashes model.uniq() - ).property('unseenBroadcasts.[]', 'flashes.[]') + ).property('unseenBroadcasts.[]', 'flashes.[]', 'unseenBroadcasts.length', 'flashes.length') unseenBroadcasts: (-> @get('broadcasts').filter (broadcast) -> !broadcast.get('isSeen') - ).property('broadcasts.[]') + ).property('broadcasts.[]', 'broadcasts.length') broadcasts: (-> broadcasts = Ember.ArrayProxy.create(content: []) diff --git a/app/templates/layouts/flash.hbs b/app/templates/layouts/flash.hbs index 635ad6a1..a155045a 100644 --- a/app/templates/layouts/flash.hbs +++ b/app/templates/layouts/flash.hbs @@ -1,4 +1,4 @@ -{{#each flash in controller}} +{{#each flash in messages}} {{#view "flash-item" flashBinding="flash"}}

{{{flash.message}}}