Download as
Browse Code »

Commit 9f62df1c6f3d91f5f0972eacae8970b74630ff9b

Authored by Victor Costa
2 parents 48c34b8c 5cb9df6d
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

Merge branch 'rails3_chat' into stable 

Conflicts:
	public/javascripts/application.js
Showing 1 changed file with 6 additions and 3 deletions   Show diff stats
public/javascripts/application.js
  Diff comments   View file @9f62df1
... ... @@ -588,9 +588,12 @@ function display_notice(message) {
588 588 }
589 589  
590 590 function open_chat_window(self_link, anchor) {
591   - anchor = anchor || '#';
592   - var noosfero_chat_window = window.open(noosfero_root() + '/chat' + anchor,'noosfero_chat','width=900,height=500');
593   - noosfero_chat_window.focus();
  591 + if(anchor) {
  592 + jQuery('#chat').show('fast');
  593 + jQuery("#chat" ).trigger('opengroup', anchor);
  594 + } else {
  595 + jQuery('#chat').toggle('fast');
  596 + }
594 597 return false;
595 598 }
596 599  
... ...