From 558f6e64c0ac1aa4b07187102da778107a82ebaf Mon Sep 17 00:00:00 2001 From: Lisa P Date: Wed, 14 Oct 2015 14:45:05 +0200 Subject: [PATCH] remove some things --- app/controllers/top.coffee | 2 ++ app/services/flashes.coffee | 23 +---------------------- app/templates/top.hbs | 2 ++ 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/app/controllers/top.coffee b/app/controllers/top.coffee index 9e0db063..986b9513 100644 --- a/app/controllers/top.coffee +++ b/app/controllers/top.coffee @@ -29,6 +29,8 @@ Controller = Ember.Controller.extend @get('store').find('broadcast').then (result) -> broadcasts.pushObjects(result.toArray()) + console.log(broadcasts) + broadcasts ).property('currentUser.id') diff --git a/app/services/flashes.coffee b/app/services/flashes.coffee index 19ae1de2..6da8ad73 100644 --- a/app/services/flashes.coffee +++ b/app/services/flashes.coffee @@ -11,29 +11,12 @@ FlashesService = Ember.Service.extend @set('flashes', LimitedArray.create(limit: 1, content: [])) messages: (-> - #broadcasts = @get('unseenBroadcasts') flashes = @get('flashes') model = [] - # model.pushObjects(broadcasts) if broadcasts - model.pushObjects(flashes.toArray().reverse()) if flashes + model.pushObjects(flashes.toArray().reverse()) if flashes model.uniq() ).property('flashes.[]', 'flashes.length') - # unseenBroadcasts: (-> - # @get('broadcasts').filter (broadcast) -> - # !broadcast.get('isSeen') - # ).property('broadcasts.[]', 'broadcasts.length') - - # broadcasts: (-> - # broadcasts = Ember.ArrayProxy.create(content: []) - - # if @get('currentUser.id') - # @get('store').find('broadcast').then (result) -> - # broadcasts.pushObjects(result.toArray()) - - # broadcasts - # ).property('currentUser.id') - loadFlashes: (msgs) -> for msg in msgs type = Object.keys(msg)[0] @@ -42,10 +25,6 @@ FlashesService = Ember.Service.extend Ember.run.later(this, (-> @get('flashes.content').removeObject(msg)), 15000) close: (msg) -> - # if msg.constructor.modelName == "broadcast" - # msg.setSeen() - # @notifyPropertyChange('unseenBroadcasts') - # else @get('flashes').removeObject(msg) `export default FlashesService` diff --git a/app/templates/top.hbs b/app/templates/top.hbs index 3a0db8fb..0108b78d 100644 --- a/app/templates/top.hbs +++ b/app/templates/top.hbs @@ -16,6 +16,8 @@ {{/if}} + {{v2broadcasts}} +