Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix #2447

This commit is contained in:
gorhill 2017-03-14 15:09:40 -04:00
parent cf123b9264
commit 53b0db3d25
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/css/logger-ui.css
View File

@ -454,6 +454,7 @@ body[dir="rtl"] #netFilteringDialog .dialog > div.headers > span.tools {
border: 1px solid #ddc; border: 1px solid #ddc;
border-radius: 4px; border-radius: 4px;
color: #888; color: #888;
cursor: pointer;
font-size: 1.8em; font-size: 1.8em;
margin: 0.1em; margin: 0.1em;
padding: 0.25em 0.5em; padding: 0.25em 0.5em;

4
src/js/messaging.js
View File

@ -1079,13 +1079,13 @@ var getURLFilteringData = function(details) {
colorEntry = colors[url] = { r: 0, own: false }; colorEntry = colors[url] = { r: 0, own: false };
if ( suf.evaluateZ(context, url, type).r !== 0 ) { if ( suf.evaluateZ(context, url, type).r !== 0 ) {
colorEntry.r = suf.r; 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 ) { if ( response.dirty ) {
continue; continue;
} }
puf.evaluateZ(context, url, type); 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; return response;
}; };

4
src/js/url-net-filtering.js
View File

@ -274,9 +274,9 @@ URLNetFiltering.prototype.copyRules = function(other, context, urls, type) {
while ( i-- ) { while ( i-- ) {
url = urls[i]; url = urls[i];
other.evaluateZ(context, url, type); 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); 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 ) { if ( otherOwn && !thisOwn ) {
this.setRule(context, url, type, other.r); this.setRule(context, url, type, other.r);
changed = true; changed = true;