Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-02 00:42:45 +01:00
Code Issues Releases Wiki Activity

Better lookup all elements under mouse cursor in element picker

Browse Source 
Related feedback:
- https://www.reddit.com/r/uBlockOrigin/comments/pefaov/elementpickerzapper_often_misses_images/hcnycbx/?context=3
This commit is contained in:
Raymond Hill 2021-09-13 10:39:17 -04:00
parent 1219d57561
commit d930504e3e
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/js/scriptlets/epicker.js
View File

@ -524,11 +524,6 @@ const filtersFrom = function(x, y) {
x = undefined; x = undefined;
} }
// Network filter from element which was clicked.
if ( first !== null ) {
netFilterFromElement(first);
}
// Cosmetic filter candidates from ancestors. // Cosmetic filter candidates from ancestors.
// https://github.com/gorhill/uBlock/issues/2519 // https://github.com/gorhill/uBlock/issues/2519
// https://github.com/uBlockOrigin/uBlock-issues/issues/17 // https://github.com/uBlockOrigin/uBlock-issues/issues/17
@ -549,23 +544,15 @@ const filtersFrom = function(x, y) {
} }
// https://github.com/gorhill/uBlock/issues/1545 // https://github.com/gorhill/uBlock/issues/1545
// Network filter candidates from all other elements found at // Network filter candidates from all other elements found at [x,y].
// point (x, y).
if ( typeof x === 'number' ) { if ( typeof x === 'number' ) {
const attrName = vAPI.sessionId + '-clickblind'; const magicAttr = `${vAPI.sessionId}-clickblind`;
elem = first; pickerRoot.setAttribute(magicAttr, '');
while ( elem !== null ) { const elems = document.elementsFromPoint(x, y);
const previous = elem; pickerRoot.removeAttribute(magicAttr);
elem.setAttribute(attrName, ''); for ( const elem of elems ) {
elem = elementFromPoint(x, y);
if ( elem === null || elem === previous ) { break; }
netFilterFromElement(elem); netFilterFromElement(elem);
} }
for ( const elem of document.querySelectorAll(`[${attrName}]`) ) {
elem.removeAttribute(attrName);
}
netFilterFromElement(document.body);
} }
return netFilterCandidates.length + cosmeticFilterCandidates.length; return netFilterCandidates.length + cosmeticFilterCandidates.length;