[Pkg-owncloud-commits] [owncloud] 25/69: Use the normal OC.menu JS for handling the Settings menu
David Prévot
taffit at moszumanska.debian.org
Wed Nov 11 02:04:04 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch stable8
in repository owncloud.
commit b08861c603e57b7d535be6733e51f6b1d2aae71a
Author: Joas Schilling <nickvergessen at owncloud.com>
Date: Wed Oct 21 13:22:49 2015 +0200
Use the normal OC.menu JS for handling the Settings menu
---
core/js/js.js | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/core/js/js.js b/core/js/js.js
index 956fbec..460f652 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1275,23 +1275,7 @@ function initCore() {
SVGSupport.checkMimeType();
}
- // user menu
- $('#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);
- });
+ OC.registerMenu($('#expand'), $('#expanddiv'));
// toggle for menus
$(document).on('mouseup.closemenus', function(event) {
@@ -1304,7 +1288,6 @@ function initCore() {
OC.hideMenus();
});
-
/**
* Set up the main menu toggle to react to media query changes.
* If the screen is small enough, the main menu becomes a toggle.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list