From c40e413f358f33812bc54337fe138a3cfb3b26d3 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Tue, 10 Nov 2015 09:58:37 +0100 Subject: [PATCH] Don't throw error if broadcastArray is undefined --- app/adapters/v3.js | 2 +- app/controllers/top.coffee | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/adapters/v3.js b/app/adapters/v3.js index fd18b613..4ae644ce 100644 --- a/app/adapters/v3.js +++ b/app/adapters/v3.js @@ -33,7 +33,7 @@ export default DS.RESTAdapter.extend({ // be to create my own URL generator _buildURL: function(modelName, id) { var url = []; - var host = get(this, 'host'); + var host = Ember.get(this, 'host'); var prefix = this.urlPrefix(); var path; diff --git a/app/controllers/top.coffee b/app/controllers/top.coffee index 4d919a4a..6a5c54f5 100644 --- a/app/controllers/top.coffee +++ b/app/controllers/top.coffee @@ -18,6 +18,8 @@ Controller = Ember.Controller.extend ).property('user.gravatarId') defineTowerColor: (broadcastArray) -> + return '' unless broadcastArray + if broadcastArray.length if broadcastArray.findBy('category', 'warning') return 'warning' @@ -75,7 +77,7 @@ Controller = Ember.Controller.extend id = broadcast.get('id').toString() seenBroadcasts = @get('storage').getItem('travis.seen_broadcasts') if seenBroadcasts - seenBroadcasts = JSON.parse(seenBroadcasts) + seenBroadcasts = JSON.parse(seenBroadcasts) else seenBroadcasts = [] seenBroadcasts.push(id)