Download as
Browse Code »

Commit c0508424c932b1d621c06cc86dc02bb9812b3754

Authored by Rodrigo Souto
1 parent 67442d3f
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 recent_messages domain and code refactoring

Showing 2 changed files with 5 additions and 11 deletions   Show diff stats
app/controllers/public/chat_controller.rb
  Diff comments   View file @c050842
@@ -55,8 +55,8 @@ class ChatController < PublicController @@ -55,8 +55,8 @@ class ChatController < PublicController
55 messages_json = messages.map do |message| 55 messages_json = messages.map do |message|
56 { 56 {
57 :body => message.body, 57 :body => message.body,
58 - :to => {:id => message.to.identifier, :name => message.to.name, :type => message.to.type},  
59 - :from => {:id => message.from.identifier, :name => message.from.name, :type => message.from.type}, 58 + :to => {:id => message.to.identifier, :name => message.to.name},
  59 + :from => {:id => message.from.identifier, :name => message.from.name},
60 :created_at => message.created_at 60 :created_at => message.created_at
61 } 61 }
62 end 62 end
public/javascripts/chat.js
  Diff comments   View file @c050842
@@ -587,15 +587,9 @@ jQuery(function($) { @@ -587,15 +587,9 @@ jQuery(function($) {
587 var from = message['from']; 587 var from = message['from'];
588 var to = message['to']; 588 var to = message['to'];
589 var date = message['created_at']; 589 var date = message['created_at'];
590 - var group = to['type']=='Community' ? 'conference.' : '';  
591 - var domain = '127.0.0.1';  
592 -  
593 - if(from['id']==getCurrentIdentifier()) {  
594 - Jabber.show_message(to['id']+'@'+group+domain, $own_name, body, 'self', from['id'], date);  
595 - } else {  
596 - var target = group!='' ? to['id'] : from['id']  
597 - Jabber.show_message(target+'@'+group+domain, from['name'], body, from['id'], from['id'], date);  
598 - } 590 + var who = from['id']==getCurrentIdentifier() ? 'self' : from['id']
  591 +
  592 + Jabber.show_message(jid, from['name'], body, who, from['id'], date);
599 }); 593 });
600 }); 594 });
601 } 595 }