Download as
Browse Code »

Commit c0508424c932b1d621c06cc86dc02bb9812b3754

Authored by Rodrigo Souto
1 parent 67442d3f
Exists in master and in 21 other branches activate_plugin, api_fixies, api_tasks, article_blog_visualization_format, article_layout_refactoring, article_layout_temp, blog_page_bug, clone_article, communities_ratings, design_template, event_layout, fix_forum, fix_optional_fields, fix_suggest_article, folder_improvments, manage_organization, news_page, script_to_update, template_mirror_block, tests, tests_fixies

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 55 messages_json = messages.map do |message|
56 56 {
57 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 60 :created_at => message.created_at
61 61 }
62 62 end
... ...
public/javascripts/chat.js
  Diff comments   View file @c050842
... ... @@ -587,15 +587,9 @@ jQuery(function($) {
587 587 var from = message['from'];
588 588 var to = message['to'];
589 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 }
... ...