From e794c5b9b075f3b04d5aac262b419e9545d53e41 Mon Sep 17 00:00:00 2001 From: Brad Simpson Date: Tue, 9 Apr 2024 11:57:33 -0600 Subject: [PATCH 01/17] Add _areEntireItemsClickable option, update documentation --- README.md | 2 ++ example.json | 3 ++- js/BoxMenuItemView.js | 45 +++++++++++++++++++++++++++++++++++++-- less/boxMenuItem.less | 4 ++++ templates/boxMenuItem.hbs | 3 +++ 5 files changed, 54 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b12baff..174bb88 100644 --- a/README.md +++ b/README.md @@ -106,6 +106,8 @@ The first value is the horizontal position and the second value is the vertical. >>>**\_small** (number): The minimum height should only be used in instances where the menu header height needs to be greater than the content e.g. to prevent a background image being cropped. +>>>**__areEntireItemsClickable** (boolean): Indicates if the entire menu item can be clicked to go to the target page. If `true`, the View button will be hidden. + **\_globals** (object): The Globals object that contains value for **\_menu**. >**\_menu** (object): The menu object that contains value for **\_boxMenu**. diff --git a/example.json b/example.json index 6ca5a4b..2c385de 100644 --- a/example.json +++ b/example.json @@ -35,7 +35,8 @@ "_medium": 400, "_small": 200 } - } + }, + "_areEntireItemsClickable": true, } // contentObjects.json diff --git a/js/BoxMenuItemView.js b/js/BoxMenuItemView.js index 11817a4..f76d799 100644 --- a/js/BoxMenuItemView.js +++ b/js/BoxMenuItemView.js @@ -1,15 +1,52 @@ import MenuItemView from 'core/js/views/menuItemView'; +import Adapt from 'core/js/adapt'; import router from 'core/js/router'; class BoxMenuItemView extends MenuItemView { className() { - return `${super.className()} boxmenu-item`; + const entireItemClickable = this.areEntireItemsClickable() ? 'is-entire-item-clickable' : ''; + return `${super.className()} boxmenu-item ${entireItemClickable}`; } events() { + if (this.areEntireItemsClickable()) { + return { + click: 'onClickMenuItemButton' + }; + } else { + return { + 'click .js-btn-click': 'onClickMenuItemButton' + }; + } + } + + attributes() { + const globals = Adapt.course.get('_globals'); + const ariaLabel = []; + + if (this.model.get('_isComplete')) { + ariaLabel.push(globals._accessibility._ariaLabels.complete); + } + + if (this.model.get('_isVisited')) { + ariaLabel.push(globals._accessibility._ariaLabels.visited); + } + + if (this.model.get('_isOptional')) { + ariaLabel.push(globals._accessibility._ariaLabels.optional); + } + + const data = this.model.toJSON(); + const itemCount = Handlebars.compile(globals._menu._boxMenu.itemCount)(data); + ariaLabel.push(itemCount); + + const parentAttributes = Object.getPrototypeOf(BoxMenuItemView.prototype).attributes.call(this); + return { - 'click .js-btn-click': 'onClickMenuItemButton' + ...parentAttributes, + role: 'link', + 'aria-label': ariaLabel.join(' ') }; } @@ -18,6 +55,10 @@ class BoxMenuItemView extends MenuItemView { if (this.model.get('_isLocked')) return; router.navigateToElement(this.model.get('_id')); } + + areEntireItemsClickable() { + return Adapt.course.get('_boxMenu')?._areEntireItemsClickable; + } } BoxMenuItemView.template = 'boxMenuItem'; diff --git a/less/boxMenuItem.less b/less/boxMenuItem.less index 577fb05..581edf7 100644 --- a/less/boxMenuItem.less +++ b/less/boxMenuItem.less @@ -8,4 +8,8 @@ @media (min-width: @device-width-medium) { width: 50%; } + + &.is-entire-item-clickable:not(.is-locked) { + cursor: pointer; + } } diff --git a/templates/boxMenuItem.hbs b/templates/boxMenuItem.hbs index 145f44a..cb3e3e9 100644 --- a/templates/boxMenuItem.hbs +++ b/templates/boxMenuItem.hbs @@ -1,4 +1,5 @@ {{import_globals}} +{{import_adapt}}
@@ -40,9 +41,11 @@
+ {{#unless Adapt.course._boxMenu._areEntireItemsClickable}} + {{/unless}} From 732e19577962e775dd8d3e1a0ac96c4cc0d119c8 Mon Sep 17 00:00:00 2001 From: Brad Simpson Date: Tue, 9 Apr 2024 13:01:49 -0600 Subject: [PATCH 02/17] Update schemas --- example.json | 4 ++-- properties.schema | 9 +++++++++ schema/course.schema.json | 6 ++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/example.json b/example.json index 2c385de..966493f 100644 --- a/example.json +++ b/example.json @@ -1,5 +1,6 @@ // course.json "_boxMenu": { + "_areEntireItemsClickable": false, "_graphic": { "alt": "", "_src": "course/en/images/logo-graphic.jpg" @@ -35,8 +36,7 @@ "_medium": 400, "_small": 200 } - }, - "_areEntireItemsClickable": true, + } } // contentObjects.json diff --git a/properties.schema b/properties.schema index e94566a..7e67d27 100644 --- a/properties.schema +++ b/properties.schema @@ -37,6 +37,15 @@ "type": "object", "required": false, "properties": { + "_areEntireItemsClickable": { + "type": "boolean", + "required": false, + "default": false, + "title": "Are entire menu items clickable?", + "inputType": "Checkbox", + "validators": [], + "help": "Enable this option to make each menu item clickable. The menu item button will be hidden." + }, "_graphic": { "type": "object", "required": false, diff --git a/schema/course.schema.json b/schema/course.schema.json index d755b19..86dc6e9 100644 --- a/schema/course.schema.json +++ b/schema/course.schema.json @@ -48,6 +48,12 @@ "title": "Box Menu", "default": {}, "properties": { + "_areEntireItemsClickable": { + "type": "boolean", + "title": "Are entire menu items clickable?", + "description": "Enable this option to make each menu item clickable. The menu item button will be hidden.", + "default": false + }, "_graphic": { "type": "object", "title": "Menu logo image", From 426b8c1aa7db13139f72382b4d616247c1d8b294 Mon Sep 17 00:00:00 2001 From: Brad Simpson Date: Tue, 9 Apr 2024 13:18:08 -0600 Subject: [PATCH 03/17] Optimizations to className() and events() --- js/BoxMenuItemView.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/js/BoxMenuItemView.js b/js/BoxMenuItemView.js index f76d799..9c43260 100644 --- a/js/BoxMenuItemView.js +++ b/js/BoxMenuItemView.js @@ -5,8 +5,11 @@ import router from 'core/js/router'; class BoxMenuItemView extends MenuItemView { className() { - const entireItemClickable = this.areEntireItemsClickable() ? 'is-entire-item-clickable' : ''; - return `${super.className()} boxmenu-item ${entireItemClickable}`; + let classes = `${super.className()} boxmenu-item`; + if (this.areEntireItemsClickable()) { + classes += ' is-entire-item-clickable'; + } + return classes; } events() { @@ -14,11 +17,11 @@ class BoxMenuItemView extends MenuItemView { return { click: 'onClickMenuItemButton' }; - } else { - return { - 'click .js-btn-click': 'onClickMenuItemButton' - }; } + + return { + 'click .js-btn-click': 'onClickMenuItemButton' + }; } attributes() { From 372f4e1611f6972df3408ce8e1703cf3b9724b6c Mon Sep 17 00:00:00 2001 From: Brad Simpson Date: Tue, 9 Apr 2024 14:11:29 -0600 Subject: [PATCH 04/17] Refactor className() using an array --- js/BoxMenuItemView.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/js/BoxMenuItemView.js b/js/BoxMenuItemView.js index 9c43260..4400bea 100644 --- a/js/BoxMenuItemView.js +++ b/js/BoxMenuItemView.js @@ -5,11 +5,11 @@ import router from 'core/js/router'; class BoxMenuItemView extends MenuItemView { className() { - let classes = `${super.className()} boxmenu-item`; - if (this.areEntireItemsClickable()) { - classes += ' is-entire-item-clickable'; - } - return classes; + return [ + super.className(), + 'boxmenu-item', + this.areEntireItemsClickable() && 'is-entire-item-clickable' + ].filter(Boolean).join(' '); } events() { @@ -60,6 +60,7 @@ class BoxMenuItemView extends MenuItemView { } areEntireItemsClickable() { + console.log(this.model); return Adapt.course.get('_boxMenu')?._areEntireItemsClickable; } } From 0dee1c913c0c247839c107fb2c313db9fbf02464 Mon Sep 17 00:00:00 2001 From: Brad Simpson Date: Tue, 9 Apr 2024 14:14:39 -0600 Subject: [PATCH 05/17] Update attributes() to simplify getting parent attributes --- js/BoxMenuItemView.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/js/BoxMenuItemView.js b/js/BoxMenuItemView.js index 4400bea..01211e3 100644 --- a/js/BoxMenuItemView.js +++ b/js/BoxMenuItemView.js @@ -44,10 +44,8 @@ class BoxMenuItemView extends MenuItemView { const itemCount = Handlebars.compile(globals._menu._boxMenu.itemCount)(data); ariaLabel.push(itemCount); - const parentAttributes = Object.getPrototypeOf(BoxMenuItemView.prototype).attributes.call(this); - return { - ...parentAttributes, + ...super.attributes(), role: 'link', 'aria-label': ariaLabel.join(' ') }; From a4fa56df1f47150c525d588f6defd8344cbab567 Mon Sep 17 00:00:00 2001 From: Brad Simpson Date: Tue, 9 Apr 2024 14:17:49 -0600 Subject: [PATCH 06/17] Move click event to boxmenu-item__inner instead of boxmenu-item --- js/BoxMenuItemView.js | 7 ------- templates/boxMenuItem.hbs | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/js/BoxMenuItemView.js b/js/BoxMenuItemView.js index 01211e3..e69a35e 100644 --- a/js/BoxMenuItemView.js +++ b/js/BoxMenuItemView.js @@ -13,12 +13,6 @@ class BoxMenuItemView extends MenuItemView { } events() { - if (this.areEntireItemsClickable()) { - return { - click: 'onClickMenuItemButton' - }; - } - return { 'click .js-btn-click': 'onClickMenuItemButton' }; @@ -58,7 +52,6 @@ class BoxMenuItemView extends MenuItemView { } areEntireItemsClickable() { - console.log(this.model); return Adapt.course.get('_boxMenu')?._areEntireItemsClickable; } } diff --git a/templates/boxMenuItem.hbs b/templates/boxMenuItem.hbs index cb3e3e9..a005e7e 100644 --- a/templates/boxMenuItem.hbs +++ b/templates/boxMenuItem.hbs @@ -1,7 +1,7 @@ {{import_globals}} {{import_adapt}} -
+
{{#if _graphic.src}}
From 2c85651291aea94877689ab90db9cab4432b4bb5 Mon Sep 17 00:00:00 2001 From: Brad Simpson Date: Tue, 9 Apr 2024 14:22:31 -0600 Subject: [PATCH 07/17] Make areEntireItemsClickable a getter function --- js/BoxMenuItemView.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/BoxMenuItemView.js b/js/BoxMenuItemView.js index e69a35e..c022ee6 100644 --- a/js/BoxMenuItemView.js +++ b/js/BoxMenuItemView.js @@ -8,7 +8,7 @@ class BoxMenuItemView extends MenuItemView { return [ super.className(), 'boxmenu-item', - this.areEntireItemsClickable() && 'is-entire-item-clickable' + this.areEntireItemsClickable && 'is-entire-item-clickable' ].filter(Boolean).join(' '); } @@ -51,7 +51,7 @@ class BoxMenuItemView extends MenuItemView { router.navigateToElement(this.model.get('_id')); } - areEntireItemsClickable() { + get areEntireItemsClickable() { return Adapt.course.get('_boxMenu')?._areEntireItemsClickable; } } From 8410ee843d4dcb9b728e51f555605bba6c718c11 Mon Sep 17 00:00:00 2001 From: Brad Simpson Date: Tue, 9 Apr 2024 14:28:26 -0600 Subject: [PATCH 08/17] Refactor attributes() --- js/BoxMenuItemView.js | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/js/BoxMenuItemView.js b/js/BoxMenuItemView.js index c022ee6..9691c59 100644 --- a/js/BoxMenuItemView.js +++ b/js/BoxMenuItemView.js @@ -20,28 +20,19 @@ class BoxMenuItemView extends MenuItemView { attributes() { const globals = Adapt.course.get('_globals'); - const ariaLabel = []; - - if (this.model.get('_isComplete')) { - ariaLabel.push(globals._accessibility._ariaLabels.complete); - } - - if (this.model.get('_isVisited')) { - ariaLabel.push(globals._accessibility._ariaLabels.visited); - } - - if (this.model.get('_isOptional')) { - ariaLabel.push(globals._accessibility._ariaLabels.optional); - } - + const ariaLabels = globals._accessibility._ariaLabels; const data = this.model.toJSON(); - const itemCount = Handlebars.compile(globals._menu._boxMenu.itemCount)(data); - ariaLabel.push(itemCount); + const ariaLabel = [ + this.model.get('_isComplete') && ariaLabels.complete, + this.model.get('_isVisited') && ariaLabels.visited, + this.model.get('_isOptional') && ariaLabels.optional, + Handlebars.compile(globals._menu._boxMenu.itemCount)(data) + ].filter(Boolean).join(' '); return { ...super.attributes(), role: 'link', - 'aria-label': ariaLabel.join(' ') + 'aria-label': ariaLabel }; } From 7ccc4591ec7b6709637e345a8e205580d25c19ba Mon Sep 17 00:00:00 2001 From: Brad Simpson Date: Tue, 9 Apr 2024 14:30:06 -0600 Subject: [PATCH 09/17] Update itemCount in attributes() --- js/BoxMenuItemView.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/BoxMenuItemView.js b/js/BoxMenuItemView.js index 9691c59..160270e 100644 --- a/js/BoxMenuItemView.js +++ b/js/BoxMenuItemView.js @@ -22,11 +22,12 @@ class BoxMenuItemView extends MenuItemView { const globals = Adapt.course.get('_globals'); const ariaLabels = globals._accessibility._ariaLabels; const data = this.model.toJSON(); + const itemCount = globals._menu._boxMenu.itemCount; const ariaLabel = [ this.model.get('_isComplete') && ariaLabels.complete, this.model.get('_isVisited') && ariaLabels.visited, this.model.get('_isOptional') && ariaLabels.optional, - Handlebars.compile(globals._menu._boxMenu.itemCount)(data) + Handlebars.compile(itemCount)(data) ].filter(Boolean).join(' '); return { From be161399737e366a8c7f94165588e7be695e853c Mon Sep 17 00:00:00 2001 From: Brad Simpson Date: Tue, 9 Apr 2024 15:27:49 -0600 Subject: [PATCH 10/17] Move aria labels to .boxmenu-item__inner --- js/BoxMenuItemView.js | 19 ------------------- templates/boxMenuItem.hbs | 2 +- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/js/BoxMenuItemView.js b/js/BoxMenuItemView.js index 160270e..2fcb227 100644 --- a/js/BoxMenuItemView.js +++ b/js/BoxMenuItemView.js @@ -18,25 +18,6 @@ class BoxMenuItemView extends MenuItemView { }; } - attributes() { - const globals = Adapt.course.get('_globals'); - const ariaLabels = globals._accessibility._ariaLabels; - const data = this.model.toJSON(); - const itemCount = globals._menu._boxMenu.itemCount; - const ariaLabel = [ - this.model.get('_isComplete') && ariaLabels.complete, - this.model.get('_isVisited') && ariaLabels.visited, - this.model.get('_isOptional') && ariaLabels.optional, - Handlebars.compile(itemCount)(data) - ].filter(Boolean).join(' '); - - return { - ...super.attributes(), - role: 'link', - 'aria-label': ariaLabel - }; - } - onClickMenuItemButton(event) { if (event && event.preventDefault) event.preventDefault(); if (this.model.get('_isLocked')) return; diff --git a/templates/boxMenuItem.hbs b/templates/boxMenuItem.hbs index a005e7e..4e9268e 100644 --- a/templates/boxMenuItem.hbs +++ b/templates/boxMenuItem.hbs @@ -1,7 +1,7 @@ {{import_globals}} {{import_adapt}} -
+
{{#if _graphic.src}}
From ad3f8c4e3eb331b3c1a5cd8b9f4136bbfde10aee Mon Sep 17 00:00:00 2001 From: Brad Simpson Date: Thu, 18 Apr 2024 12:17:58 -0600 Subject: [PATCH 11/17] Move aria-label to new element Co-authored-by: Oliver Foster --- templates/boxMenuItem.hbs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/templates/boxMenuItem.hbs b/templates/boxMenuItem.hbs index 4e9268e..675b23b 100644 --- a/templates/boxMenuItem.hbs +++ b/templates/boxMenuItem.hbs @@ -1,7 +1,12 @@ {{import_globals}} {{import_adapt}} -
+
+ {{#if Adapt.course._boxMenu._areEntireItemsClickable}} + + {{#if _isComplete}}{{_globals._accessibility._ariaLabels.complete}}. {{else _isVisited}}{{_globals._accessibility._ariaLabels.visited}}. {{/if}}{{#if _isLocked}}{{_globals._accessibility._ariaLabels.locked}}. {{else}}{{linkText}} {{/if}}{{title}}. {{{compile _globals._menu._boxMenu.itemCount}}}.{{#if _isOptional}} {{_globals._accessibility._ariaLabels.optional}}{{/if}} + + {{/if} {{#if _graphic.src}}
From 01bcaee8ecac6b5f9eb3769a047e5ca4b8744de3 Mon Sep 17 00:00:00 2001 From: Brad Simpson Date: Thu, 18 Apr 2024 12:22:52 -0600 Subject: [PATCH 12/17] Fix typo --- templates/boxMenuItem.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/boxMenuItem.hbs b/templates/boxMenuItem.hbs index 675b23b..1be9733 100644 --- a/templates/boxMenuItem.hbs +++ b/templates/boxMenuItem.hbs @@ -1,12 +1,12 @@ {{import_globals}} {{import_adapt}} -
+
{{#if Adapt.course._boxMenu._areEntireItemsClickable}} {{#if _isComplete}}{{_globals._accessibility._ariaLabels.complete}}. {{else _isVisited}}{{_globals._accessibility._ariaLabels.visited}}. {{/if}}{{#if _isLocked}}{{_globals._accessibility._ariaLabels.locked}}. {{else}}{{linkText}} {{/if}}{{title}}. {{{compile _globals._menu._boxMenu.itemCount}}}.{{#if _isOptional}} {{_globals._accessibility._ariaLabels.optional}}{{/if}} - {{/if} + {{/if}} {{#if _graphic.src}}
From 230d46a5dbfa1393e99d924d052df44b8a1f6538 Mon Sep 17 00:00:00 2001 From: Brad Simpson Date: Thu, 18 Apr 2024 12:27:29 -0600 Subject: [PATCH 13/17] Fix missing closing if --- templates/boxMenuItem.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/boxMenuItem.hbs b/templates/boxMenuItem.hbs index 1be9733..1ac5cdb 100644 --- a/templates/boxMenuItem.hbs +++ b/templates/boxMenuItem.hbs @@ -1,7 +1,7 @@ {{import_globals}} {{import_adapt}} -
+
{{#if Adapt.course._boxMenu._areEntireItemsClickable}} {{#if _isComplete}}{{_globals._accessibility._ariaLabels.complete}}. {{else _isVisited}}{{_globals._accessibility._ariaLabels.visited}}. {{/if}}{{#if _isLocked}}{{_globals._accessibility._ariaLabels.locked}}. {{else}}{{linkText}} {{/if}}{{title}}. {{{compile _globals._menu._boxMenu.itemCount}}}.{{#if _isOptional}} {{_globals._accessibility._ariaLabels.optional}}{{/if}} From f8063268bc7252b3b8422cbbd2a0248c6de6ca0f Mon Sep 17 00:00:00 2001 From: Oliver Foster Date: Fri, 19 Apr 2024 09:35:48 +0100 Subject: [PATCH 14/17] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 174bb88..0b2b43c 100644 --- a/README.md +++ b/README.md @@ -106,7 +106,7 @@ The first value is the horizontal position and the second value is the vertical. >>>**\_small** (number): The minimum height should only be used in instances where the menu header height needs to be greater than the content e.g. to prevent a background image being cropped. ->>>**__areEntireItemsClickable** (boolean): Indicates if the entire menu item can be clicked to go to the target page. If `true`, the View button will be hidden. +>>>**\_areEntireItemsClickable** (boolean): Indicates if the entire menu item can be clicked to go to the target page. If `true`, the View button will be hidden. **\_globals** (object): The Globals object that contains value for **\_menu**. From df96e26d806b68bf4527ffcc79b8f98effdc2d37 Mon Sep 17 00:00:00 2001 From: Brad Simpson Date: Fri, 19 Apr 2024 08:15:01 -0600 Subject: [PATCH 15/17] Make boxmenu-item__inner focusable by adding tabindex attribute --- templates/boxMenuItem.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/boxMenuItem.hbs b/templates/boxMenuItem.hbs index 1ac5cdb..0ecd36e 100644 --- a/templates/boxMenuItem.hbs +++ b/templates/boxMenuItem.hbs @@ -1,7 +1,7 @@ {{import_globals}} {{import_adapt}} -
+
{{#if Adapt.course._boxMenu._areEntireItemsClickable}} {{#if _isComplete}}{{_globals._accessibility._ariaLabels.complete}}. {{else _isVisited}}{{_globals._accessibility._ariaLabels.visited}}. {{/if}}{{#if _isLocked}}{{_globals._accessibility._ariaLabels.locked}}. {{else}}{{linkText}} {{/if}}{{title}}. {{{compile _globals._menu._boxMenu.itemCount}}}.{{#if _isOptional}} {{_globals._accessibility._ariaLabels.optional}}{{/if}} From 0310042e79a4516502783e45edc9e7ca942a6e96 Mon Sep 17 00:00:00 2001 From: Brad Simpson Date: Thu, 9 May 2024 13:44:56 -0600 Subject: [PATCH 16/17] Add keydown event for keyboard navigation --- js/BoxMenuItemView.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/js/BoxMenuItemView.js b/js/BoxMenuItemView.js index 2fcb227..c520c90 100644 --- a/js/BoxMenuItemView.js +++ b/js/BoxMenuItemView.js @@ -14,12 +14,14 @@ class BoxMenuItemView extends MenuItemView { events() { return { - 'click .js-btn-click': 'onClickMenuItemButton' + 'click .js-btn-click': 'onClickMenuItemButton', + 'keydown .js-btn-click': 'onClickMenuItemButton' }; } onClickMenuItemButton(event) { if (event && event.preventDefault) event.preventDefault(); + if (event.code && (event.code !== 'Space' && event.code !== 'Enter')) return; if (this.model.get('_isLocked')) return; router.navigateToElement(this.model.get('_id')); } From 14979b330082c8ede8e0ee38d1a5c004dd39173d Mon Sep 17 00:00:00 2001 From: Brad Simpson Date: Tue, 14 May 2024 15:35:32 -0600 Subject: [PATCH 17/17] Move preventDefault Co-authored-by: Oliver Foster --- js/BoxMenuItemView.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/BoxMenuItemView.js b/js/BoxMenuItemView.js index c520c90..ab3b6fc 100644 --- a/js/BoxMenuItemView.js +++ b/js/BoxMenuItemView.js @@ -20,8 +20,8 @@ class BoxMenuItemView extends MenuItemView { } onClickMenuItemButton(event) { - if (event && event.preventDefault) event.preventDefault(); - if (event.code && (event.code !== 'Space' && event.code !== 'Enter')) return; + if (event.code && !['Space', 'Enter'].includes(event.code)) return; + if (event?.preventDefault) event.preventDefault(); if (this.model.get('_isLocked')) return; router.navigateToElement(this.model.get('_id')); }