From 65ee0d548644fed4c8918c2e9665135bc60ae702 Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Tue, 27 Aug 2013 12:53:32 +0200 Subject: [PATCH] allow setting the pusher host --- assets/scripts/app/app.coffee | 1 + assets/scripts/app/pusher.coffee | 5 +++-- assets/scripts/travis.coffee | 1 + public/index.html | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/assets/scripts/app/app.coffee b/assets/scripts/app/app.coffee index 6514083f..5375c0bc 100644 --- a/assets/scripts/app/app.coffee +++ b/assets/scripts/app/app.coffee @@ -43,6 +43,7 @@ unless window.TravisApplication Travis.SshKey.adapter = Travis.SshKeyAdapter.create() @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 faf00514..a18f27bd 100644 --- a/assets/scripts/app/pusher.coffee +++ b/assets/scripts/app/pusher.coffee @@ -10,9 +10,10 @@ $.extend Travis.Pusher, $.extend Travis.Pusher.prototype, active_channels: [] - init: (key) -> + init: (config) -> Pusher.warn = @warn.bind(this) - @pusher = new Pusher(key, encrypted: Travis.Pusher.ENCRYPTED) + Pusher.host = config.host if config.host + @pusher = new Pusher(config.key, encrypted: Travis.Pusher.ENCRYPTED) @subscribeAll(Travis.Pusher.CHANNELS) if Travis.Pusher.CHANNELS @callbacksToProcess = [] diff --git a/assets/scripts/travis.coffee b/assets/scripts/travis.coffee index 9fb252ce..f85a6efe 100644 --- a/assets/scripts/travis.coffee +++ b/assets/scripts/travis.coffee @@ -79,6 +79,7 @@ $.extend Travis, syncingPageRedirectionTime: 5000 api_endpoint: $('meta[rel="travis.api_endpoint"]').attr('href') pusher_key: $('meta[name="travis.pusher_key"]').attr('value') + pusher_host: $('meta[name="travis.pusher_host"]').attr('value') ga_code: $('meta[name="travis.ga_code"]').attr('value') code_climate: $('meta[name="travis.code_climate"]').attr('value') ssh_key_enabled: $('meta[name="travis.ssh_key_enabled"]').attr('value') == 'true' diff --git a/public/index.html b/public/index.html index e5348ebe..4d015f29 100644 --- a/public/index.html +++ b/public/index.html @@ -6,6 +6,7 @@ +