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

windowId gets passed in a different place

pull/1511/head
b3nj4m1n 2020-05-21 21:36:26 +02:00
parent 1f83f34e55
commit 02e4d52db6
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,8 +58,8 @@ const AutoType = {
}
},
runAndHandleResult(result) {
this.run(result, err => {
runAndHandleResult(result, windowId) {
this.run(result, windowId, err => {
if (err) {
Alerts.error({
header: Locale.autoTypeError,
@ -73,7 +73,7 @@ const AutoType = {
}
},
run(result, callback) {
run(result, windowId, callback) {
this.running = true;
const sequence = result.sequence || result.entry.getEffectiveAutoTypeSeq();
logger.debug('Start', sequence);
@ -107,7 +107,7 @@ const AutoType = {
}
logger.debug('Complete', logger.ts(ts));
return callback && callback();
}, this.windowId);
}, windowId);
});
} catch (ex) {
this.running = false;
@ -185,7 +185,6 @@ const AutoType = {
logger.debug('Error during active window check, something is wrong', err);
return callback(false);
}
this.windowId = windowInfo.id;
if (activeWindowInfo.id !== windowInfo.id && Launcher.platform() !== 'linux') {
logger.info(
`Active window doesn't match: ID is different. ` +
@ -227,7 +226,7 @@ const AutoType = {
const entries = evt.filter.getEntries();
if (entries.length === 1 && AppSettingsModel.directAutotype) {
this.hideWindow(() => {
this.runAndHandleResult({ entry: entries[0] });
this.runAndHandleResult({ entry: entries[0] }, evt.windowInfo.id);
});
return;
}
@ -243,7 +242,7 @@ const AutoType = {
if (result) {
this.activeWindowMatches(evt.windowInfo, (matches, activeWindowInfo) => {
if (matches) {
this.runAndHandleResult(result);
this.runAndHandleResult(result, evt.windowInfo.id);
}
});
}