From 7b15f27ba48f5a1b0e24290379e2524796776803 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Fri, 16 Mar 2012 13:31:59 -0400 Subject: weee, dispys get another update Signed-off-by: Simon L'nu --- view/theme/dispy/theme.php | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) (limited to 'view/theme/dispy/theme.php') diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index cbfcb09e6..ac97948a3 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -64,7 +64,7 @@ $(document).ready(function() { $('#drop-' + id).addClass('iconspacer'); } ); - // notifications + // click outside notifications menu closes it $('html').click(function() { $('#nav-notifications-linkmenu').removeClass('selected'); document.getElementById("nav-notifications-menu").style.display = "none"; @@ -74,16 +74,7 @@ $(document).ready(function() { event.stopPropagation(); }); - // usermenu - $('html').click(function() { - $('#nav-user-linkmenu').removeClass('selected'); - document.getElementById("nav-user-menu").style.display = "none"; - }); - - $('#nav-user-linkmenu').click(function(event) { - event.stopPropagation(); - }); - + // main function in toolbar functioning function toggleToolbar() { if ( $('#nav-floater').is(':visible') ) { $('#nav-floater').slideUp('fast'); @@ -97,17 +88,35 @@ $(document).ready(function() { }); } }; + // our trigger for the toolbar button $('.floaterflip').click(function() { toggleToolbar(); return false; }); -}); - - EOT; + -- cgit v1.2.3 From 91fee866b7f870b66d770c7c4e6db0afd874de33 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Fri, 16 Mar 2012 16:43:34 -0400 Subject: make profiles-menu disappear when clicked outside it Signed-off-by: Simon L'nu --- view/theme/dispy/theme.php | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'view/theme/dispy/theme.php') diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index ac97948a3..9f0fcba82 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -73,6 +73,15 @@ $(document).ready(function() { $('#nav-notifications-linkmenu').click(function(event) { event.stopPropagation(); }); + // click outside profiles menu closes it + $('html').click(function() { + $('#profiles-menu-trigger').removeClass('selected'); + document.getElementById("profiles-menu").style.display = "none"; + }); + + $('#profiles-menu').click(function(event) { + event.stopPropagation(); + }); // main function in toolbar functioning function toggleToolbar() { -- cgit v1.2.3