diff options
| author | Thomas Huang <tmashuang@users.noreply.github.com> | 2018-03-31 02:15:12 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-31 02:15:12 +0800 |
| commit | 8e0f39353dd47c4a201aaf2ee160912846f2e68b (patch) | |
| tree | 0fac2629c48dcf4134d8205441766e3c6a41b4ed /app/scripts | |
| parent | 9d4be1842e7c56e3bfde529ff555dcae8dec3dbd (diff) | |
| parent | 89e6baa3ba07cc46dcc62886fbe3f1906649ae77 (diff) | |
| download | tangerine-wallet-browser-8e0f39353dd47c4a201aaf2ee160912846f2e68b.tar tangerine-wallet-browser-8e0f39353dd47c4a201aaf2ee160912846f2e68b.tar.gz tangerine-wallet-browser-8e0f39353dd47c4a201aaf2ee160912846f2e68b.tar.bz2 tangerine-wallet-browser-8e0f39353dd47c4a201aaf2ee160912846f2e68b.tar.lz tangerine-wallet-browser-8e0f39353dd47c4a201aaf2ee160912846f2e68b.tar.xz tangerine-wallet-browser-8e0f39353dd47c4a201aaf2ee160912846f2e68b.tar.zst tangerine-wallet-browser-8e0f39353dd47c4a201aaf2ee160912846f2e68b.zip | |
Merge pull request #3781 from MetaMask/ci-artifacts
Build - Refactor + CircleCI Mascara builds
Diffstat (limited to 'app/scripts')
| -rw-r--r-- | app/scripts/contentscript.js | 6 | ||||
| -rw-r--r-- | app/scripts/ui.js (renamed from app/scripts/popup.js) | 0 |
2 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() } diff --git a/app/scripts/popup.js b/app/scripts/ui.js index 13c7ac5ec..13c7ac5ec 100644 --- a/app/scripts/popup.js +++ b/app/scripts/ui.js |