aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/lib/ipfsContent.js
diff options
context:
space:
mode:
authorDan Finlay <542863+danfinlay@users.noreply.github.com>2018-08-10 06:39:48 +0800
committerGitHub <noreply@github.com>2018-08-10 06:39:48 +0800
commitef7e638dda63a715c796c210dadbe82430537b6a (patch)
tree23b5b62ac378f5cc302a0d9019fba8a7c622cf04 /app/scripts/lib/ipfsContent.js
parent0601df9dae488d997277bb6b52c28df27546e27c (diff)
parent06633da1b395829b475ccafb429af040256d863c (diff)
downloadtangerine-wallet-browser-ef7e638dda63a715c796c210dadbe82430537b6a.tar
tangerine-wallet-browser-ef7e638dda63a715c796c210dadbe82430537b6a.tar.gz
tangerine-wallet-browser-ef7e638dda63a715c796c210dadbe82430537b6a.tar.bz2
tangerine-wallet-browser-ef7e638dda63a715c796c210dadbe82430537b6a.tar.lz
tangerine-wallet-browser-ef7e638dda63a715c796c210dadbe82430537b6a.tar.xz
tangerine-wallet-browser-ef7e638dda63a715c796c210dadbe82430537b6a.tar.zst
tangerine-wallet-browser-ef7e638dda63a715c796c210dadbe82430537b6a.zip
Merge pull request #5025 from MetaMask/v4.9.2v4.9.2.1
v4.9.2
Diffstat (limited to 'app/scripts/lib/ipfsContent.js')
-rw-r--r--app/scripts/lib/ipfsContent.js6
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)
},
}
}