Download as
Browse Code »

Commit 64f8e3a7fc269a29a759fac741499de9fb3b9664

Authored by Victor Costa
Committed by Rodrigo Souto
1 parent 80008f7c
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Fix bosh service url

Showing 2 changed files with 2 additions and 1 deletions   Show diff stats
app/views/shared/logged_in/xmpp_chat.html.erb
  Diff comments   View file @64f8e3a
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
12 var $own_name = '<%= user.name %>'; 12 var $own_name = '<%= user.name %>';
13 var $starting_chat_notice = '<%= _("starting chat with %{name}") %>'; 13 var $starting_chat_notice = '<%= _("starting chat with %{name}") %>';
14 var $muc_domain = '<%= "conference.#{environment.default_hostname}" %>'; 14 var $muc_domain = '<%= "conference.#{environment.default_hostname}" %>';
  15 + var $bosh_service = '//<%= environment.default_hostname %>/http-bind';
15 var $user_unavailable_error = '<%= _("<strong>ooops!</strong> The message could not be sent because the user is not online") %>'; 16 var $user_unavailable_error = '<%= _("<strong>ooops!</strong> The message could not be sent because the user is not online") %>';
16 var $update_presence_status_every = <%= User.expires_chat_status_every.minutes %>; 17 var $update_presence_status_every = <%= User.expires_chat_status_every.minutes %>;
17 </script> 18 </script>
public/javascripts/chat.js
  Diff comments   View file @64f8e3a
@@ -20,7 +20,7 @@ jQuery(function($) { @@ -20,7 +20,7 @@ jQuery(function($) {
20 var Jabber = { 20 var Jabber = {
21 debug: true, 21 debug: true,
22 connection: null, 22 connection: null,
23 - bosh_service: 'http://10.32.113.131/http-bind', 23 + bosh_service: $bosh_service,
24 muc_domain: $muc_domain, 24 muc_domain: $muc_domain,
25 muc_supported: false, 25 muc_supported: false,
26 presence_status: '', 26 presence_status: '',