diff options
Diffstat (limited to 'core/js/js.js')
| -rw-r--r-- | core/js/js.js | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/core/js/js.js b/core/js/js.js index 8ac999a104d..677cd5fbb7f 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -283,12 +283,21 @@ $(document).ready(function(){ }); if($('body').attr("id")=="body-user") { $('#settings #expanddiv').hide(); } - $('#settings #expand').click(function() { + $('#settings #expand').click(function(event) { $('#settings #expanddiv').slideToggle(); + event.stopPropagation(); }); + $('#settings #expanddiv').click(function(event){ + event.stopPropagation(); + }) $('#settings #expand').hover(function(){ $('#settings #expand+span').fadeToggle(); }); + $(window).click(function(){//hide the settings menu when clicking oustide it + if($('body').attr("id")=="body-user"){ + $('#settings #expanddiv').slideUp(); + } + }); $('.file_action').tipsy({gravity:'s', live:true}); $('.selectedActions a').tipsy({gravity:'n', live:true}); |