Merge branch 'feature/collapse-menulink' of https://github.com/Beanow/friendica into Beanow-feature/collapse-menulink

This commit is contained in:
Fabrixxm 2014-09-17 08:54:46 +02:00
commit c9a5038a7a

View file

@ -80,19 +80,23 @@
} }
} }
$('a[rel^=#]').click(function(e){ $('a[rel^=#]').click(function(e){
e.preventDefault();
var $parent = $(this).parent();
var isSelected = (last_popup_button && $parent.attr('id') == last_popup_button.attr('id'));
close_last_popup_menu(); close_last_popup_menu();
if(isSelected) return false;
menu = $( $(this).attr('rel') ); menu = $( $(this).attr('rel') );
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
if (menu.attr('popup')=="false") return false; if (menu.attr('popup')=="false") return false;
$(this).parent().toggleClass("selected"); $parent.toggleClass("selected");
menu.toggle(); menu.toggle();
if (menu.css("display") == "none") { if (menu.css("display") == "none") {
last_popup_menu = null; last_popup_menu = null;
last_popup_button = null; last_popup_button = null;
} else { } else {
last_popup_menu = menu; last_popup_menu = menu;
last_popup_button = $(this).parent(); last_popup_button = $parent;
} }
return false; return false;
}); });