Download as
Browse Code »

Commit cf12a5f2b5f17578a2fec3ca0d1d35743e0d516e

Authored by Rodrigo Souto
1 parent 607decd2
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

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 }