Merge pull request #863 from keepassxreboot/fix/ignore_banner_on_tab_change

Ignore banner on tab change
This commit is contained in:
Sami Vänttinen 2020-04-18 17:30:36 +03:00 committed by GitHub
commit 9554fdc9d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions

View file

@ -214,13 +214,17 @@ kpxcEvent.pageClearSubmitted = function() {
return Promise.resolve();
};
kpxcEvent.pageGetSubmitted = async function() {
kpxcEvent.pageGetSubmitted = async function(tab) {
// Do not return any credentials if the tab ID does not match.
if (tab.id !== page.submittedCredentials.tabId) {
return {};
}
return page.submittedCredentials;
};
kpxcEvent.pageSetSubmitted = function(tab, args = []) {
const [ submitted, username, password, url, oldCredentials ] = args;
page.setSubmittedCredentials(submitted, username, password, url, oldCredentials);
page.setSubmittedCredentials(submitted, username, password, url, oldCredentials, tab.id);
return Promise.resolve();
};

View file

@ -180,12 +180,13 @@ page.clearLogins = function(tabId) {
page.passwordFilled = false;
};
page.setSubmittedCredentials = function(submitted, username, password, url, oldCredentials) {
page.setSubmittedCredentials = function(submitted, username, password, url, oldCredentials, tabId) {
page.submittedCredentials.submitted = submitted;
page.submittedCredentials.username = username;
page.submittedCredentials.password = password;
page.submittedCredentials.url = url;
page.submittedCredentials.oldCredentials = oldCredentials;
page.submittedCredentials.tabId = tabId;
};
page.clearSubmittedCredentials = function() {