diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-12-27 02:14:56 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-12-27 02:14:56 +0000 |
| commit | 543e50d2aabfbd3c116cbb670018c66fae535955 (patch) | |
| tree | d84b51988a755c03f8794e3c11cf38b78015ea65 /views/default/js | |
| parent | 07a1585f3eee1211aeaf55ea436135f637520102 (diff) | |
| download | elgg-543e50d2aabfbd3c116cbb670018c66fae535955.tar.gz elgg-543e50d2aabfbd3c116cbb670018c66fae535955.tar.bz2 | |
moved most of the code for the user hover menu into the new menu system
git-svn-id: http://code.elgg.org/elgg/trunk@7723 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default/js')
| -rw-r--r-- | views/default/js/elgg.php | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/views/default/js/elgg.php b/views/default/js/elgg.php index 082122b5d..3e7b30a99 100644 --- a/views/default/js/elgg.php +++ b/views/default/js/elgg.php @@ -358,25 +358,24 @@ function setup_avatar_menu(parent) { // avatar contextual menu $(".avatar_menu_button img").click(function(e) { - var submenu = $(this).parent().parent().find("div.sub_menu"); + //var submenu = $(this).parent().parent().find("div.sub_menu"); + var submenu = $(this).parent().parent().find(".elgg-hover-menu"); // close submenu if arrow is clicked & menu already open - if(submenu.css('display') == "block") { + if (submenu.css('display') == "block") { //submenu.hide(); - } - else { + } else { // get avatar dimensions var avatar = $(this).parent().parent().parent().find("div.elgg-user-icon"); //alert( "avatarWidth: " + avatar.width() + ", avatarHeight: " + avatar.height() ); // move submenu position so it aligns with arrow graphic if (e.pageX < 840) { // popup menu to left of arrow if we're at edge of page - submenu.css("top",(avatar.height()) + "px") + submenu.css("top",(avatar.height()) + "px") .css("left",(avatar.width()-15) + "px") .fadeIn('normal'); - } - else { - submenu.css("top",(avatar.height()) + "px") + } else { + submenu.css("top",(avatar.height()) + "px") .css("left",(avatar.width()-166) + "px") .fadeIn('normal'); } @@ -429,7 +428,7 @@ function setup_avatar_menu(parent) { $(document).click(function(event) { var target = $(event.target); if (target.parents(".elgg-user-icon").length == 0) { - $(".elgg-user-icon div.sub_menu").fadeOut(); + $(".elgg-hover-menu").fadeOut(); $(".avatar_menu_button").removeClass("avatar_menu_arrow"); $(".avatar_menu_button").removeClass("avatar_menu_arrow_on"); $(".avatar_menu_button").removeClass("avatar_menu_arrow_hover"); |