| 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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 110 } | 110 } |
| 111 }); | 111 }); |
| 112 }); | 112 }); |
| 113 }; | 113 }; |
| 114 } | 114 } |
| 115 | 115 |
| 116 function shouldWrapAPIs() | 116 function shouldWrapAPIs() |
| 117 { | 117 { |
| 118 try | 118 try |
| 119 { | 119 { |
| 120 return !(browser.storage.local.get([]) instanceof Promise); | 120 return !(browser.storage.local.get([], () => {}) instanceof Promise); |
|
Sebastian Noack
2017/10/26 17:11:24
This will defeat the purpose of this check, since
Oleksandr
2017/10/27 13:15:29
I am not sure what happened but as I test again no
| |
| 121 } | 121 } |
| 122 catch (error) | 122 catch (error) |
| 123 { | 123 { |
| 124 } | 124 } |
| 125 | 125 |
| 126 return true; | 126 return true; |
| 127 } | 127 } |
| 128 | 128 |
| 129 if (shouldWrapAPIs()) | 129 if (shouldWrapAPIs()) |
| 130 { | 130 { |
| 131 // Unlike Firefox and Microsoft Edge, Chrome doesn't have a "browser" object , | 131 // Unlike Firefox and Microsoft Edge, Chrome doesn't have a "browser" object , |
| 132 // but provides the extension API through the "chrome" namespace | 132 // but provides the extension API through the "chrome" namespace |
| 133 // (non-standard). | 133 // (non-standard). |
| 134 if (typeof browser == "undefined") | 134 if (typeof browser == "undefined") |
| 135 window.browser = chrome; | 135 window.browser = chrome; |
| 136 | 136 |
| 137 for (let api of asyncAPIs) | 137 for (let api of asyncAPIs) |
| 138 wrapAPI(api); | 138 wrapAPI(api); |
| 139 } | 139 } |
| 140 | 140 |
| 141 // Workaround since HTMLCollection, NodeList, StyleSheetList, and CSSRuleList | 141 // Workaround since HTMLCollection, NodeList, StyleSheetList, and CSSRuleList |
| 142 // didn't have iterator support before Chrome 51. | 142 // didn't have iterator support before Chrome 51. |
| 143 // https://bugs.chromium.org/p/chromium/issues/detail?id=401699 | 143 // https://bugs.chromium.org/p/chromium/issues/detail?id=401699 |
| 144 for (let object of [HTMLCollection, NodeList, StyleSheetList, CSSRuleList]) | 144 for (let object of [HTMLCollection, NodeList, StyleSheetList, CSSRuleList]) |
| 145 { | 145 { |
| 146 if (!(Symbol.iterator in object.prototype)) | 146 if (!(Symbol.iterator in object.prototype)) |
| 147 object.prototype[Symbol.iterator] = Array.prototype[Symbol.iterator]; | 147 object.prototype[Symbol.iterator] = Array.prototype[Symbol.iterator]; |
| 148 } | 148 } |
| 149 } | 149 } |
| OLD | NEW |