mirror of
https://github.com/gorhill/uBlock.git
synced 2024-09-03 01:29:39 +02:00
different fix for #762, which does not create a regression of 435
This commit is contained in:
parent
135ad95d61
commit
ea4d5a9710
@ -474,21 +474,27 @@ var uBlockCollapser = (function() {
|
||||
var elem, shadow;
|
||||
while ( i-- ) {
|
||||
elem = elems[i];
|
||||
// https://github.com/gorhill/uBlock/issues/762
|
||||
// Always hide using inline style.
|
||||
elem.style.setProperty('display', 'none', 'important');
|
||||
shadow = elem.shadowRoot;
|
||||
// https://www.chromestatus.com/features/4668884095336448
|
||||
// "Multiple shadow roots is being deprecated."
|
||||
if ( elem.shadowRoot !== null ) {
|
||||
if ( shadow !== null ) {
|
||||
if ( shadow.className !== sessionId ) {
|
||||
elem.style.setProperty('display', 'none', 'important');
|
||||
}
|
||||
continue;
|
||||
}
|
||||
// https://github.com/gorhill/uBlock/pull/555
|
||||
// Not all nodes can be shadowed:
|
||||
// https://github.com/w3c/webcomponents/issues/102
|
||||
// https://github.com/gorhill/uBlock/issues/762
|
||||
// Remove display style that might get in the way of the shadow
|
||||
// node doing its magic.
|
||||
try {
|
||||
shadow = elem.createShadowRoot();
|
||||
shadow.className = sessionId;
|
||||
elem.style.removeProperty('display');
|
||||
} catch (ex) {
|
||||
elem.style.setProperty('display', 'none', 'important');
|
||||
}
|
||||
}
|
||||
};
|
||||
|
@ -183,21 +183,27 @@ var hideElements = function(selectors) {
|
||||
var elem, shadow;
|
||||
while ( i-- ) {
|
||||
elem = elems[i];
|
||||
// https://github.com/gorhill/uBlock/issues/762
|
||||
// Always hide using inline style.
|
||||
elem.style.setProperty('display', 'none', 'important');
|
||||
shadow = elem.shadowRoot;
|
||||
// https://www.chromestatus.com/features/4668884095336448
|
||||
// "Multiple shadow roots is being deprecated."
|
||||
if ( elem.shadowRoot !== null ) {
|
||||
if ( shadow !== null ) {
|
||||
if ( shadow.className !== sessionId ) {
|
||||
elem.style.setProperty('display', 'none', 'important');
|
||||
}
|
||||
continue;
|
||||
}
|
||||
// https://github.com/gorhill/uBlock/pull/555
|
||||
// Not all nodes can be shadowed:
|
||||
// https://github.com/w3c/webcomponents/issues/102
|
||||
// https://github.com/gorhill/uBlock/issues/762
|
||||
// Remove display style that might get in the way of the shadow
|
||||
// node doing its magic.
|
||||
try {
|
||||
shadow = elem.createShadowRoot();
|
||||
shadow.className = sessionId;
|
||||
elem.style.removeProperty('display');
|
||||
} catch (ex) {
|
||||
elem.style.setProperty('display', 'none', 'important');
|
||||
}
|
||||
}
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user