Download as
Browse Code »

Commit b00b8041df33c1c5e7a1453652ef0caff5d2faa9

Authored by Daniela Feitosa
2 parents b63031a6 7b0a37ef
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

Merge commit 'refs/merge-requests/83' of git://gitorious.org/noosfero/noosfero i… 

…nto merge-requests/83
Showing 1 changed file with 6 additions and 6 deletions   Show diff stats
public/javascripts/application.js
  Diff comments   View file @b00b804
@@ -255,7 +255,7 @@ function toggleSubmenu(trigger, title, link_list) { @@ -255,7 +255,7 @@ function toggleSubmenu(trigger, title, link_list) {
255 if (!hide) { 255 if (!hide) {
256 var direction = 'down'; 256 var direction = 'down';
257 if (submenu.hasClass('up')) direction = 'up'; 257 if (submenu.hasClass('up')) direction = 'up';
258 - submenu.show('slide', { 'direction' : direction }, 'slow'); 258 + jQuery(submenu).fadeIn();
259 } 259 }
260 } 260 }
261 return false; 261 return false;
@@ -283,18 +283,18 @@ function toggleSubmenu(trigger, title, link_list) { @@ -283,18 +283,18 @@ function toggleSubmenu(trigger, title, link_list) {
283 content.append(list); 283 content.append(list);
284 submenu.append(header).append(content).append(footer); 284 submenu.append(header).append(content).append(footer);
285 jQuery(trigger).before(submenu); 285 jQuery(trigger).before(submenu);
286 - submenu.show('slide', { 'direction' : direction }, 'slow'); 286 + jQuery(submenu).fadeIn();
287 } 287 }
288 288
289 function toggleMenu(trigger) { 289 function toggleMenu(trigger) {
290 hideAllSubmenus(); 290 hideAllSubmenus();
291 - jQuery(trigger).siblings('.simplemenu-submenu').toggle('slide', {direction: 'up'}, 'slow').toggleClass('opened'); 291 + jQuery(trigger).siblings('.simplemenu-submenu').toggle().toggleClass('opened');
292 } 292 }
293 293
294 function hideAllSubmenus() { 294 function hideAllSubmenus() {
295 - jQuery('.menu-submenu.up:visible').hide('slide', { 'direction' : 'up' }, 'slow');  
296 - jQuery('.simplemenu-submenu:visible').hide('slide', { 'direction' : 'up' }, 'slow').toggleClass('opened');  
297 - jQuery('.menu-submenu.down:visible').hide('slide', { 'direction' : 'down' }, 'slow'); 295 + jQuery('.menu-submenu.up:visible').fadeOut('slow');
  296 + jQuery('.simplemenu-submenu:visible').hide().toggleClass('opened');
  297 + jQuery('.menu-submenu.down:visible').fadeOut('slow');
298 jQuery('#chat-online-users-content').hide(); 298 jQuery('#chat-online-users-content').hide();
299 } 299 }
300 300