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

change of mind: removing 3p-passive because redundancy, better to work on doc

This commit is contained in:
gorhill 2015-07-27 09:20:47 -04:00
parent eeb48844c2
commit 8dd21c5f49
4 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/js/dynamic-net-filtering.js
View File

@ -46,8 +46,7 @@ var supportedDynamicTypes = {
'inline-script': true, 'inline-script': true,
'1p-script': true, '1p-script': true,
'3p-script': true, '3p-script': true,
'3p-frame': true, '3p-frame': true
'3p-passive': true
}; };
var typeBitOffsets = { var typeBitOffsets = {
@ -57,8 +56,7 @@ var typeBitOffsets = {
'3p-script': 6, '3p-script': 6,
'3p-frame': 8, '3p-frame': 8,
'image': 10, 'image': 10,
'3p': 12, '3p': 12
'3p-passive': 14
}; };
var actionToNameMap = { var actionToNameMap = {
@ -388,9 +386,7 @@ Matrix.prototype.evaluateCellZY = function(srcHostname, desHostname, type) {
// Specific party // Specific party
if ( thirdParty ) { if ( thirdParty ) {
// 3rd-party, specific type // 3rd-party, specific type
if ( type === 'image' || type === 'stylesheet' ) { if ( type === 'script' ) {
if ( this.evaluateCellZ(srcHostname, '*', '3p-passive') !== 0 ) { return this; }
} else if ( type === 'script' ) {
if ( this.evaluateCellZ(srcHostname, '*', '3p-script') !== 0 ) { return this; } if ( this.evaluateCellZ(srcHostname, '*', '3p-script') !== 0 ) { return this; }
} else if ( type === 'sub_frame' ) { } else if ( type === 'sub_frame' ) {
if ( this.evaluateCellZ(srcHostname, '*', '3p-frame') !== 0 ) { return this; } if ( this.evaluateCellZ(srcHostname, '*', '3p-frame') !== 0 ) { return this; }

2
src/js/messaging.js
View File

@ -245,7 +245,6 @@ var getFirewallRules = function(srcHostname, desHostnames) {
r['/ * *'] = df.evaluateCellZY('*', '*', '*').toFilterString(); r['/ * *'] = df.evaluateCellZY('*', '*', '*').toFilterString();
r['/ * image'] = df.evaluateCellZY('*', '*', 'image').toFilterString(); r['/ * image'] = df.evaluateCellZY('*', '*', 'image').toFilterString();
r['/ * 3p'] = df.evaluateCellZY('*', '*', '3p').toFilterString(); r['/ * 3p'] = df.evaluateCellZY('*', '*', '3p').toFilterString();
r['/ * 3p-passive'] = df.evaluateCellZY('*', '*', '3p-passive').toFilterString();
r['/ * inline-script'] = df.evaluateCellZY('*', '*', 'inline-script').toFilterString(); r['/ * inline-script'] = df.evaluateCellZY('*', '*', 'inline-script').toFilterString();
r['/ * 1p-script'] = df.evaluateCellZY('*', '*', '1p-script').toFilterString(); r['/ * 1p-script'] = df.evaluateCellZY('*', '*', '1p-script').toFilterString();
r['/ * 3p-script'] = df.evaluateCellZY('*', '*', '3p-script').toFilterString(); r['/ * 3p-script'] = df.evaluateCellZY('*', '*', '3p-script').toFilterString();
@ -257,7 +256,6 @@ var getFirewallRules = function(srcHostname, desHostnames) {
r['. * *'] = df.evaluateCellZY(srcHostname, '*', '*').toFilterString(); r['. * *'] = df.evaluateCellZY(srcHostname, '*', '*').toFilterString();
r['. * image'] = df.evaluateCellZY(srcHostname, '*', 'image').toFilterString(); r['. * image'] = df.evaluateCellZY(srcHostname, '*', 'image').toFilterString();
r['. * 3p'] = df.evaluateCellZY(srcHostname, '*', '3p').toFilterString(); r['. * 3p'] = df.evaluateCellZY(srcHostname, '*', '3p').toFilterString();
r['. * 3p-passive'] = df.evaluateCellZY(srcHostname, '*', '3p-passive').toFilterString();
r['. * inline-script'] = df.evaluateCellZY(srcHostname, '*', 'inline-script').toFilterString(); r['. * inline-script'] = df.evaluateCellZY(srcHostname, '*', 'inline-script').toFilterString();
r['. * 1p-script'] = df.evaluateCellZY(srcHostname, '*', '1p-script').toFilterString(); r['. * 1p-script'] = df.evaluateCellZY(srcHostname, '*', '1p-script').toFilterString();
r['. * 3p-script'] = df.evaluateCellZY(srcHostname, '*', '3p-script').toFilterString(); r['. * 3p-script'] = df.evaluateCellZY(srcHostname, '*', '3p-script').toFilterString();

2
src/js/popup.js
View File

@ -321,7 +321,7 @@ var buildAllFirewallRows = function() {
// Remove and reuse all rows: the order may have changed, we can't just // Remove and reuse all rows: the order may have changed, we can't just
// reuse them in-place. // reuse them in-place.
rowsToRecycle = uDom('#firewallContainer > div:nth-of-type(8) ~ div').detach(); rowsToRecycle = uDom('#firewallContainer > div:nth-of-type(7) ~ div').detach();
var n = allHostnameRows.length; var n = allHostnameRows.length;
for ( var i = 0; i < n; i++ ) { for ( var i = 0; i < n; i++ ) {

1
src/popup.html
View File

@ -38,7 +38,6 @@
<div><span data-i18n="popupAnyRulePrompt"></span><span data-src="/" data-des="*" data-type="*"> </span><span data-src="." data-des="*" data-type="*"> </span></div> <div><span data-i18n="popupAnyRulePrompt"></span><span data-src="/" data-des="*" data-type="*"> </span><span data-src="." data-des="*" data-type="*"> </span></div>
<div><span data-i18n="popupImageRulePrompt"></span><span data-src="/" data-des="*" data-type="image"> </span><span data-src="." data-des="*" data-type="image"> </span></div> <div><span data-i18n="popupImageRulePrompt"></span><span data-src="/" data-des="*" data-type="image"> </span><span data-src="." data-des="*" data-type="image"> </span></div>
<div><span data-i18n="popup3pAnyRulePrompt"></span><span data-src="/" data-des="*" data-type="3p"> </span><span data-src="." data-des="*" data-type="3p"> </span></div> <div><span data-i18n="popup3pAnyRulePrompt"></span><span data-src="/" data-des="*" data-type="3p"> </span><span data-src="." data-des="*" data-type="3p"> </span></div>
<div><span data-i18n="popup3pPassiveRulePrompt"></span><span data-src="/" data-des="*" data-type="3p-passive"> </span><span data-src="." data-des="*" data-type="3p-passive"> </span></div>
<div><span data-i18n="popupInlineScriptRulePrompt"></span><span data-src="/" data-des="*" data-type="inline-script"> </span><span data-src="." data-des="*" data-type="inline-script"> </span></div> <div><span data-i18n="popupInlineScriptRulePrompt"></span><span data-src="/" data-des="*" data-type="inline-script"> </span><span data-src="." data-des="*" data-type="inline-script"> </span></div>
<div><span data-i18n="popup1pScriptRulePrompt"></span><span data-src="/" data-des="*" data-type="1p-script"> </span><span data-src="." data-des="*" data-type="1p-script"> </span></div> <div><span data-i18n="popup1pScriptRulePrompt"></span><span data-src="/" data-des="*" data-type="1p-script"> </span><span data-src="." data-des="*" data-type="1p-script"> </span></div>
<div><span data-i18n="popup3pScriptRulePrompt"></span><span data-src="/" data-des="*" data-type="3p-script"> </span><span data-src="." data-des="*" data-type="3p-script"> </span></div> <div><span data-i18n="popup3pScriptRulePrompt"></span><span data-src="/" data-des="*" data-type="3p-script"> </span><span data-src="." data-des="*" data-type="3p-script"> </span></div>