diff options
| author | Esteban MIno <efmino@uc.cl> | 2018-08-21 06:35:38 +0800 |
|---|---|---|
| committer | Esteban MIno <efmino@uc.cl> | 2018-08-21 06:35:38 +0800 |
| commit | 81cd29df43feb2469b78c6240d12ffcb9a68678e (patch) | |
| tree | 15b14d9d3a29e5c21776ce5f9a3b35c7934abb81 /app/scripts/lib/ipfsContent.js | |
| parent | dbab9a007fc9663427cebdbe1d41c51df67fd1fe (diff) | |
| parent | 887cad973f25f43d2d4502ff31657f156a44b188 (diff) | |
| download | tangerine-wallet-browser-81cd29df43feb2469b78c6240d12ffcb9a68678e.tar.gz tangerine-wallet-browser-81cd29df43feb2469b78c6240d12ffcb9a68678e.tar.zst tangerine-wallet-browser-81cd29df43feb2469b78c6240d12ffcb9a68678e.zip | |
Merge branch 'develop' into WatchTokenFeature
Diffstat (limited to 'app/scripts/lib/ipfsContent.js')
| -rw-r--r-- | app/scripts/lib/ipfsContent.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/scripts/lib/ipfsContent.js b/app/scripts/lib/ipfsContent.js index 5222151ea..5db63f47d 100644 --- a/app/scripts/lib/ipfsContent.js +++ b/app/scripts/lib/ipfsContent.js @@ -5,7 +5,7 @@ module.exports = function (provider) { function ipfsContent (details) { const name = details.url.substring(7, details.url.length - 1) let clearTime = null - extension.tabs.getSelected(null, tab => { + extension.tabs.query({active: true}, tab => { extension.tabs.update(tab.id, { url: 'loading.html' }) clearTime = setTimeout(() => { @@ -34,11 +34,11 @@ module.exports = function (provider) { return { cancel: true } } - extension.webRequest.onBeforeRequest.addListener(ipfsContent, {urls: ['*://*.eth/', '*://*.test/']}) + extension.webRequest.onErrorOccurred.addListener(ipfsContent, {urls: ['*://*.eth/', '*://*.test/']}) return { remove () { - extension.webRequest.onBeforeRequest.removeListener(ipfsContent) + extension.webRequest.onErrorOccurred.removeListener(ipfsContent) }, } } |