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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 | 67 |
68 logRequest( | 68 logRequest( |
69 popup.sourcePage, urlString, "POPUP", | 69 popup.sourcePage, urlString, "POPUP", |
70 documentHost, thirdParty, null, | 70 documentHost, thirdParty, null, |
71 specificOnly, filter | 71 specificOnly, filter |
72 ); | 72 ); |
73 } | 73 } |
74 | 74 |
75 function onPopupURLChanged(details) | 75 function onPopupURLChanged(details) |
76 { | 76 { |
| 77 // We only care about redirections within the top-level frame. |
| 78 if (details.frameId != 0) |
| 79 return; |
| 80 |
77 let popup = loadingPopups[details.tabId]; | 81 let popup = loadingPopups[details.tabId]; |
78 if (popup) | 82 if (popup) |
79 { | 83 { |
80 popup.url = details.url; | 84 popup.url = details.url; |
81 if (popup.sourceFrame) | 85 if (popup.sourceFrame) |
82 checkPotentialPopup(details.tabId, popup); | 86 checkPotentialPopup(details.tabId, popup); |
83 } | 87 } |
84 } | 88 } |
85 | 89 |
86 function onCompleted(details) | 90 function onCompleted(details) |
(...skipping 29 matching lines...) Expand all Loading... |
116 if (checkWhitelisted(popup.sourcePage, frame)) | 120 if (checkWhitelisted(popup.sourcePage, frame)) |
117 { | 121 { |
118 forgetPopup(tabId); | 122 forgetPopup(tabId); |
119 } | 123 } |
120 else | 124 else |
121 { | 125 { |
122 popup.sourceFrame = frame; | 126 popup.sourceFrame = frame; |
123 checkPotentialPopup(tabId, popup); | 127 checkPotentialPopup(tabId, popup); |
124 } | 128 } |
125 }); | 129 }); |
OLD | NEW |