Commit 752745ae authored by Nathan Friend's avatar Nathan Friend

Merge branch 'ps-update-keybindings-is-customizable' into 'master'

Remove boolean eql check in keybindings

See merge request gitlab-org/gitlab!56616
parents 2078af33 bb26a87d
...@@ -2,6 +2,9 @@ import { memoize } from 'lodash'; ...@@ -2,6 +2,9 @@ import { memoize } from 'lodash';
import AccessorUtilities from '~/lib/utils/accessor'; import AccessorUtilities from '~/lib/utils/accessor';
import { s__ } from '~/locale'; import { s__ } from '~/locale';
const isCustomizable = (command) =>
'customizable' in command ? Boolean(command.customizable) : true;
export const LOCAL_STORAGE_KEY = 'gl-keyboard-shortcuts-customizations'; export const LOCAL_STORAGE_KEY = 'gl-keyboard-shortcuts-customizations';
/** /**
...@@ -81,7 +84,7 @@ export const keybindingGroups = [GLOBAL_SHORTCUTS_GROUP, WEB_IDE_GROUP]; ...@@ -81,7 +84,7 @@ export const keybindingGroups = [GLOBAL_SHORTCUTS_GROUP, WEB_IDE_GROUP];
* Mousetrap.bind(keysFor(TOGGLE_PERFORMANCE_BAR), handler); * Mousetrap.bind(keysFor(TOGGLE_PERFORMANCE_BAR), handler);
*/ */
export const keysFor = (command) => { export const keysFor = (command) => {
if (command.customizable === false) { if (!isCustomizable(command)) {
// if the command is defined with `customizable: false`, // if the command is defined with `customizable: false`,
// don't allow this command to be customized. // don't allow this command to be customized.
return command.defaultKeys; return command.defaultKeys;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment