Download as
Browse Code »

Commit e8e3038a5fca9029b33c4e23b8420bf09391ee86

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

chat: open up most recent conversation and fix submenu toggle

Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
public/javascripts/application.js
  Diff comments   View file @e8e3038
@@ -334,8 +334,7 @@ function toggleSubmenu(trigger, title, link_list) { @@ -334,8 +334,7 @@ function toggleSubmenu(trigger, title, link_list) {
334 } 334 }
335 335
336 function toggleMenu(trigger) { 336 function toggleMenu(trigger) {
337 - hideAllSubmenus();  
338 - jQuery(trigger).siblings('.simplemenu-submenu').toggle().toggleClass('opened'); 337 + jQuery(trigger).siblings('.simplemenu-submenu').toggle();
339 } 338 }
340 339
341 function hideAllSubmenus() { 340 function hideAllSubmenus() {
@@ -569,6 +568,7 @@ function display_notice(message) { @@ -569,6 +568,7 @@ function display_notice(message) {
569 } 568 }
570 569
571 function open_chat_window(self_link, anchor) { 570 function open_chat_window(self_link, anchor) {
  571 + if(jQuery('#conversations .conversation').length == 0) jQuery('.buddies a').first().click();
572 if(anchor) { 572 if(anchor) {
573 jQuery('#chat').show('fast'); 573 jQuery('#chat').show('fast');
574 jQuery("#chat" ).trigger('opengroup', anchor); 574 jQuery("#chat" ).trigger('opengroup', anchor);
public/javascripts/chat.js
  Diff comments   View file @e8e3038
@@ -561,7 +561,7 @@ jQuery(function($) { @@ -561,7 +561,7 @@ jQuery(function($) {
561 var conversation_id = Jabber.conversation_prefix + jid_id; 561 var conversation_id = Jabber.conversation_prefix + jid_id;
562 var conversation = $('#' + conversation_id); 562 var conversation = $('#' + conversation_id);
563 if (conversation.length > 0) { 563 if (conversation.length > 0) {
564 - return conversation; 564 + return conversation;
565 } 565 }
566 566
567 var jid = Jabber.jid_of(jid_id); 567 var jid = Jabber.jid_of(jid_id);