LEFT | RIGHT |
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-2017 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 |
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
12 * GNU General Public License for more details. | 12 * GNU General Public License for more details. |
13 * | 13 * |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
111 | 111 |
112 let {tabId} = details; | 112 let {tabId} = details; |
113 let popup = loadingPopups[tabId] = { | 113 let popup = loadingPopups[tabId] = { |
114 url: details.url, | 114 url: details.url, |
115 sourcePage: new ext.Page({id: details.sourceTabId}), | 115 sourcePage: new ext.Page({id: details.sourceTabId}), |
116 sourceFrame: null | 116 sourceFrame: null |
117 }; | 117 }; |
118 let frame = ext.getFrame(details.sourceTabId, details.sourceFrameId); | 118 let frame = ext.getFrame(details.sourceTabId, details.sourceFrameId); |
119 | 119 |
120 if (checkWhitelisted(popup.sourcePage, frame)) | 120 if (checkWhitelisted(popup.sourcePage, frame)) |
| 121 { |
121 forgetPopup(tabId); | 122 forgetPopup(tabId); |
| 123 } |
122 else | 124 else |
123 { | 125 { |
124 popup.sourceFrame = frame; | 126 popup.sourceFrame = frame; |
125 checkPotentialPopup(tabId, popup); | 127 checkPotentialPopup(tabId, popup); |
126 } | 128 } |
127 }); | 129 }); |
LEFT | RIGHT |