Left: | ||
Right: |
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-present eyeo GmbH | 3 * Copyright (C) 2006-present 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 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
256 details.parentFrameId); | 256 details.parentFrameId); |
257 }, | 257 }, |
258 {types: ["main_frame", "sub_frame"], urls: ["http://*/*", "https://*/*"]}, | 258 {types: ["main_frame", "sub_frame"], urls: ["http://*/*", "https://*/*"]}, |
259 ["responseHeaders"]); | 259 ["responseHeaders"]); |
260 | 260 |
261 browser.webNavigation.onBeforeNavigate.addListener(details => | 261 browser.webNavigation.onBeforeNavigate.addListener(details => |
262 { | 262 { |
263 // Since we can only listen for HTTP(S) responses using | 263 // Since we can only listen for HTTP(S) responses using |
264 // webRequest.onHeadersReceived we must update the page structure here for | 264 // webRequest.onHeadersReceived we must update the page structure here for |
265 // other navigations. | 265 // other navigations. |
266 let url = new URL(details.url); | 266 let {url} = details; |
267 if ((url.protocol != "http:" && url.protocol != "https:") || | 267 if (!(url.startsWith("http:") || |
268 // Chrome doesn't dispatch webRequest.onHeadersReceived for | 268 url.startsWith("https:") && |
269 // Web Store URLs. | 269 // Chrome doesn't dispatch webRequest.onHeadersReceived |
270 url.href.startsWith("https://chrome.google.com/webstore/")) | 270 // for Web Store URLs. |
kzar
2018/01/05 16:46:20
I guess we should only do this for Chrome (or Chro
Manish Jethani
2018/01/12 07:25:03
Ideally yes, but it's probably OK if the frame str
Manish Jethani
2018/01/12 07:31:57
By the way, if it wasn't for Edge, we could have u
| |
271 { | 271 !url.startsWith("https://chrome.google.com/webstore/"))) |
272 updatePageFrameStructure(details.frameId, details.tabId, details.url, | 272 { |
273 updatePageFrameStructure(details.frameId, details.tabId, url, | |
273 details.parentFrameId); | 274 details.parentFrameId); |
274 } | 275 } |
275 }); | 276 }); |
276 | 277 |
277 function forgetTab(tabId) | 278 function forgetTab(tabId) |
278 { | 279 { |
279 ext.pages.onRemoved._dispatch(tabId); | 280 ext.pages.onRemoved._dispatch(tabId); |
280 | 281 |
281 ext._removeFromAllPageMaps(tabId); | 282 ext._removeFromAllPageMaps(tabId); |
282 framesOfTabs.delete(tabId); | 283 framesOfTabs.delete(tabId); |
(...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
689 ext.windows = { | 690 ext.windows = { |
690 create(createData, callback) | 691 create(createData, callback) |
691 { | 692 { |
692 browser.windows.create(createData, createdWindow => | 693 browser.windows.create(createData, createdWindow => |
693 { | 694 { |
694 afterTabLoaded(callback)(createdWindow.tabs[0]); | 695 afterTabLoaded(callback)(createdWindow.tabs[0]); |
695 }); | 696 }); |
696 } | 697 } |
697 }; | 698 }; |
698 } | 699 } |
LEFT | RIGHT |