diff options
author | kumavis <kumavis@users.noreply.github.com> | 2018-04-03 01:47:24 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-03 01:47:24 +0800 |
commit | 6d5f1392a529c5c809d416aaebc6e3424ee55ae1 (patch) | |
tree | 7feb008f31933a579a4a9bdeb42e22c99d78597a /app/scripts/contentscript.js | |
parent | 812a06ffcd9cea39453e8a59563bf1d12e17c065 (diff) | |
parent | 69a867b4a420acd4b4354aab2cc4051736a778cb (diff) | |
download | tangerine-wallet-browser-6d5f1392a529c5c809d416aaebc6e3424ee55ae1.tar tangerine-wallet-browser-6d5f1392a529c5c809d416aaebc6e3424ee55ae1.tar.gz tangerine-wallet-browser-6d5f1392a529c5c809d416aaebc6e3424ee55ae1.tar.bz2 tangerine-wallet-browser-6d5f1392a529c5c809d416aaebc6e3424ee55ae1.tar.lz tangerine-wallet-browser-6d5f1392a529c5c809d416aaebc6e3424ee55ae1.tar.xz tangerine-wallet-browser-6d5f1392a529c5c809d416aaebc6e3424ee55ae1.tar.zst tangerine-wallet-browser-6d5f1392a529c5c809d416aaebc6e3424ee55ae1.zip |
Merge branch 'master' into i18n-helper
Diffstat (limited to 'app/scripts/contentscript.js')
-rw-r--r-- | app/scripts/contentscript.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js index 7abbc60e7..2098fae27 100644 --- a/app/scripts/contentscript.js +++ b/app/scripts/contentscript.js @@ -7,8 +7,8 @@ const ObjectMultiplex = require('obj-multiplex') const extension = require('extensionizer') const PortStream = require('./lib/port-stream.js') -const inpageContent = fs.readFileSync(path.join(__dirname, '..', '..', 'dist', 'chrome', 'scripts', 'inpage.js')).toString() -const inpageSuffix = '//# sourceURL=' + extension.extension.getURL('scripts/inpage.js') + '\n' +const inpageContent = fs.readFileSync(path.join(__dirname, '..', '..', 'dist', 'chrome', 'inpage.js')).toString() +const inpageSuffix = '//# sourceURL=' + extension.extension.getURL('inpage.js') + '\n' const inpageBundle = inpageContent + inpageSuffix // Eventually this streaming injection could be replaced with: @@ -96,7 +96,7 @@ function logStreamDisconnectWarning (remoteLabel, err) { } function shouldInjectWeb3 () { - return doctypeCheck() && suffixCheck() + return doctypeCheck() && suffixCheck() && documentElementCheck() && !blacklistedDomainCheck() } |