OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
Replace obsolete Event keyCode, which properties
Alexander Brandon Coles4201cc70b86f
diff --git a/frontend/src/app/features/work-packages/components/wp-fast-table/handlers/click-or-enter-handler.ts b/frontend/src/app/features/work-packages/components/wp-fast-table/handlers/click-or-enter-handler.tsindex 39c8e387309..a5f6df36c1e 100644--- a/frontend/src/app/features/work-packages/components/wp-fast-table/handlers/click-or-enter-handler.ts+++ b/frontend/src/app/features/work-packages/components/wp-fast-table/handlers/click-or-enter-handler.ts@@ -1,4 +1,3 @@-import { KeyCodes } from 'core-app/shared/helpers/keyCodes.enum';import { TableEventComponent } from 'core-app/features/work-packages/components/wp-fast-table/handlers/table-handler-registry';import { WorkPackageTable } from '../wp-fast-table';@@ -6,7 +5,7 @@ import { WorkPackageTable } from '../wp-fast-table';* Execute the callback if the given JQuery Event is either an ENTER key or a click*/export function onClickOrEnter(evt:JQuery.TriggeredEvent, callback:() => void) {- if (evt.type === 'click' || (evt.type === 'keydown' && evt.which === KeyCodes.ENTER)) {+ if (evt.type === 'click' || (evt.type === 'keydown' && evt.key === 'Enter')) {callback();}}diff --git a/frontend/src/app/features/work-packages/components/wp-fast-table/handlers/context-menu/context-menu-keyboard-handler.ts b/frontend/src/app/features/work-packages/components/wp-fast-table/handlers/context-menu/context-menu-keyboard-handler.tsindex 74aab5a566c..105268851a4 100644--- a/frontend/src/app/features/work-packages/components/wp-fast-table/handlers/context-menu/context-menu-keyboard-handler.ts+++ b/frontend/src/app/features/work-packages/components/wp-fast-table/handlers/context-menu/context-menu-keyboard-handler.ts@@ -1,5 +1,4 @@import { Injector } from '@angular/core';-import { KeyCodes } from 'core-app/shared/helpers/keyCodes.enum';import { TableEventComponent } from 'core-app/features/work-packages/components/wp-fast-table/handlers/table-handler-registry';import { ContextMenuHandler } from './context-menu-handler';@@ -23,7 +22,7 @@ export class ContextMenuKeyboardHandler extends ContextMenuHandler {const target = jQuery(evt.target);- if (!(evt.keyCode === KeyCodes.F10 && evt.shiftKey && evt.altKey)) {+ if (!(evt.key === 'F10' && evt.shiftKey && evt.altKey)) {return true;}diff --git a/frontend/src/app/features/work-packages/components/wp-relations/wp-relation-row/wp-relation-row.component.ts b/frontend/src/app/features/work-packages/components/wp-relations/wp-relation-row/wp-relation-row.component.tsindex 458088971a0..0306e51572d 100644--- a/frontend/src/app/features/work-packages/components/wp-relations/wp-relation-row/wp-relation-row.component.ts+++ b/frontend/src/app/features/work-packages/components/wp-relations/wp-relation-row/wp-relation-row.component.ts@@ -122,7 +122,7 @@ export class WorkPackageRelationRowComponent extends UntilDestroyedMixin impleme}public handleDescriptionKey($event:JQuery.TriggeredEvent) {- if ($event.which === 27) {+ if ($event.key === 'Escape') {this.cancelDescriptionEdit();}}diff --git a/frontend/src/app/features/work-packages/components/wp-table/timeline/cells/wp-timeline-cell-mouse-handler.ts b/frontend/src/app/features/work-packages/components/wp-table/timeline/cells/wp-timeline-cell-mouse-handler.tsindex 12688ef64f2..ff3d603e3c0 100644--- a/frontend/src/app/features/work-packages/components/wp-table/timeline/cells/wp-timeline-cell-mouse-handler.ts+++ b/frontend/src/app/features/work-packages/components/wp-table/timeline/cells/wp-timeline-cell-mouse-handler.ts@@ -29,7 +29,6 @@import { Injector } from '@angular/core';import * as moment from 'moment';import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';-import { KeyCodes } from 'core-app/shared/helpers/keyCodes.enum';import { LoadingIndicatorService } from 'core-app/core/loading-indicator/loading-indicator.service';import { HalResourceEditingService } from 'core-app/shared/components/fields/edit/services/hal-resource-editing.service';@@ -128,7 +127,7 @@ export function registerWorkPackageMouseHandler(this:void,function keyPressFn(ev:JQuery.TriggeredEvent) {const kev:KeyboardEvent = ev.originalEvent as KeyboardEvent;- if (kev.keyCode === KeyCodes.ESCAPE) {+ if (kev.key === 'Escape') {deactivate(null, true);}}diff --git a/frontend/src/app/shared/components/editor/components/ckeditor/op-ckeditor.component.ts b/frontend/src/app/shared/components/editor/components/ckeditor/op-ckeditor.component.tsindex dedf008acae..344b233e563 100644--- a/frontend/src/app/shared/components/editor/components/ckeditor/op-ckeditor.component.ts+++ b/frontend/src/app/shared/components/editor/components/ckeditor/op-ckeditor.component.ts@@ -36,7 +36,7 @@ import {ICKEditorWatchdog,} from 'core-app/shared/components/editor/components/ckeditor/ckeditor.types';import { CKEditorSetupService } from 'core-app/shared/components/editor/components/ckeditor/ckeditor-setup.service';-import { KeyCodes } from 'core-app/shared/helpers/keyCodes.enum';+import { KeyCodes } from 'core-app/shared/helpers/keycodes';import { debugLog } from 'core-app/shared/helpers/debug_output';import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destroyed.mixin';@@ -271,13 +271,13 @@ export class OpCkeditorComponent extends UntilDestroyedMixin implements OnInit,editor.editing.view.document,'keydown',(evt, data) => {- if ((data.ctrlKey || data.metaKey) && data.keyCode === Number(KeyCodes.ENTER)) {+ if ((data.ctrlKey || data.metaKey) && data.keyCode === KeyCodes.ENTER) {debugLog('Sending save request from CKEditor.');this.saveRequested.emit();evt.stop();}- if (data.keyCode === Number(KeyCodes.ESCAPE)) {+ if (data.keyCode === KeyCodes.ESCAPE) {this.editorEscape.emit();evt.stop();}diff --git a/frontend/src/app/shared/components/fields/edit/field-handler/hal-resource-edit-field-handler.ts b/frontend/src/app/shared/components/fields/edit/field-handler/hal-resource-edit-field-handler.tsindex bb901b20c40..eeb68f3a618 100644--- a/frontend/src/app/shared/components/fields/edit/field-handler/hal-resource-edit-field-handler.ts+++ b/frontend/src/app/shared/components/fields/edit/field-handler/hal-resource-edit-field-handler.ts@@ -26,7 +26,6 @@// See COPYRIGHT and LICENSE files for more details.//++-import { KeyCodes } from 'core-app/shared/helpers/keyCodes.enum';import { I18nService } from 'core-app/core/i18n/i18n.service';import { ConfigurationService } from 'core-app/core/config/configuration.service';import { Injector } from '@angular/core';@@ -139,7 +138,7 @@ export class HalResourceEditFieldHandler extends EditFieldHandler {public async handleUserKeydown(event:JQuery.TriggeredEvent, onlyCancel = false) {// Only handle submission in edit modeif (this.inEditMode && !onlyCancel) {- if (event.which === KeyCodes.ENTER) {+ if (event.key === 'Enter') {await this.form.submit();return false;}@@ -147,7 +146,7 @@ export class HalResourceEditFieldHandler extends EditFieldHandler {}// Escape editing when not in edit mode- if (event.which === KeyCodes.ESCAPE) {+ if (event.key === 'Escape') {this.handleUserCancel();return false;}diff --git a/frontend/src/app/shared/components/op-context-menu/op-context-menu.service.ts b/frontend/src/app/shared/components/op-context-menu/op-context-menu.service.tsindex 3caf6146f4f..40e9d0ed7b9 100644--- a/frontend/src/app/shared/components/op-context-menu/op-context-menu.service.ts+++ b/frontend/src/app/shared/components/op-context-menu/op-context-menu.service.ts@@ -7,7 +7,6 @@ import {OpContextMenuLocalsToken,} from 'core-app/shared/components/op-context-menu/op-context-menu.types';import { OPContextMenuComponent } from 'core-app/shared/components/op-context-menu/op-context-menu.component';-import { KeyCodes } from 'core-app/shared/helpers/keyCodes.enum';import { FocusHelperService } from 'core-app/shared/directives/focus/focus-helper';@Injectable({ providedIn: 'root' })@@ -52,7 +51,7 @@ export class OPContextMenuService {// Listen to keyups on window to close context menusjQuery(window).on('keydown', (evt:JQuery.TriggeredEvent) => {- if (this.active && evt.which === KeyCodes.ESCAPE) {+ if (this.active && evt.key === 'Escape') {this.close(true);}diff --git a/frontend/src/app/shared/components/searchable-project-list/searchable-project-list.service.ts b/frontend/src/app/shared/components/searchable-project-list/searchable-project-list.service.tsindex 04a5fc40982..22adc654853 100644--- a/frontend/src/app/shared/components/searchable-project-list/searchable-project-list.service.ts+++ b/frontend/src/app/shared/components/searchable-project-list/searchable-project-list.service.ts@@ -11,7 +11,6 @@ import { IHALCollection } from 'core-app/core/apiv3/types/hal-collection.type';import { finalize, take } from 'rxjs/operators';import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';import { HttpClient } from '@angular/common/http';-import { KeyCodes } from 'core-app/shared/helpers/keyCodes.enum';import { ID } from '@datorama/akita';import { IProjectData } from './project-data';import { CurrentProjectService } from 'core-app/core/current-project/current-project.service';@@ -85,16 +84,16 @@ export class SearchableProjectListService {this.selectedItemID$.pipe(take(1)).subscribe((activeID) => {- switch (event.keyCode) {- case KeyCodes.UP_ARROW:+ switch (event.key) {+ case 'ArrowUp':event.preventDefault();this.selectPreviousResult(activeID, projects);break;- case KeyCodes.DOWN_ARROW:+ case 'ArrowDown':event.preventDefault();this.selectNextResult(activeID, projects);break;- case KeyCodes.ENTER:+ case 'Enter':event.stopPropagation();event.preventDefault();this.activateSelectedResult(event);diff --git a/frontend/src/app/shared/helpers/keyCodes.enum.ts b/frontend/src/app/shared/helpers/keyCodes.enum.tsdeleted file mode 100644index 38886526958..00000000000--- a/frontend/src/app/shared/helpers/keyCodes.enum.ts+++ /dev/null@@ -1,101 +0,0 @@-export enum KeyCodes {- BACKSPACE = 8,- TAB = 9,- ENTER = 13,- SHIFT = 16,- CTRL = 17,- ALT = 18,- PAUSE = 19,- CAPS_LOCK = 20,- ESCAPE = 27,- SPACE = 32,- PAGE_UP = 33,- PAGE_DOWN = 34,- END = 35,- HOME = 36,- LEFT_ARROW = 37,- UP_ARROW = 38,- RIGHT_ARROW = 39,- DOWN_ARROW = 40,- INSERT = 45,- DELETE = 46,- KEY_0 = 48,- KEY_1 = 49,- KEY_2 = 50,- KEY_3 = 51,- KEY_4 = 52,- KEY_5 = 53,- KEY_6 = 54,- KEY_7 = 55,- KEY_8 = 56,- KEY_9 = 57,- KEY_A = 65,- KEY_B = 66,- KEY_C = 67,- KEY_D = 68,- KEY_E = 69,- KEY_F = 70,- KEY_G = 71,- KEY_H = 72,- KEY_I = 73,- KEY_J = 74,- KEY_K = 75,- KEY_L = 76,- KEY_M = 77,- KEY_N = 78,- KEY_O = 79,- KEY_P = 80,- KEY_Q = 81,- KEY_R = 82,- KEY_S = 83,- KEY_T = 84,- KEY_U = 85,- KEY_V = 86,- KEY_W = 87,- KEY_X = 88,- KEY_Y = 89,- KEY_Z = 90,- LEFT_META = 91,- RIGHT_META = 92,- SELECT = 93,- NUMPAD_0 = 96,- NUMPAD_1 = 97,- NUMPAD_2 = 98,- NUMPAD_3 = 99,- NUMPAD_4 = 100,- NUMPAD_5 = 101,- NUMPAD_6 = 102,- NUMPAD_7 = 103,- NUMPAD_8 = 104,- NUMPAD_9 = 105,- MULTIPLY = 106,- ADD = 107,- SUBTRACT = 109,- DECIMAL = 110,- DIVIDE = 111,- F1 = 112,- F2 = 113,- F3 = 114,- F4 = 115,- F5 = 116,- F6 = 117,- F7 = 118,- F8 = 119,- F9 = 120,- F10 = 121,- F11 = 122,- F12 = 123,- NUM_LOCK = 144,- SCROLL_LOCK = 145,- SEMICOLON = 186,- EQUALS = 187,- COMMA = 188,- DASH = 189,- PERIOD = 190,- FORWARD_SLASH = 191,- GRAVE_ACCENT = 192,- OPEN_BRACKET = 219,- BACK_SLASH = 220,- CLOSE_BRACKET = 221,- SINGLE_QUOTE = 222,-}diff --git a/frontend/src/app/shared/helpers/keycodes.ts b/frontend/src/app/shared/helpers/keycodes.tsnew file mode 100644index 00000000000..eb8c702d8ae--- /dev/null+++ b/frontend/src/app/shared/helpers/keycodes.ts@@ -0,0 +1,4 @@+export const KeyCodes = {+ ENTER: 13,+ ESCAPE: 27,+};diff --git a/frontend/src/app/spot/components/drop-modal/drop-modal.component.ts b/frontend/src/app/spot/components/drop-modal/drop-modal.component.tsindex 1aed8c6cb9a..e7edc5690e1 100644--- a/frontend/src/app/spot/components/drop-modal/drop-modal.component.ts+++ b/frontend/src/app/spot/components/drop-modal/drop-modal.component.ts@@ -11,7 +11,6 @@ import {TemplateRef,ViewChild,} from '@angular/core';-import { KeyCodes } from 'core-app/shared/helpers/keyCodes.enum';import { I18nService } from 'core-app/core/i18n/i18n.service';import { findAllFocusableElementsWithin } from 'core-app/shared/helpers/focus-helpers';import { SpotDropModalTeleportationService } from './drop-modal-teleportation.service';@@ -218,7 +217,7 @@ export class SpotDropModalComponent implements OnDestroy {}private escapeCallback = (evt:KeyboardEvent) => {- if (evt.keyCode === KeyCodes.ESCAPE) {+ if (evt.key === 'Escape') {this.close();}};diff --git a/frontend/src/stimulus/controllers/dynamic/backlogs/editable_inplace.js b/frontend/src/stimulus/controllers/dynamic/backlogs/editable_inplace.jsindex a20c04b260a..0e6426d92a7 100644--- a/frontend/src/stimulus/controllers/dynamic/backlogs/editable_inplace.js+++ b/frontend/src/stimulus/controllers/dynamic/backlogs/editable_inplace.js@@ -53,10 +53,9 @@ RB.EditableInplace = (function ($) {j = $(this).parents('.model').first();that = j.data('this');- // 13 is the key code of Enter, 27 of ESC.- if (e.which === 13) {+ if (e.key === 'Enter') {that.saveEdits();- } else if (e.which === 27) {+ } else if (e.key === 'Escape') {that.cancelEdit();} else {return true;diff --git a/frontend/src/stimulus/controllers/dynamic/backlogs/model.js b/frontend/src/stimulus/controllers/dynamic/backlogs/model.jsindex fc8f0d4690c..6cee535c0b2 100644--- a/frontend/src/stimulus/controllers/dynamic/backlogs/model.js+++ b/frontend/src/stimulus/controllers/dynamic/backlogs/model.js@@ -121,7 +121,7 @@ RB.Model = (function ($) {},],close: function (e, ui) {- if (e.which === 1 || e.which === 27) {+ if (e.type === 'click' || (e.type === 'keydown' && e.key === 'Escape')) {self.cancelEdit();}},diff --git a/frontend/src/stimulus/controllers/dynamic/menus/subtree.controller.ts b/frontend/src/stimulus/controllers/dynamic/menus/subtree.controller.tsindex 0b1de1b7189..5292fb27d31 100644--- a/frontend/src/stimulus/controllers/dynamic/menus/subtree.controller.ts+++ b/frontend/src/stimulus/controllers/dynamic/menus/subtree.controller.ts@@ -49,7 +49,7 @@ export default class MenusSubtreeController extends Controller {public toggle(event:MouseEvent|KeyboardEvent):void {// ignore the event if a key different from ENTER was pressed.- if (event.type === 'keydown' && event.which !== 13) {+ if (event.type === 'keydown' && (event as KeyboardEvent).key !== 'Enter') {return;}