Unified Diff: lib/child/contentPolicy.js
Issue 29329742:
Issue 3251 - Simplify messaging from child scripts to parent (Closed)
Patch Set: Rebased, no return value stringification
Created Nov. 9, 2015, 11:01 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« lib/child/bootstrap.js ('k')
|
lib/child/elemHide.js » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: lib/child/contentPolicy.js |
| =================================================================== |
| --- a/lib/child/contentPolicy.js |
| +++ b/lib/child/contentPolicy.js |
| @@ -65,20 +65,20 @@ let types = new Map(); |
| function shouldAllow(window, node, contentType, location) |
| { |
| let response = sendSyncMessage("AdblockPlus:ShouldAllow", { |
| contentType: contentType, |
| location: location, |
| frames: getFrames(window), |
| isPrivate: isPrivate(window) |
| }); |
| - if (response.length == 0) |
| + if (typeof response == "undefined") |
| return true; |
| - let {allow, collapse, hits} = response[0]; |
| + let {allow, collapse, hits} = response; |
| for (let {frameIndex, contentType, docDomain, thirdParty, location, filter} of hits) |
| { |
| let context = node; |
| if (typeof frameIndex == "number") |
| { |
| context = window; |
| for (let i = 0; i < frameIndex; i++) |
| context = context.parent; |
« no previous file with comments
|
« lib/child/bootstrap.js ('k')
|
lib/child/elemHide.js » ('j')
|
no next file with comments »
