@@ -233,13 +233,13 @@ class AccordionMenu extends Plugin {
233
233
* @fires AccordionMenu#down
234
234
*/
235
235
down ( $target ) {
236
- var _this = this ;
237
-
238
236
if ( ! this . options . multiOpen ) {
239
237
this . up ( this . $element . find ( '.is-active' ) . not ( $target . parentsUntil ( this . $element ) . add ( $target ) ) ) ;
240
238
}
241
239
242
- $target . addClass ( 'is-active' ) . attr ( { 'aria-hidden' : false } ) ;
240
+ $target
241
+ . addClass ( 'is-active' )
242
+ . attr ( { 'aria-hidden' : false } ) ;
243
243
244
244
if ( this . options . submenuToggle ) {
245
245
$target . prev ( '.submenu-toggle' ) . attr ( { 'aria-expanded' : true } ) ;
@@ -248,12 +248,12 @@ class AccordionMenu extends Plugin {
248
248
$target . parent ( '.is-accordion-submenu-parent' ) . attr ( { 'aria-expanded' : true } ) ;
249
249
}
250
250
251
- $target . slideDown ( _this . options . slideSpeed , function ( ) {
251
+ $target . slideDown ( this . options . slideSpeed , ( ) => {
252
252
/**
253
253
* Fires when the menu is done opening.
254
254
* @event AccordionMenu#down
255
255
*/
256
- _this . $element . trigger ( 'down.zf.accordionMenu' , [ $target ] ) ;
256
+ this . $element . trigger ( 'down.zf.accordionMenu' , [ $target ] ) ;
257
257
} ) ;
258
258
}
259
259
@@ -263,23 +263,28 @@ class AccordionMenu extends Plugin {
263
263
* @fires AccordionMenu#up
264
264
*/
265
265
up ( $target ) {
266
- var _this = this ;
267
- $target . slideUp ( _this . options . slideSpeed , function ( ) {
268
- /**
269
- * Fires when the menu is done collapsing up.
270
- * @event AccordionMenu#up
271
- */
272
- _this . $element . trigger ( 'up.zf.accordionMenu' , [ $target ] ) ;
273
- } ) ;
266
+ const $submenus = $target . find ( '[data-submenu]' ) ;
267
+ const $allmenus = $target . add ( $submenus ) ;
274
268
275
- var $menus = $target . find ( '[data-submenu]' ) . slideUp ( 0 ) . addBack ( ) . removeClass ( 'is-active' ) . attr ( 'aria-hidden' , true ) ;
269
+ $submenus . slideUp ( 0 ) ;
270
+ $allmenus
271
+ . removeClass ( 'is-active' )
272
+ . attr ( 'aria-hidden' , true ) ;
276
273
277
274
if ( this . options . submenuToggle ) {
278
- $menus . prev ( '.submenu-toggle' ) . attr ( 'aria-expanded' , false ) ;
275
+ $allmenus . prev ( '.submenu-toggle' ) . attr ( 'aria-expanded' , false ) ;
279
276
}
280
277
else {
281
- $menus . parent ( '.is-accordion-submenu-parent' ) . attr ( 'aria-expanded' , false ) ;
278
+ $allmenus . parent ( '.is-accordion-submenu-parent' ) . attr ( 'aria-expanded' , false ) ;
282
279
}
280
+
281
+ $target . slideUp ( this . options . slideSpeed , ( ) => {
282
+ /**
283
+ * Fires when the menu is done collapsing up.
284
+ * @event AccordionMenu#up
285
+ */
286
+ this . $element . trigger ( 'up.zf.accordionMenu' , [ $target ] ) ;
287
+ } ) ;
283
288
}
284
289
285
290
/**
0 commit comments