open.source/stylus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: keydown on input would trigger hotkeys

Browse Source
This commit is contained in:
eight 2017-12-05 09:28:13 +08:00
parent 6084da9c95
commit f88d8a2566
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
popup/hotkeys.js
View File

@ -6,13 +6,22 @@ window.addEventListener('showStyles:done', function _() {
let togglablesShown = true; let togglablesShown = true;
let togglables = getTogglables(); let togglables = getTogglables();
let enabled = true;
window.addEventListener('keydown', onKeyDown); window.addEventListener('keydown', onKeyDown);
window.hotkeys = {
enable() {
enabled = true;
},
disable() {
enabled = false;
}
};
initHotkeyInfo(); initHotkeyInfo();
return; return;
function onKeyDown(event) { function onKeyDown(event) {
if (event.ctrlKey || event.altKey || event.metaKey) { if (event.ctrlKey || event.altKey || event.metaKey || !enabled) {
return; return;
} }
let entry; let entry;

9
popup/popup.js
View File

@ -362,9 +362,12 @@ Object.assign(handleEvent, {
configure(event) { configure(event) {
const {styleId, styleIsUsercss} = handleEvent.getClickedStyleElement(event); const {styleId, styleIsUsercss} = handleEvent.getClickedStyleElement(event);
if (styleIsUsercss) { if (styleIsUsercss) {
getStylesSafe({id: styleId}) getStylesSafe({id: styleId}).then(([style]) => {
.then(([style]) => style) hotkeys.disable();
.then(configDialog); configDialog(style).then(() => {
hotkeys.enable();
});
});
} }
}, },