Download as
Browse Code »

Commit 8b6d5a67e9ca4e2d118e792df86e9831d21f1c43

Authored by Victor Costa
2 parents e7fa90d6 0434ea45
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

Merge branch 'rails3_chat' into rails3_stable

Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
public/javascripts/chat.js
  Diff comments   View file @8b6d5a6
@@ -594,7 +594,7 @@ jQuery(function($) { @@ -594,7 +594,7 @@ jQuery(function($) {
594 Jabber.show_message(to['id']+'@'+group+domain, $own_name, body, 'self', from['id'], date); 594 Jabber.show_message(to['id']+'@'+group+domain, $own_name, body, 'self', from['id'], date);
595 } else { 595 } else {
596 var target = group!='' ? to['id'] : from['id'] 596 var target = group!='' ? to['id'] : from['id']
597 - Jabber.show_message(target+'@'+group+domain, from['name'], body, 'other', from['id'], date); 597 + Jabber.show_message(target+'@'+group+domain, from['name'], body, from['id'], from['id'], date);
598 } 598 }
599 }); 599 });
600 }); 600 });