summaryrefslogtreecommitdiffstats
path: root/core/src/OC/menu.js
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2019-09-25 18:19:42 +0200
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2019-10-01 17:16:09 +0200
commitb9bc2417e7a8dc81feb0abe20359bedaf864f790 (patch)
tree61b47fbf37c1d168da8625224debde9e6a985348 /core/src/OC/menu.js
parent7fb651235128dcbca8a6683b5cdafdf835f46300 (diff)
downloadnextcloud-server-b9bc2417e7a8dc81feb0abe20359bedaf864f790.tar.gz
nextcloud-server-b9bc2417e7a8dc81feb0abe20359bedaf864f790.zip
Comply to eslint
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'core/src/OC/menu.js')
-rw-r--r--core/src/OC/menu.js28
1 files changed, 15 insertions, 13 deletions
diff --git a/core/src/OC/menu.js b/core/src/OC/menu.js
index 04d0e078b9a..82cde9e862d 100644
--- a/core/src/OC/menu.js
+++ b/core/src/OC/menu.js
@@ -1,4 +1,4 @@
-/*
+/**
* @copyright 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
*
* @author 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
@@ -22,33 +22,32 @@
import _ from 'underscore'
import $ from 'jquery'
-import {menuSpeed} from './constants'
+import { menuSpeed } from './constants'
-let currentMenu = null
-let currentMenuToggle = null
+export let currentMenu = null
+export let currentMenuToggle = null
/**
* For menu toggling
*
- * @param {jQuery} $toggle
- * @param {jQuery} $menuEl
+ * @param {jQuery} $toggle the toggle element
+ * @param {jQuery} $menuEl the menu container element
* @param {function|undefined} toggle callback invoked everytime the menu is opened
* @param {boolean} headerMenu is this a top right header menu?
* @returns {undefined}
*/
-export const registerMenu = ($toggle, $menuEl, toggle, headerMenu) => {
+export const registerMenu = function($toggle, $menuEl, toggle, headerMenu) {
$menuEl.addClass('menu')
+ const isClickableElement = $toggle.prop('tagName') === 'A' || $toggle.prop('tagName') === 'BUTTON'
// On link and button, the enter key trigger a click event
// Only use the click to avoid two fired events
- $toggle.on(($toggle.prop('tagName') === 'A' || $toggle.prop('tagName') === 'BUTTON')
- ? 'click.menu'
- : 'click.menu keyup.menu', function (event) {
+ $toggle.on(isClickableElement ? 'click.menu' : 'click.menu keyup.menu', function(event) {
// prevent the link event (append anchor to URL)
event.preventDefault()
// allow enter key as a trigger
- if (event.key && event.key !== "Enter") {
+ if (event.key && event.key !== 'Enter') {
return
}
@@ -75,7 +74,10 @@ export const registerMenu = ($toggle, $menuEl, toggle, headerMenu) => {
}
/**
- * @todo Write documentation
+ * Unregister a previously registered menu
+ *
+ * @param {jQuery} $toggle the toggle element
+ * @param {jQuery} $menuEl the menu container element
*/
export const unregisterMenu = ($toggle, $menuEl) => {
// close menu if opened
@@ -95,7 +97,7 @@ export const hideMenus = function(complete) {
if (currentMenu) {
const lastMenu = currentMenu
currentMenu.trigger(new $.Event('beforeHide'))
- currentMenu.slideUp(menuSpeed, function () {
+ currentMenu.slideUp(menuSpeed, function() {
lastMenu.trigger(new $.Event('afterHide'))
if (complete) {
complete.apply(this, arguments)