Download as
Browse Code »

Commit 7007c8d48ec665d67c60d549dac09f3bb6d5bfe9

Authored by Victor Costa
Committed by Rodrigo Souto
1 parent 024c2e05
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

Small chat fix

Showing 1 changed file with 5 additions and 1 deletions   Show diff stats
public/javascripts/chat.js
  Diff comments   View file @7007c8d
... ... @@ -317,6 +317,10 @@ jQuery(function($) {
317 317 else {
318 318 // why server sends presence from myself to me?
319 319 log('ignoring presence from myself');
  320 + if(presence.show=='offline') {
  321 + console.log(Jabber.presence_status);
  322 + Jabber.send_availability_status(Jabber.presence_status);
  323 + }
320 324 }
321 325 }
322 326 }
... ... @@ -585,7 +589,7 @@ jQuery(function($) {
585 589 var domain = '127.0.0.1';
586 590  
587 591 if(from['id']==getCurrentIdentifier()) {
588   - Jabber.show_message(to['id']+'@'+group+domain, $own_name, body, 'self', to['id'], date);
  592 + Jabber.show_message(to['id']+'@'+group+domain, $own_name, body, 'self', from['id'], date);
589 593 } else {
590 594 var target = group!='' ? to['id'] : from['id']
591 595 Jabber.show_message(target+'@'+group+domain, from['name'], body, 'other', from['id'], date);
... ...