From bd4c0aa0a04b11d876c4488380728fbe17a56c4a Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Mon, 13 Oct 2014 17:20:02 +0200 Subject: [PATCH] do not create two Pusher instances --- assets/scripts/app/app.coffee | 1 - assets/scripts/app/pusher.coffee | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/assets/scripts/app/app.coffee b/assets/scripts/app/app.coffee index 5375c0bc..d79fbb61 100644 --- a/assets/scripts/app/app.coffee +++ b/assets/scripts/app/app.coffee @@ -44,7 +44,6 @@ unless window.TravisApplication @slider = new Travis.Slider() @pusher = new Travis.Pusher(key: Travis.config.pusher_key, host: Travis.config.pusher_host) if Travis.config.pusher_key - @pusher = new Travis.Pusher(Travis.config.pusher_key) if Travis.config.pusher_key @tailing = new Travis.Tailing($(window), '#tail', '#log') @toTop = new Travis.ToTop($(window), '.to-top', '#log-container') diff --git a/assets/scripts/app/pusher.coffee b/assets/scripts/app/pusher.coffee index b2adb484..5cc394b9 100644 --- a/assets/scripts/app/pusher.coffee +++ b/assets/scripts/app/pusher.coffee @@ -1,5 +1,5 @@ -Travis.Pusher = (key) -> - @init(key) # if key +Travis.Pusher = (config) -> + @init(config) this $.extend Travis.Pusher,