From aad5530d2e674f7ec1a96d1d0c69ccbb5fea0928 Mon Sep 17 00:00:00 2001 From: Lisa P Date: Thu, 22 Oct 2015 17:06:12 +0200 Subject: [PATCH] change tower icon color logic --- app/controllers/top.coffee | 13 +++++++++++-- app/styles/app/layouts/broadcasts.sass | 4 ++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/controllers/top.coffee b/app/controllers/top.coffee index b246fe8b..ee3b9c51 100644 --- a/app/controllers/top.coffee +++ b/app/controllers/top.coffee @@ -31,7 +31,10 @@ Controller = Ember.Controller.extend options.headers = { Authorization: "token #{@auth.token()}" } seenBroadcasts = Travis.storage.getItem('travis.seen_broadcasts') - seenBroadcasts = JSON.parse(seenBroadcasts) if seenBroadcasts + if seenBroadcasts + seenBroadcasts = JSON.parse(seenBroadcasts) + else + seenBroadcasts = [] $.ajax("#{apiEndpoint}/v3/broadcasts", options).then (response) -> if response.broadcasts.length @@ -44,7 +47,13 @@ Controller = Ember.Controller.extend ).reverse() if receivedBroadcasts.length - broadcasts.set('lastBroadcastStatus', receivedBroadcasts[0].category) + if receivedBroadcasts.findBy('category', 'warning') + broadcasts.set('lastBroadcastStatus', 'warning') + else if receivedBroadcasts.findBy('category', 'announcement') + broadcasts.set('lastBroadcastStatus', 'announcement') + else + broadcasts.set('lastBroadcastStatus', '') + broadcasts.set('content', receivedBroadcasts) broadcasts.set('isLoading', false) diff --git a/app/styles/app/layouts/broadcasts.sass b/app/styles/app/layouts/broadcasts.sass index dc16ecdd..26ecf283 100644 --- a/app/styles/app/layouts/broadcasts.sass +++ b/app/styles/app/layouts/broadcasts.sass @@ -126,12 +126,12 @@ .radio-wave--right .tower-path transform-origin: left center - animation: pulsating-right 1s linear infinite + animation: pulsating-right 1.5s linear infinite .radio-wave--left .tower-path transform-origin: right center - animation: pulsating-left 1s linear infinite + animation: pulsating-left 1.5s linear infinite @keyframes pulsating-right