| Left: | ||
| Right: |
| 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-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 20 matching lines...) Expand all Loading... | |
| 31 browser.tabs.query({}, tabs => | 31 browser.tabs.query({}, tabs => |
| 32 { | 32 { |
| 33 // We find a tab ourselves because Edge has a bug when quering tabs with | 33 // We find a tab ourselves because Edge has a bug when quering tabs with |
| 34 // extension URL protocol: | 34 // extension URL protocol: |
| 35 // https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/8094 141/ | 35 // https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/8094 141/ |
| 36 // https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/8604 703/ | 36 // https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/8604 703/ |
| 37 // Firefox won't let us query for moz-extension:// pages either, though | 37 // Firefox won't let us query for moz-extension:// pages either, though |
| 38 // starting with Firefox 56 an extension can query for its own URLs: | 38 // starting with Firefox 56 an extension can query for its own URLs: |
| 39 // https://bugzilla.mozilla.org/show_bug.cgi?id=1271354 | 39 // https://bugzilla.mozilla.org/show_bug.cgi?id=1271354 |
| 40 let fullOptionsUrl = browser.extension.getURL(optionsUrl); | 40 let fullOptionsUrl = browser.extension.getURL(optionsUrl); |
| 41 callback(tabs.find(element => element.url == fullOptionsUrl)); | 41 let optionsTab = tabs.find(tab => tab.url == fullOptionsUrl); |
| 42 | |
| 43 if (optionsTab) | |
| 44 callback(optionsTab); | |
|
Wladimir Palant
2017/11/11 18:34:14
Maybe reduce the indentation level here:
if (op
kzar
2017/11/13 12:32:57
Done.
| |
| 45 else | |
| 46 { | |
| 47 // It seems that the url property isn't always set for the tab with | |
| 48 // Firefox 57 on Windows 10 until the tab has finished loading. Until | |
| 49 // then the url is given as "about:blank", but the title is the URL | |
| 50 // we expect (minus the protocol part). | |
|
Wladimir Palant
2017/11/11 18:34:14
That's too many details IMHO. We don't really know
kzar
2017/11/13 12:32:57
Done.
| |
| 51 let {hostname, pathname} = new URL(fullOptionsUrl); | |
| 52 let potentialOptionsTab = tabs.find( | |
| 53 tab => tab.url == "about:blank" && | |
| 54 tab.title == hostname + pathname && | |
|
Wladimir Palant
2017/11/11 18:34:14
I don't think that we should rely on the tab title
kzar
2017/11/13 12:32:57
Done.
| |
| 55 tab.status == "loading" | |
| 56 ); | |
| 57 | |
| 58 if (potentialOptionsTab) | |
|
Wladimir Palant
2017/11/11 18:34:14
Maybe reduce indentation level here as well:
if
kzar
2017/11/13 12:32:57
Done.
| |
| 59 { | |
| 60 let onRemoved; | |
| 61 let updateListener = (tabId, changeInfo, tab) => | |
|
Wladimir Palant
2017/11/11 18:34:14
What about consistent naming? Meaning either remov
kzar
2017/11/13 12:32:57
Done.
| |
| 62 { | |
| 63 if (tabId == potentialOptionsTab.id && | |
| 64 changeInfo.status == "complete") | |
| 65 { | |
| 66 browser.tabs.onUpdated.removeListener(updateListener); | |
| 67 browser.tabs.onRemoved.removeListener(onRemoved); | |
| 68 callback(tab.url == fullOptionsUrl ? tab : undefined); | |
| 69 } | |
| 70 }; | |
| 71 browser.tabs.onUpdated.addListener(updateListener); | |
| 72 onRemoved = removedTabId => | |
| 73 { | |
| 74 if (removedTabId == potentialOptionsTab.id) | |
| 75 { | |
| 76 browser.tabs.onUpdated.removeListener(updateListener); | |
| 77 browser.tabs.onRemoved.removeListener(onRemoved); | |
| 78 callback(); | |
| 79 } | |
| 80 }; | |
| 81 browser.tabs.onRemoved.addListener(onRemoved); | |
| 82 } | |
| 83 else | |
| 84 callback(); | |
| 85 } | |
| 42 }); | 86 }); |
| 43 } | 87 } |
| 44 | 88 |
| 45 function returnShowOptionsCall(optionsTab, callback) | 89 function returnShowOptionsCall(optionsTab, callback) |
| 46 { | 90 { |
| 47 if (!callback) | 91 if (!callback) |
| 48 return; | 92 return; |
| 49 | 93 |
| 50 if (optionsTab) | 94 if (optionsTab) |
| 51 { | 95 { |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 143 args: [ | 187 args: [ |
| 144 { | 188 { |
| 145 host: getDecodedHostname(currentPage.url).replace(/^www\./, ""), | 189 host: getDecodedHostname(currentPage.url).replace(/^www\./, ""), |
| 146 whitelisted: !!checkWhitelisted(currentPage) | 190 whitelisted: !!checkWhitelisted(currentPage) |
| 147 } | 191 } |
| 148 ] | 192 ] |
| 149 }); | 193 }); |
| 150 }); | 194 }); |
| 151 }); | 195 }); |
| 152 }); | 196 }); |
| OLD | NEW |