1
0
mirror of https://github.com/chinchang/web-maker.git synced 2025-05-22 01:59:39 +02:00

script: variable refactoring for saveditempane kbd shortcuts

This commit is contained in:
Kushagra Gour 2018-02-03 14:11:16 +05:30
parent 2bdff6a189
commit 0b16989e63

View File

@ -2135,41 +2135,37 @@ globalConsoleContainerEl, externalLibrarySearchInput, keyboardShortcutsModal
// Editor keyboard shortucuts // Editor keyboard shortucuts
window.addEventListener('keydown', function(event) { window.addEventListener('keydown', function(event) {
const CTRL_META = event.ctrlKey || event.metaKey;
const CTRL_META_SHIFT = CTRL_META && event.shiftKey;
const CTRL_META_S = CTRL_META && event.code === 'KeyS';
const CTRL_META_O = CTRL_META && event.code === 'KeyO';
const CTRL_META_SHIFT_5 = CTRL_META_SHIFT && event.code === 'Digit5';
const CTRL_META_SHIFT_SLASH = CTRL_META_SHIFT && event.code === 'Slash';
const ESCAPE = event.code === 'Escape';
// TODO: refactor common listener code // TODO: refactor common listener code
// Ctrl/⌘ + S
if (CTRL_META_S) { if ((event.ctrlKey || event.metaKey) && event.keyCode === 83) {
event.preventDefault(); event.preventDefault();
saveItem(); saveItem();
trackEvent('ui', 'saveItemKeyboardShortcut'); trackEvent('ui', 'saveItemKeyboardShortcut');
} }
// Ctrl/⌘ + Shift + 5
if (CTRL_META_SHIFT_5) { if (
(event.ctrlKey || event.metaKey) &&
event.shiftKey &&
event.keyCode === 53
) {
event.preventDefault(); event.preventDefault();
scope.setPreviewContent(true); scope.setPreviewContent(true);
trackEvent('ui', 'previewKeyboardShortcut'); trackEvent('ui', 'previewKeyboardShortcut');
} } else if ((event.ctrlKey || event.metaKey) && event.keyCode === 79) {
// Ctrl/⌘ + O
if (CTRL_META_O) {
event.preventDefault(); event.preventDefault();
openSavedItemsPane(); openSavedItemsPane();
trackEvent('ui', 'openCreationKeyboardShortcut'); trackEvent('ui', 'openCreationKeyboardShortcut');
} } else if (
(event.ctrlKey || event.metaKey) &&
if (CTRL_META_SHIFT_SLASH) { event.shiftKey &&
event.keyCode === 191
) {
// Ctrl/⌘ + Shift + ?
event.preventDefault(); event.preventDefault();
scope.toggleModal(keyboardShortcutsModal); scope.toggleModal(keyboardShortcutsModal);
trackEvent('ui', 'showKeyboardShortcutsShortcut'); trackEvent('ui', 'showKeyboardShortcutsShortcut');
} } else if (event.keyCode === 27) {
if (ESCAPE) {
closeAllOverlays(); closeAllOverlays();
} }
}); });
@ -2179,17 +2175,17 @@ globalConsoleContainerEl, externalLibrarySearchInput, keyboardShortcutsModal
return; return;
} }
const CTRL_META = event.ctrlKey || event.metaKey; const isCtrlOrMetaPressed = event.ctrlKey || event.metaKey;
const CTRL_META_F = CTRL_META && event.code === 'KeyF'; const isForkKeyPressed = isCtrlOrMetaPressed && event.keyCode === 70;
const ARROW_DOWN = event.code === 'ArrowDown'; const isDownKeyPressed = event.keyCode === 40;
const ARROW_UP = event.code === 'ArrowUp'; const isUpKeyPressed = event.keyCode === 38;
const ENTER = event.code === 'Enter'; const isEnterKeyPressed = event.keyCode === 13;
const selectedItemElement = $('.js-saved-item-tile.selected'); const selectedItemElement = $('.js-saved-item-tile.selected');
const HAVE_PANE_ITEMS = $all('.js-saved-item-tile').length !== 0; const havePaneItems = $all('.js-saved-item-tile').length !== 0;
if ((ARROW_DOWN || ARROW_UP) && HAVE_PANE_ITEMS) { if ((isDownKeyPressed || isUpKeyPressed) && havePaneItems) {
const method = ARROW_DOWN ? 'nextUntil' : 'previousUntil'; const method = isDownKeyPressed ? 'nextUntil' : 'previousUntil';
if (selectedItemElement) { if (selectedItemElement) {
selectedItemElement.classList.remove('selected'); selectedItemElement.classList.remove('selected');
@ -2202,7 +2198,7 @@ globalConsoleContainerEl, externalLibrarySearchInput, keyboardShortcutsModal
$('.js-saved-item-tile.selected').scrollIntoView(false); $('.js-saved-item-tile.selected').scrollIntoView(false);
} }
if (ENTER && selectedItemElement) { if (isEnterKeyPressed && selectedItemElement) {
setTimeout(function() { setTimeout(function() {
openItem(selectedItemElement.dataset.itemId); openItem(selectedItemElement.dataset.itemId);
}, 350); }, 350);
@ -2210,7 +2206,7 @@ globalConsoleContainerEl, externalLibrarySearchInput, keyboardShortcutsModal
} }
// Fork shortcut inside saved creations panel with Ctrl/⌘ + F // Fork shortcut inside saved creations panel with Ctrl/⌘ + F
if (CTRL_META_F) { if (isForkKeyPressed) {
event.preventDefault(); event.preventDefault();
setTimeout(function() { setTimeout(function() {
forkItem(savedItems[selectedItemElement.dataset.itemId]); forkItem(savedItems[selectedItemElement.dataset.itemId]);