keeweb
/
keeweb
mirror of https://github.com/keeweb/keeweb.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix #1288: issues when opening a file during in auto-type mode

This commit is contained in:
antelle 2019-10-08 20:09:06 +02:00
parent 3c6c929854
commit 77423ad833
7 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/scripts/auto-type/index.js
View File

@ -254,7 +254,6 @@ const AutoType = {
Events.emit('open-file'); Events.emit('open-file');
Events.once('closed-open-view', () => { Events.once('closed-open-view', () => {
this.selectEntryView.show(); this.selectEntryView.show();
this.selectEntryView.setupKeys();
}); });
}); });
}, },

2
app/scripts/comp/browser/key-handler.js
View File

@ -63,7 +63,7 @@ class KeyHandler {
const keyShortcuts = this.shortcuts[code]; const keyShortcuts = this.shortcuts[code];
if (keyShortcuts && keyShortcuts.length) { if (keyShortcuts && keyShortcuts.length) {
for (const sh of keyShortcuts) { for (const sh of keyShortcuts) {
if (this.modal && sh.modal !== this.modal) { if (this.modal && (sh.modal !== this.modal || sh.modal === '*')) {
e.stopPropagation(); e.stopPropagation();
continue; continue;
} }

3
app/scripts/views/app-view.js
View File

@ -103,7 +103,8 @@ class AppView extends View {
this.onKey( this.onKey(
Keys.DOM_VK_I, Keys.DOM_VK_I,
this.openDevTools, this.openDevTools,
KeyHandler.SHORTCUT_ACTION + KeyHandler.SHORTCUT_OPT KeyHandler.SHORTCUT_ACTION + KeyHandler.SHORTCUT_OPT,
'*'
); );
} }

6
app/scripts/views/auto-type/auto-type-select-view.js
View File

@ -61,6 +61,12 @@ class AutoTypeSelectView extends View {
this.once('remove', () => { this.once('remove', () => {
KeyHandler.setModal(null); KeyHandler.setModal(null);
}); });
this.on('show', () => {
KeyHandler.setModal('auto-type');
});
this.on('hide', () => {
KeyHandler.setModal(null);
});
} }
render() { render() {

3
app/scripts/views/modal-view.js
View File

@ -21,9 +21,10 @@ class ModalView extends View {
if (typeof this.model.enter === 'string') { if (typeof this.model.enter === 'string') {
this.onKey(Keys.DOM_VK_RETURN, this.enterPressed, false, 'alert'); this.onKey(Keys.DOM_VK_RETURN, this.enterPressed, false, 'alert');
} }
const prevModal = KeyHandler.modal;
KeyHandler.setModal('alert'); KeyHandler.setModal('alert');
this.once('remove', () => { this.once('remove', () => {
KeyHandler.setModal(null); KeyHandler.setModal(prevModal);
if (this.model.view) { if (this.model.view) {
this.model.view.remove(); this.model.view.remove();
} }

14
app/scripts/views/open-view.js
View File

@ -60,15 +60,17 @@ class OpenView extends View {
super(model); super(model);
this.resetParams(); this.resetParams();
this.passwordInput = new SecureInput(); this.passwordInput = new SecureInput();
this.onKey(Keys.DOM_VK_Z, this.undoKeyPress, KeyHandler.SHORTCUT_ACTION); this.onKey(Keys.DOM_VK_Z, this.undoKeyPress, KeyHandler.SHORTCUT_ACTION, 'open');
this.onKey(Keys.DOM_VK_TAB, this.tabKeyPress); this.onKey(Keys.DOM_VK_TAB, this.tabKeyPress, null, 'open');
this.onKey(Keys.DOM_VK_ENTER, this.enterKeyPress); this.onKey(Keys.DOM_VK_ENTER, this.enterKeyPress, null, 'open');
this.onKey(Keys.DOM_VK_RETURN, this.enterKeyPress); this.onKey(Keys.DOM_VK_RETURN, this.enterKeyPress, null, 'open');
this.onKey(Keys.DOM_VK_DOWN, this.moveOpenFileSelectionDown); this.onKey(Keys.DOM_VK_DOWN, this.moveOpenFileSelectionDown, null, 'open');
this.onKey(Keys.DOM_VK_UP, this.moveOpenFileSelectionUp); this.onKey(Keys.DOM_VK_UP, this.moveOpenFileSelectionUp, null, 'open');
this.listenTo(Events, 'main-window-focus', this.windowFocused.bind(this)); this.listenTo(Events, 'main-window-focus', this.windowFocused.bind(this));
KeyHandler.setModal('open');
this.once('remove', () => { this.once('remove', () => {
this.passwordInput.reset(); this.passwordInput.reset();
KeyHandler.setModal(null);
}); });
} }

1
release-notes.md
View File

@ -2,6 +2,7 @@ Release notes
------------- -------------
##### v1.11.7 (2019-10-08) ##### v1.11.7 (2019-10-08)
`-` fix #1289: crash on Auto sorting mode `-` fix #1289: crash on Auto sorting mode
`-` fix #1288: issues when opening a file during in auto-type mode
##### v1.11.6 (2019-10-04) ##### v1.11.6 (2019-10-04)
`-` fix #1285: issues in moving entries across files `-` fix #1285: issues in moving entries across files