Download as
Browse Code »

Commit cf12a5f2b5f17578a2fec3ca0d1d35743e0d516e

Authored by Rodrigo Souto
1 parent 607decd2
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

Open chat windows properly after notification click

Showing 1 changed file with 2 additions and 1 deletions   Show diff stats
public/javascripts/chat.js
  Diff comments   View file @cf12a5f
@@ -692,7 +692,8 @@ jQuery(function($) { @@ -692,7 +692,8 @@ jQuery(function($) {
692 if(!$('#chat').is(':visible') || window.isHidden()) { 692 if(!$('#chat').is(':visible') || window.isHidden()) {
693 var options = {body: message.body, icon: avatar, tag: jid_id}; 693 var options = {body: message.body, icon: avatar, tag: jid_id};
694 notifyMe(name, options).onclick = function(){ 694 notifyMe(name, options).onclick = function(){
695 - open_chat_window(null, '#'+jid); 695 + jQuery('#chat').show('fast');
  696 + jQuery('a#'+jid_id).click();
696 }; 697 };
697 $.sound.play('/sounds/receive.wav'); 698 $.sound.play('/sounds/receive.wav');
698 } 699 }