diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-10-17 02:01:54 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-10-17 02:01:54 +0800 |
| commit | 13820b6cc1801a420f39cdfecd7ccb5309dc597b (patch) | |
| tree | c79832d7077ab03e0afe0c322cb32b204865d8b5 /app/scripts/lib/ipfsContent.js | |
| parent | eeecee01540fbad50c4c463a3b1a54142a63f168 (diff) | |
| parent | 07ab613d4c647e3fe554bc06eab8cfb833315a88 (diff) | |
| download | tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.tar tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.tar.gz tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.tar.bz2 tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.tar.lz tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.tar.xz tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.tar.zst tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.zip | |
fix conflicts
Diffstat (limited to 'app/scripts/lib/ipfsContent.js')
| -rw-r--r-- | app/scripts/lib/ipfsContent.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/scripts/lib/ipfsContent.js b/app/scripts/lib/ipfsContent.js index 38682b916..8b08453c4 100644 --- a/app/scripts/lib/ipfsContent.js +++ b/app/scripts/lib/ipfsContent.js @@ -5,6 +5,8 @@ module.exports = function (provider) { function ipfsContent (details) { const name = details.url.substring(7, details.url.length - 1) let clearTime = null + if (/^.+\.eth$/.test(name) === false) return + extension.tabs.query({active: true}, tab => { extension.tabs.update(tab.id, { url: 'loading.html' }) @@ -34,7 +36,7 @@ module.exports = function (provider) { return { cancel: true } } - extension.webRequest.onErrorOccurred.addListener(ipfsContent, {urls: ['*://*.eth/']}) + extension.webRequest.onErrorOccurred.addListener(ipfsContent, {urls: ['*://*.eth/'], types: ['main_frame']}) return { remove () { |