From ea11133084a2ba20696f607dcdc43489a694583a Mon Sep 17 00:00:00 2001 From: Lukas Matt Date: Thu, 13 Nov 2014 11:34:21 +0100 Subject: [PATCH] Include the chat front-end if chat is enabled * add jsxc helper file --- app/helpers/jsxc_helper.rb | 13 +++++++++++++ app/views/streams/main_stream.html.haml | 3 +++ 2 files changed, 16 insertions(+) create mode 100644 app/helpers/jsxc_helper.rb diff --git a/app/helpers/jsxc_helper.rb b/app/helpers/jsxc_helper.rb new file mode 100644 index 000000000..168faf0ed --- /dev/null +++ b/app/helpers/jsxc_helper.rb @@ -0,0 +1,13 @@ +module JsxcHelper + def get_bosh_endpoint + port = AppConfig.chat.server.bosh.port + bind = AppConfig.chat.server.bosh.bind + host = AppConfig.pod_uri.host + scheme = AppConfig.pod_uri.scheme + + unless AppConfig.chat.server.bosh.proxy? + return "http://#{host}:#{port}#{bind}" + end + return "#{scheme}://#{host}#{bind}" + end +end diff --git a/app/views/streams/main_stream.html.haml b/app/views/streams/main_stream.html.haml index 03d977bf4..0f0e796e6 100644 --- a/app/views/streams/main_stream.html.haml +++ b/app/views/streams/main_stream.html.haml @@ -4,6 +4,9 @@ - content_for :head do = javascript_include_tag :home + - if AppConfig.chat.enabled? + = javascript_include_tag :jsxc, :id => 'jsxc', + :data => { :endpoint => get_bosh_endpoint } - if current_user.getting_started? #welcome-to-diaspora