mirror of https://github.com/gorhill/uBlock.git
fix #2447
This commit is contained in:
parent
cf123b9264
commit
53b0db3d25
|
@ -454,6 +454,7 @@ body[dir="rtl"] #netFilteringDialog .dialog > div.headers > span.tools {
|
|||
border: 1px solid #ddc;
|
||||
border-radius: 4px;
|
||||
color: #888;
|
||||
cursor: pointer;
|
||||
font-size: 1.8em;
|
||||
margin: 0.1em;
|
||||
padding: 0.25em 0.5em;
|
||||
|
|
|
@ -1079,13 +1079,13 @@ var getURLFilteringData = function(details) {
|
|||
colorEntry = colors[url] = { r: 0, own: false };
|
||||
if ( suf.evaluateZ(context, url, type).r !== 0 ) {
|
||||
colorEntry.r = suf.r;
|
||||
colorEntry.own = suf.context === context && suf.url === url && suf.type === type;
|
||||
colorEntry.own = suf.r !== 0 && suf.context === context && suf.url === url && suf.type === type;
|
||||
}
|
||||
if ( response.dirty ) {
|
||||
continue;
|
||||
}
|
||||
puf.evaluateZ(context, url, type);
|
||||
response.dirty = colorEntry.own !== (puf.context === context && puf.url === url && puf.type === type);
|
||||
response.dirty = colorEntry.own !== (puf.r !== 0 && puf.context === context && puf.url === url && puf.type === type);
|
||||
}
|
||||
return response;
|
||||
};
|
||||
|
|
|
@ -274,9 +274,9 @@ URLNetFiltering.prototype.copyRules = function(other, context, urls, type) {
|
|||
while ( i-- ) {
|
||||
url = urls[i];
|
||||
other.evaluateZ(context, url, type);
|
||||
otherOwn = other.context === context && other.url === url && other.type === type;
|
||||
otherOwn = other.r !== 0 && other.context === context && other.url === url && other.type === type;
|
||||
this.evaluateZ(context, url, type);
|
||||
thisOwn = this.context === context && this.url === url && this.type === type;
|
||||
thisOwn = this.r !== 0 && this.context === context && this.url === url && this.type === type;
|
||||
if ( otherOwn && !thisOwn ) {
|
||||
this.setRule(context, url, type, other.r);
|
||||
changed = true;
|
||||
|
|
Loading…
Reference in New Issue