| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * This file is part of Adblock Plus <https://adblockplus.org/>, | 2  * This file is part of Adblock Plus <https://adblockplus.org/>, | 
| 3  * Copyright (C) 2006-2016 Eyeo GmbH | 3  * Copyright (C) 2006-2016 Eyeo GmbH | 
| 4  * | 4  * | 
| 5  * Adblock Plus is free software: you can redistribute it and/or modify | 5  * Adblock Plus is free software: you can redistribute it and/or modify | 
| 6  * it under the terms of the GNU General Public License version 3 as | 6  * it under the terms of the GNU General Public License version 3 as | 
| 7  * published by the Free Software Foundation. | 7  * published by the Free Software Foundation. | 
| 8  * | 8  * | 
| 9  * Adblock Plus is distributed in the hope that it will be useful, | 9  * Adblock Plus is distributed in the hope that it will be useful, | 
| 10  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| (...skipping 23 matching lines...) Expand all  Loading... | 
| 34                         RegExpFilter.typeMap.ELEMHIDE)) | 34                         RegExpFilter.typeMap.ELEMHIDE)) | 
| 35   { | 35   { | 
| 36     let specificOnly = checkWhitelisted(sender.page, sender.frame, | 36     let specificOnly = checkWhitelisted(sender.page, sender.frame, | 
| 37                                         RegExpFilter.typeMap.GENERICHIDE); | 37                                         RegExpFilter.typeMap.GENERICHIDE); | 
| 38     selectors = ElemHide.getSelectorsForDomain( | 38     selectors = ElemHide.getSelectorsForDomain( | 
| 39       extractHostFromFrame(sender.frame), | 39       extractHostFromFrame(sender.frame), | 
| 40       specificOnly ? ElemHide.SPECIFIC_ONLY : ElemHide.ALL_MATCHING | 40       specificOnly ? ElemHide.SPECIFIC_ONLY : ElemHide.ALL_MATCHING | 
| 41     ); | 41     ); | 
| 42   } | 42   } | 
| 43   else | 43   else | 
| 44   { |  | 
| 45     selectors = []; | 44     selectors = []; | 
| 46   } |  | 
| 47 | 45 | 
| 48   return {selectors: selectors, trace: trace}; | 46   return {selectors, trace}; | 
| 49 }); | 47 }); | 
| 50 | 48 | 
| 51 port.on("forward", (msg, sender) => | 49 port.on("forward", (msg, sender) => | 
| 52 { | 50 { | 
| 53   let targetPage; | 51   let targetPage; | 
| 54   if (msg.targetPageId) | 52   if (msg.targetPageId) | 
| 55     targetPage = ext.getPage(msg.targetPageId); | 53     targetPage = ext.getPage(msg.targetPageId); | 
| 56   else | 54   else | 
| 57     targetPage = sender.page; | 55     targetPage = sender.page; | 
| 58 | 56 | 
| 59   if (targetPage) | 57   if (targetPage) | 
| 60   { | 58   { | 
| 61     msg.payload.sender = sender.page.id; | 59     msg.payload.sender = sender.page.id; | 
| 62     if (msg.expectsResponse) | 60     if (msg.expectsResponse) | 
| 63       return new Promise(targetPage.sendMessage.bind(targetPage, msg.payload)); | 61       return new Promise(targetPage.sendMessage.bind(targetPage, msg.payload)); | 
| 64     targetPage.sendMessage(msg.payload); | 62     targetPage.sendMessage(msg.payload); | 
| 65   } | 63   } | 
| 66 }); | 64 }); | 
| OLD | NEW | 
|---|