mirror/php-web-maker
1
0
Fork 0
mirror of https://github.com/chinchang/web-maker.git synced 2025-07-13 01:56:24 +02:00
Code Issues Releases Wiki Activity

Extract selectedElement from ifs

Browse Source
This commit is contained in:
Andrew Luca
2017-12-27 01:43:00 +02:00
parent af065b17cc
commit feabefe906
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/script.js
View File

@ -2147,8 +2147,6 @@ globalConsoleContainerEl, externalLibrarySearchInput, keyboardShortcutsModal
const ARROW_UP = event.code === 'ArrowUp'; const ARROW_UP = event.code === 'ArrowUp';
const ENTER = event.code === 'Enter'; const ENTER = event.code === 'Enter';
let selectedItemElement;
// TODO: refactor common listener code // TODO: refactor common listener code
if (CTRL_META_S) { if (CTRL_META_S) {
@ -2181,15 +2179,12 @@ globalConsoleContainerEl, externalLibrarySearchInput, keyboardShortcutsModal
if (isSavedItemsPaneOpen) { if (isSavedItemsPaneOpen) {
if (ARROW_DOWN || ARROW_UP) { const selectedItemElement = $('.js-saved-item-tile.selected');
// Return if no items present. const HAVE_PANE_ITEMS = $all('.js-saved-item-tile').length !== 0
if (!$all('.js-saved-item-tile').length) {
return;
}
if ((ARROW_DOWN || ARROW_UP) && HAVE_PANE_ITEMS) {
const method = ARROW_DOWN ? 'nextUntil' : 'previousUntil' const method = ARROW_DOWN ? 'nextUntil' : 'previousUntil'
selectedItemElement = $('.js-saved-item-tile.selected');
if (selectedItemElement) { if (selectedItemElement) {
selectedItemElement.classList.remove('selected'); selectedItemElement.classList.remove('selected');
selectedItemElement[method]('.js-saved-item-tile:not(.hide)') selectedItemElement[method]('.js-saved-item-tile:not(.hide)')
@ -2200,11 +2195,7 @@ globalConsoleContainerEl, externalLibrarySearchInput, keyboardShortcutsModal
$('.js-saved-item-tile.selected').scrollIntoView(false); $('.js-saved-item-tile.selected').scrollIntoView(false);
} }
if (ENTER) { if (ENTER && selectedItemElement) {
selectedItemElement = $('.js-saved-item-tile.selected');
if (!selectedItemElement) {
return;
}
setTimeout(function() { setTimeout(function() {
openItem(selectedItemElement.dataset.itemId); openItem(selectedItemElement.dataset.itemId);
}, 350); }, 350);
@ -2214,7 +2205,6 @@ 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 (CTRL_META_F) {
event.preventDefault(); event.preventDefault();
selectedItemElement = $('.js-saved-item-tile.selected');
setTimeout(function() { setTimeout(function() {
forkItem(savedItems[selectedItemElement.dataset.itemId]); forkItem(savedItems[selectedItemElement.dataset.itemId]);
}, 350); }, 350);