wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use the normal OC.menu JS for handling the Settings menu

Browse source
This commit is contained in:
Joas Schilling 2015-10-21 13:22:49 +02:00
parent ab8616b2f8
commit a0437591db
1 changed files with 1 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
core/js/js.js
View file

@ -1275,23 +1275,7 @@ function initCore() {
SVGSupport.checkMimeType(); SVGSupport.checkMimeType();
} }
// user menu OC.registerMenu($('#expand'), $('#expanddiv'));
$('#settings #expand').keydown(function(event) {
if (event.which === 13 || event.which === 32) {
$('#expand').click();
}
});
$('#settings #expand').click(function(event) {
$('#settings #expanddiv').slideToggle(OC.menuSpeed);
event.stopPropagation();
});
$('#settings #expanddiv').click(function(event){
event.stopPropagation();
});
//hide the user menu when clicking outside it
$(document).click(function(){
$('#settings #expanddiv').slideUp(OC.menuSpeed);
});
// toggle for menus // toggle for menus
$(document).on('mouseup.closemenus', function(event) { $(document).on('mouseup.closemenus', function(event) {
@ -1304,7 +1288,6 @@ function initCore() {
OC.hideMenus(); OC.hideMenus();
}); });
/** /**
* Set up the main menu toggle to react to media query changes. * Set up the main menu toggle to react to media query changes.
* If the screen is small enough, the main menu becomes a toggle. * If the screen is small enough, the main menu becomes a toggle.