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

Merge pull request #170 from keepassxreboot/is_visible

Browse source 
Improved field ignore
This commit is contained in:
Janek Bevendorff 2018-06-08 11:28:55 +02:00 committed by GitHub
commit 8fd7bbe348
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -741,7 +741,7 @@ cipDefine.markFields = function ($chooser, $pattern) {
return true; return true;
} }
if (jQuery(this).is(':visible') && jQuery(this).css('visibility') !== 'hidden' && jQuery(this).css('visibility') !== 'collapsed') { if (cipFields.isVisible(this)) {
const $field = jQuery('<div>').addClass('b2c-fixed-field') const $field = jQuery('<div>').addClass('b2c-fixed-field')
.css('top', jQuery(this).offset().top) .css('top', jQuery(this).offset().top)
.css('left', jQuery(this).offset().left) .css('left', jQuery(this).offset().left)
@ -821,9 +821,20 @@ cipFields.prepareId = function(id) {
// Check aria-hidden attribute by looping the parent elements of input field // Check aria-hidden attribute by looping the parent elements of input field
cipFields.getAriaHidden = function(field) { cipFields.getAriaHidden = function(field) {
let $par = jQuery(field).parents(); // Check the main element
for (const p of $par) { const val = field.getAttribute('aria-hidden');
const val = $(p).attr('aria-hidden'); if (val) {
return val;
}
// Check parents
let parents = [];
while (field.parentElement) {
parents.push(field = field.parentElement);
}
for (const p of parents) {
const val = p.getAttribute('aria-hidden');
if (val) { if (val) {
return val; return val;
} }
@ -842,18 +853,36 @@ cipFields.getOverflowHidden = function(field) {
return false; return false;
}; };
cipFields.isVisible = function(field) {
const rect = field.getBoundingClientRect();
// Check CSS visibility
if (field.style.visibility && (field.style.visibility === 'hidden' || field.style.visibility === 'collapse')) {
return false;
}
// Check element position and size
if (rect.x < 0 || rect.y < 0 || rect.width < 16 || rect.height < 16) {
return false;
}
// Check aria-hidden property
if (cipFields.getAriaHidden(field) !== 'false') {
return false;
}
return true;
};
cipFields.getAllFields = function() { cipFields.getAllFields = function() {
let fields = []; let fields = [];
const inputs = cipObserverHelper.getInputs(document); const inputs = cipObserverHelper.getInputs(document);
for (const i of inputs) { for (const i of inputs) {
const ariaHidden = cipFields.getAriaHidden(i); if (cipFields.isVisible(i)) {
const overflowHidden = cipFields.getOverflowHidden(i);
if (jQuery(i).is(':visible') && jQuery(i).css('visibility') !== 'hidden' && jQuery(i).css('visibility') !== 'collapsed' && ariaHidden === 'false') {
cipFields.setUniqueId(jQuery(i)); cipFields.setUniqueId(jQuery(i));
fields.push(jQuery(i)); fields.push(jQuery(i));
} }
} };
_detectedFields = fields.length; _detectedFields = fields.length;
return fields; return fields;
@ -861,7 +890,7 @@ cipFields.getAllFields = function() {
cipFields.prepareVisibleFieldsWithID = function($pattern) { cipFields.prepareVisibleFieldsWithID = function($pattern) {
jQuery($pattern).each(function() { jQuery($pattern).each(function() {
if (jQuery(this).is(':visible') && jQuery(this).css('visibility') !== 'hidden' && jQuery(this).css('visibility') !== 'collapsed') { if (cipField.isVisible(this)) {
cipFields.setUniqueId(jQuery(this)); cipFields.setUniqueId(jQuery(this));
} }
}); });