diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 756f1fb..16487e1 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -334,8 +334,7 @@ function toggleSubmenu(trigger, title, link_list) { } function toggleMenu(trigger) { - hideAllSubmenus(); - jQuery(trigger).siblings('.simplemenu-submenu').toggle().toggleClass('opened'); + jQuery(trigger).siblings('.simplemenu-submenu').toggle(); } function hideAllSubmenus() { @@ -569,6 +568,7 @@ function display_notice(message) { } function open_chat_window(self_link, anchor) { + if(jQuery('#conversations .conversation').length == 0) jQuery('.buddies a').first().click(); if(anchor) { jQuery('#chat').show('fast'); jQuery("#chat" ).trigger('opengroup', anchor); diff --git a/public/javascripts/chat.js b/public/javascripts/chat.js index 3ed0d8e..d9e758f 100644 --- a/public/javascripts/chat.js +++ b/public/javascripts/chat.js @@ -561,7 +561,7 @@ jQuery(function($) { var conversation_id = Jabber.conversation_prefix + jid_id; var conversation = $('#' + conversation_id); if (conversation.length > 0) { - return conversation; + return conversation; } var jid = Jabber.jid_of(jid_id); -- libgit2 0.21.2