prehistoric-systems/keepassxc-browser
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc-browser.git synced 2026-03-11 08:54:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add URL change detection to MutationObserver

Browse source
This commit is contained in:
varjolintu 2018-12-03 15:39:30 +02:00 committed by Janek Bevendorff
parent 322979dfd7
commit 2deb597137
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
keepassxc-browser/keepassxc-browser.js
View file

@ -15,7 +15,10 @@ var _detectedFields = 0;
// Element id's containing input fields detected by MutationObserver
var _observerIds = [];
browser.runtime.onMessage.addListener(function(req, sender) {
// Document URL
let _documentURL = document.location.href;
browser.runtime.onMessage.addListener(function(req, sender, callback) {
if ('action' in req) {
if (req.action === 'fill_user_pass_with_specific_login') {
if (cip.credentials[req.id]) {
@ -874,7 +877,8 @@ cipFields.isSearchField = function(target) {
if (closestForm) {
// Check form action
const formAction = closestForm.getAttribute('action');
if (formAction && formAction.includes('search')) {
if (formAction && (formAction.toLowerCase().includes('search') &&
!formAction.toLowerCase().includes('research'))) {
return true;
}
@ -882,7 +886,7 @@ cipFields.isSearchField = function(target) {
const closestFormId = closestForm.getAttribute('id');
const closestFormClass = closestForm.className;
if (closestFormClass && (closestForm.className.toLowerCase().includes('search') ||
(closestFormId && closestFormId.toLowerCase().includes('search')))) {
(closestFormId && closestFormId.toLowerCase().includes('search') && !closestFormId.toLowerCase().includes('research')))) {
return true;
}
}
@ -1336,6 +1340,14 @@ cipObserverHelper.handleObserverRemove = function(target) {
}
};
cipObserverHelper.detectURLChange = function() {
if (_documentURL !== document.location.href) {
_documentURL = document.location.href;
cipEvents.clearCredentials();
cip.initCredentialFields(true);
}
};
MutationObserver = window.MutationObserver || window.WebKitMutationObserver;
// Detects DOM changes in the document
@ -1350,6 +1362,9 @@ let observer = new MutationObserver(function(mutations, observer) {
continue;
}
// Check document URL change and detect new fields
cipObserverHelper.detectURLChange();
// Handle attributes only if CSS display is modified
if (mut.type === 'attributes') {
const newValue = mut.target.getAttribute(mut.attributeName);
@ -1362,7 +1377,7 @@ let observer = new MutationObserver(function(mutations, observer) {
}
} else if (mut.type === 'childList') {
cipObserverHelper.handleObserverAdd((mut.addedNodes.length > 0) ? mut.addedNodes[0] : mut.target);
cipObserverHelper.handleObserverRemove((mut.removedNodes.length > 0) ? mut.removedNodes[0] : mut.target);
cipObserverHelper.handleObserverRemove((mut.removedNodes.length > 0) ? mut.removedNodes[0] : mut.target);
}
}
});