m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge pull request #5010 from eduadiez/develop

Browse Source 
Fix ENS resolution issues
This commit is contained in:
Thomas Huang 2018-08-09 09:47:25 -07:00 committed by GitHub
commit 09b81a2d22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/scripts/lib/ipfsContent.js
View File

@ -5,7 +5,7 @@ module.exports = function (provider) {
function ipfsContent (details) { function ipfsContent (details) {
const name = details.url.substring(7, details.url.length - 1) const name = details.url.substring(7, details.url.length - 1)
let clearTime = null let clearTime = null
extension.tabs.getSelected(null, tab => { extension.tabs.query({active: true}, tab => {
extension.tabs.update(tab.id, { url: 'loading.html' }) extension.tabs.update(tab.id, { url: 'loading.html' })
clearTime = setTimeout(() => { clearTime = setTimeout(() => {
@ -34,11 +34,11 @@ module.exports = function (provider) {
return { cancel: true } return { cancel: true }
} }
extension.webRequest.onBeforeRequest.addListener(ipfsContent, {urls: ['*://*.eth/', '*://*.test/']}) extension.webRequest.onErrorOccurred.addListener(ipfsContent, {urls: ['*://*.eth/', '*://*.test/']})
return { return {
remove () { remove () {
extension.webRequest.onBeforeRequest.removeListener(ipfsContent) extension.webRequest.onErrorOccurred.removeListener(ipfsContent)
}, },
} }
} }